From aaa663916d78aeb51a97842735052e7c8859dc9e Mon Sep 17 00:00:00 2001 From: Marcel Apfelbaum Date: Wed, 9 Apr 2014 20:34:51 +0300 Subject: [PATCH] vl.c: Replace QEMUMachine with MachineClass in QEMUMachineInitArgs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Andreas Färber --- include/hw/boards.h | 5 +++-- vl.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index c5f503d..be2e432 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 3229c2f..2c2b625 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, -- 2.7.4