Re: [Qemu-devel] [PATCH v7 5/6] spapr: QOM'fy machine

["Andreas Färber" <afaerber@suse.de>]

Am 17.03.2014 03:40, schrieb Alexey Kardashevskiy:
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
> Changes:
> v8:
> * QOM'ed according to the latest rules from 2.0-rc0.

Fixing up as follows:

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 43b9fcb..170e083 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -81,7 +81,7 @@

 #define HTAB_SIZE(spapr)        (1ULL << ((spapr)->htab_shift))

-#define TYPE_SPAPR_MACHINE      "machine-spapr"
+#define TYPE_SPAPR_MACHINE      "spapr-machine"

 sPAPREnvironment *spapr;

@@ -1412,13 +1412,6 @@ static QEMUMachine spapr_machine = {
     .kvm_type = spapr_kvm_type,
 };

-static void spapr_machine_init(void)
-{
-    qemu_register_machine(&spapr_machine);
-}
-
-machine_init(spapr_machine_init);
-
 static void spapr_machine_class_init(ObjectClass *oc, void *data)
 {
     MachineClass *mc = MACHINE_CLASS(oc);

Regards,
Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg