[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.0 12/13] spapr: QOM'ify pseries machine
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL for-2.0 12/13] spapr: QOM'ify pseries machine |
Date: |
Thu, 20 Mar 2014 02:48:54 +0100 |
From: Alexey Kardashevskiy <address@hidden>
Signed-off-by: Alexey Kardashevskiy <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/ppc/spapr.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 5c9a154..170e083 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -81,6 +81,8 @@
#define HTAB_SIZE(spapr) (1ULL << ((spapr)->htab_shift))
+#define TYPE_SPAPR_MACHINE "spapr-machine"
+
sPAPREnvironment *spapr;
int spapr_allocate_irq(int hint, bool lsi)
@@ -1410,9 +1412,23 @@ static QEMUMachine spapr_machine = {
.kvm_type = spapr_kvm_type,
};
-static void spapr_machine_init(void)
+static void spapr_machine_class_init(ObjectClass *oc, void *data)
+{
+ MachineClass *mc = MACHINE_CLASS(oc);
+
+ mc->qemu_machine = data;
+}
+
+static const TypeInfo spapr_machine_info = {
+ .name = TYPE_SPAPR_MACHINE,
+ .parent = TYPE_MACHINE,
+ .class_init = spapr_machine_class_init,
+ .class_data = &spapr_machine,
+};
+
+static void spapr_machine_register_types(void)
{
- qemu_register_machine(&spapr_machine);
+ type_register_static(&spapr_machine_info);
}
-machine_init(spapr_machine_init);
+type_init(spapr_machine_register_types)
--
1.8.4.5
- [Qemu-devel] [PULL for-2.0 06/13] target-ppc: Introduce powerisa-207-server flag, (continued)
- [Qemu-devel] [PULL for-2.0 06/13] target-ppc: Introduce powerisa-207-server flag, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 07/13] spapr_hcall: Fix little-endian resource handling in H_SET_MODE, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 09/13] qdev: Introduce FWPathProvider interface, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 04/13] target-ppc: Fix overallocation of opcode tables, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 10/13] spapr_llan: Add to boot device list, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 08/13] vl.c: Extend get_boot_devices_list() to ignore suffixes, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 01/13] target-ppc: Add missing 'static' and 'const' attributes, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 05/13] target-ppc: Force CPU threads count to be a power of 2, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 02/13] spapr_hcall: Fix h_enter to loop correctly, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 11/13] spapr_vio: Fix firmware names, Andreas Färber, 2014/03/19
- [Qemu-devel] [PULL for-2.0 12/13] spapr: QOM'ify pseries machine,
Andreas Färber <=
- [Qemu-devel] [PULL for-2.0 13/13] spapr: Implement interface to fix device pathname, Andreas Färber, 2014/03/19
- Re: [Qemu-devel] [PULL for-2.0-rc1 00/13] PowerPC patch queue 2014-03-20 #2, Peter Maydell, 2014/03/20