[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/6] hw/ppc/mac_newworld: QOMified mac99 machines
From: |
Marcel Apfelbaum |
Subject: |
[Qemu-devel] [PATCH 4/6] hw/ppc/mac_newworld: QOMified mac99 machines |
Date: |
Tue, 6 Jan 2015 15:29:15 +0200 |
Signed-off-by: Marcel Apfelbaum <address@hidden>
---
hw/ppc/mac_newworld.c | 29 +++++++++++++++++++----------
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index ed37d6b..b54f94a 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)
--
2.1.0
- [Qemu-devel] [PATCH 0/6] simplify usb enabling logic and fix a Qemu crash, Marcel Apfelbaum, 2015/01/06
- [Qemu-devel] [PATCH 2/6] hw/machine: added machine_usb wrapper, Marcel Apfelbaum, 2015/01/06
- [Qemu-devel] [PATCH 1/6] hw/ppc: modified the condition for usb controllers to be created for some ppc machines, Marcel Apfelbaum, 2015/01/06
- [Qemu-devel] [PATCH 3/6] hw/usb: simplified usb_enabled, Marcel Apfelbaum, 2015/01/06
- [Qemu-devel] [PATCH 4/6] hw/ppc/mac_newworld: QOMified mac99 machines,
Marcel Apfelbaum <=
- [Qemu-devel] [PATCH 5/6] hw/ppc/spapr: simplify usb controller creation logic, Marcel Apfelbaum, 2015/01/06
- Re: [Qemu-devel] [PATCH 5/6] hw/ppc/spapr: simplify usb controller creation logic, Paolo Bonzini, 2015/01/06
- Re: [Qemu-devel] [PATCH 5/6] hw/ppc/spapr: simplify usb controller creation logic, Marcel Apfelbaum, 2015/01/07
- Re: [Qemu-devel] [PATCH 5/6] hw/ppc/spapr: simplify usb controller creation logic, Paolo Bonzini, 2015/01/07
- Re: [Qemu-devel] [PATCH 5/6] hw/ppc/spapr: simplify usb controller creation logic, Alexander Graf, 2015/01/07
- Re: [Qemu-devel] [PATCH 5/6] hw/ppc/spapr: simplify usb controller creation logic, Marcel Apfelbaum, 2015/01/07
- Re: [Qemu-devel] [PATCH 5/6] hw/ppc/spapr: simplify usb controller creation logic, Paolo Bonzini, 2015/01/07
- Re: [Qemu-devel] [PATCH 5/6] hw/ppc/spapr: simplify usb controller creation logic, Alexander Graf, 2015/01/07
- Re: [Qemu-devel] [PATCH 5/6] hw/ppc/spapr: simplify usb controller creation logic, Paolo Bonzini, 2015/01/07
- Re: [Qemu-devel] [PATCH 5/6] hw/ppc/spapr: simplify usb controller creation logic, Alexander Graf, 2015/01/07