From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50589) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQR1X-0005dt-5O for qemu-devel@nongnu.org; Wed, 19 Mar 2014 20:40:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQR1Q-00083D-Vy for qemu-devel@nongnu.org; Wed, 19 Mar 2014 20:39:55 -0400 Message-ID: <532A38D2.5080701@suse.de> Date: Thu, 20 Mar 2014 01:39:46 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1395024027-29211-1-git-send-email-aik@ozlabs.ru> <1395024027-29211-6-git-send-email-aik@ozlabs.ru> In-Reply-To: <1395024027-29211-6-git-send-email-aik@ozlabs.ru> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v7 5/6] spapr: QOM'fy machine List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexey Kardashevskiy , qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, Alexander Graf Am 17.03.2014 03:40, schrieb Alexey Kardashevskiy: > Signed-off-by: Alexey Kardashevskiy > --- > 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 =3D { .kvm_type =3D 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 =3D MACHINE_CLASS(oc); Regards, Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg