diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2014-09-26 17:45:30 -0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-10-09 12:57:10 +0200 |
| commit | f6a1ef64408a5f7f52601589fef2a850b93d817e (patch) | |
| tree | 1a272c6f0d4ed248572bb2835b17318ef8c9daa0 /include | |
| parent | 0d15da8e6fc3cbcd088476c561dcc88b9aae493a (diff) | |
| download | qemu-f6a1ef64408a5f7f52601589fef2a850b93d817e.tar.gz | |
accel: Pass MachineState object to accel init functions
Most of the machine options and machine state information is in the
MachineState object, not on the MachineClass. This will allow init
functions to use the MachineState object directly instead of
qemu_get_machine_opts() or the current_machine global.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/boards.h | 2 | ||||
| -rw-r--r-- | include/qemu/typedefs.h | 1 | ||||
| -rw-r--r-- | include/sysemu/accel.h | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/include/hw/boards.h b/include/hw/boards.h index dfb6718dc1..0058c49d8d 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -9,8 +9,6 @@ #include "qom/object.h" -typedef struct MachineState MachineState; - typedef void QEMUMachineInitFunc(MachineState *ms); typedef void QEMUMachineResetFunc(void); diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 5f20b0e263..04df51b6fc 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -32,6 +32,7 @@ typedef struct MemoryMappingList MemoryMappingList; typedef struct QEMUMachine QEMUMachine; typedef struct MachineClass MachineClass; +typedef struct MachineState MachineState; typedef struct NICInfo NICInfo; typedef struct HCIInfo HCIInfo; typedef struct AudioState AudioState; diff --git a/include/sysemu/accel.h b/include/sysemu/accel.h index 8812cdae21..997720f36c 100644 --- a/include/sysemu/accel.h +++ b/include/sysemu/accel.h @@ -39,7 +39,7 @@ typedef struct AccelClass { const char *opt_name; const char *name; int (*available)(void); - int (*init_machine)(MachineClass *mc); + int (*init_machine)(MachineState *ms); bool *allowed; } AccelClass; @@ -57,6 +57,6 @@ typedef struct AccelClass { extern int tcg_tb_size; -int configure_accelerator(MachineClass *mc); +int configure_accelerator(MachineState *ms); #endif |