diff options
author | Marcel Apfelbaum <marcel.a@redhat.com> | 2014-04-09 20:34:50 +0300 |
---|---|---|
committer | Andreas Färber <afaerber@suse.de> | 2014-05-05 19:08:49 +0200 |
commit | 00b4fbe27452ddc346f7f38d5690686166932588 (patch) | |
tree | 806a6a3cca1c571a340f2cf599f962c78e8cf935 /include/hw/boards.h | |
parent | 9e1d668ba9783483284e081662b8a19fd48846b0 (diff) |
machine: Copy QEMUMachine's fields to MachineClass
In order to eliminate the QEMUMachine indirection,
add its fields directly to MachineClass.
Do not yet remove qemu_machine field because it is
still in use by sPAPR.
Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
[AF: Copied fields for sPAPR, too]
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'include/hw/boards.h')
-rw-r--r-- | include/hw/boards.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/include/hw/boards.h b/include/hw/boards.h index aaaa871687..c5f503d0f0 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -77,6 +77,30 @@ struct MachineClass { /*< public >*/ QEMUMachine *qemu_machine; + + const char *name; + const char *alias; + const char *desc; + + void (*init)(QEMUMachineInitArgs *args); + void (*reset)(void); + void (*hot_add_cpu)(const int64_t id, Error **errp); + int (*kvm_type)(const char *arg); + + BlockInterfaceType block_default_type; + int max_cpus; + unsigned int no_serial:1, + no_parallel:1, + use_virtcon:1, + use_sclp:1, + no_floppy:1, + no_cdrom:1, + no_sdcard:1; + int is_default; + const char *default_machine_opts; + const char *default_boot_order; + GlobalProperty *compat_props; + const char *hw_version; }; /** |