diff options
| author | Marcel Apfelbaum <marcel@redhat.com> | 2015-01-06 15:29:15 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2015-01-07 16:16:29 +0100 |
| commit | b8cbc738de38f2a669de9920fc0b0ee14c1d2dd8 (patch) | |
| tree | f9650033fa954136ea4bb16f37ec342f35606a71 | |
| parent | 09f28e5b51e0fb822021efd8396057c818927775 (diff) | |
| download | focaccia-qemu-b8cbc738de38f2a669de9920fc0b0ee14c1d2dd8.tar.gz focaccia-qemu-b8cbc738de38f2a669de9920fc0b0ee14c1d2dd8.zip | |
hw/ppc/mac_newworld: QOMified mac99 machines
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Alexander Graf <agraf@suse.de>
| -rw-r--r-- | hw/ppc/mac_newworld.c | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index ed37d6bf19..b54f94ad53 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -502,18 +502,27 @@ static int core99_kvm_type(const char *arg) return 2; } -static QEMUMachine core99_machine = { - .name = "mac99", - .desc = "Mac99 based PowerMAC", - .init = ppc_core99_init, - .max_cpus = MAX_CPUS, - .default_boot_order = "cd", - .kvm_type = core99_kvm_type, +static void core99_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + + mc->name = "mac99"; + mc->desc = "Mac99 based PowerMAC"; + mc->init = ppc_core99_init; + mc->max_cpus = MAX_CPUS; + mc->default_boot_order = "cd"; + mc->kvm_type = core99_kvm_type; +} + +static const TypeInfo core99_machine_info = { + .name = "mac99-machine", + .parent = TYPE_MACHINE, + .class_init = core99_machine_class_init, }; -static void core99_machine_init(void) +static void mac_machine_register_types(void) { - qemu_register_machine(&core99_machine); + type_register_static(&core99_machine_info); } -machine_init(core99_machine_init); +type_init(mac_machine_register_types) |