diff options
| author | Markus Armbruster <armbru@redhat.com> | 2013-10-30 13:56:39 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2013-12-10 12:29:56 +0200 |
| commit | e689f7c668cbd9d08f330e17c3dd3a059c9553d3 (patch) | |
| tree | f430abd64f46cc386d073f9f0da19a942133f07a | |
| parent | 8f84271da83c0e9f92aa7c1c2d0d3875bf0a5cb8 (diff) | |
| download | focaccia-qemu-e689f7c668cbd9d08f330e17c3dd3a059c9553d3.tar.gz focaccia-qemu-e689f7c668cbd9d08f330e17c3dd3a059c9553d3.zip | |
hw: Pass QEMUMachine to its init() method
Put it in QEMUMachineInitArgs, so I don't have to touch every board. Reviewed-by: Andreas Färber <afaerber@suse.de> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | include/hw/boards.h | 7 | ||||
| -rw-r--r-- | vl.c | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/include/hw/boards.h b/include/hw/boards.h index 5a7ae9f59b..2151460f9e 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -6,7 +6,10 @@ #include "sysemu/blockdev.h" #include "hw/qdev.h" +typedef struct QEMUMachine QEMUMachine; + typedef struct QEMUMachineInitArgs { + const QEMUMachine *machine; ram_addr_t ram_size; const char *boot_order; const char *kernel_filename; @@ -21,7 +24,7 @@ typedef void QEMUMachineResetFunc(void); typedef void QEMUMachineHotAddCPUFunc(const int64_t id, Error **errp); -typedef struct QEMUMachine { +struct QEMUMachine { const char *name; const char *alias; const char *desc; @@ -43,7 +46,7 @@ typedef struct QEMUMachine { GlobalProperty *compat_props; struct QEMUMachine *next; const char *hw_version; -} QEMUMachine; +}; int qemu_register_machine(QEMUMachine *m); QEMUMachine *find_default_machine(void); diff --git a/vl.c b/vl.c index b0399de25f..29e566fefa 100644 --- a/vl.c +++ b/vl.c @@ -4239,7 +4239,8 @@ int main(int argc, char **argv, char **envp) qdev_machine_init(); - QEMUMachineInitArgs args = { .ram_size = ram_size, + QEMUMachineInitArgs args = { .machine = machine, + .ram_size = ram_size, .boot_order = boot_order, .kernel_filename = kernel_filename, .kernel_cmdline = kernel_cmdline, |