aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMarcel Apfelbaum <marcel.a@redhat.com>2014-04-09 20:34:51 +0300
committerAndreas Färber <afaerber@suse.de>2014-05-05 19:08:49 +0200
commitaaa663916d78aeb51a97842735052e7c8859dc9e (patch)
tree3f8ccdafbdc07a6490e88ea893e8df68569b99d3 /include
parent00b4fbe27452ddc346f7f38d5690686166932588 (diff)
downloadqemu-aaa663916d78aeb51a97842735052e7c8859dc9e.zip
qemu-aaa663916d78aeb51a97842735052e7c8859dc9e.tar.gz
qemu-aaa663916d78aeb51a97842735052e7c8859dc9e.tar.bz2
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>
Diffstat (limited to 'include')
-rw-r--r--include/hw/boards.h5
1 files changed, 3 insertions, 2 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;