mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

monitor: remove MonitorDef from typedefs.h

Browse Source 
MonitorDef is defined by hmp-target.h, and all users except one already
include it; the reason why the stubs do not include it, is because
hmp-target.h currently can only be used in files that are compiled
per target.  However, that is easily fixed.  Because the benefit of
having MonitorDef in typedefs.h is very small, do it and remove the
type from typedefs.h.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-05-02 17:09:39 +02:00
parent a0d645100e
commit f37c6c2e89
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/monitor/hmp-target.h
View File

@ -25,11 +25,10 @@
#ifndef MONITOR_HMP_TARGET_H #ifndef MONITOR_HMP_TARGET_H
#define MONITOR_HMP_TARGET_H #define MONITOR_HMP_TARGET_H
typedef struct MonitorDef MonitorDef;
#ifdef COMPILING_PER_TARGET
#include "cpu.h" #include "cpu.h"
#define MD_TLONG 0
#define MD_I32 1
struct MonitorDef { struct MonitorDef {
const char *name; const char *name;
int offset; int offset;
@ -37,6 +36,10 @@ struct MonitorDef {
int val); int val);
int type; int type;
}; };
#endif
#define MD_TLONG 0
#define MD_I32 1
const MonitorDef *target_monitor_defs(void); const MonitorDef *target_monitor_defs(void);
int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval); int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval);

1
include/qemu/typedefs.h
View File

@ -75,7 +75,6 @@ typedef struct MemoryRegionSection MemoryRegionSection;
typedef struct MigrationIncomingState MigrationIncomingState; typedef struct MigrationIncomingState MigrationIncomingState;
typedef struct MigrationState MigrationState; typedef struct MigrationState MigrationState;
typedef struct Monitor Monitor; typedef struct Monitor Monitor;
typedef struct MonitorDef MonitorDef;
typedef struct MSIMessage MSIMessage; typedef struct MSIMessage MSIMessage;
typedef struct NetClientState NetClientState; typedef struct NetClientState NetClientState;
typedef struct NetFilterState NetFilterState; typedef struct NetFilterState NetFilterState;

3
stubs/target-monitor-defs.c
View File

@ -1,6 +1,5 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "monitor/hmp-target.h"
const MonitorDef *target_monitor_defs(void);
const MonitorDef *target_monitor_defs(void) const MonitorDef *target_monitor_defs(void)
{ {