diff options
| author | Marcel Apfelbaum <marcel.a@redhat.com> | 2014-04-09 20:34:51 +0300 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2014-05-05 19:08:49 +0200 |
| commit | aaa663916d78aeb51a97842735052e7c8859dc9e (patch) | |
| tree | 3f8ccdafbdc07a6490e88ea893e8df68569b99d3 | |
| parent | 00b4fbe27452ddc346f7f38d5690686166932588 (diff) | |
| download | focaccia-qemu-aaa663916d78aeb51a97842735052e7c8859dc9e.tar.gz focaccia-qemu-aaa663916d78aeb51a97842735052e7c8859dc9e.zip | |
vl.c: Replace QEMUMachine with MachineClass in QEMUMachineInitArgs
QEMUMachine's fields are already in MachineClass. We can safely make the switch because we copy them in machine_class_init() and spapr_machine_class_init(). Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | include/hw/boards.h | 5 | ||||
| -rw-r--r-- | vl.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/hw/boards.h b/include/hw/boards.h index c5f503d0f0..be2e4329b7 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -7,8 +7,10 @@ #include "hw/qdev.h" #include "qom/object.h" +typedef struct MachineClass MachineClass; + typedef struct QEMUMachineInitArgs { - const QEMUMachine *machine; + const MachineClass *machine; ram_addr_t ram_size; const char *boot_order; const char *kernel_filename; @@ -62,7 +64,6 @@ int qemu_register_machine(QEMUMachine *m); OBJECT_CLASS_CHECK(MachineClass, (klass), TYPE_MACHINE) typedef struct MachineState MachineState; -typedef struct MachineClass MachineClass; MachineClass *find_default_machine(void); extern MachineState *current_machine; diff --git a/vl.c b/vl.c index 3229c2ff12..2c2b625b37 100644 --- a/vl.c +++ b/vl.c @@ -4430,7 +4430,7 @@ int main(int argc, char **argv, char **envp) qdev_machine_init(); current_machine->init_args = (QEMUMachineInitArgs) { - .machine = machine, + .machine = machine_class, .ram_size = ram_size, .boot_order = boot_order, .kernel_filename = kernel_filename, |