From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60744) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQS6d-0000eS-0g for qemu-devel@nongnu.org; Wed, 19 Mar 2014 21:49:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQS6U-00048C-8Y for qemu-devel@nongnu.org; Wed, 19 Mar 2014 21:49:14 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 20 Mar 2014 02:48:54 +0100 Message-Id: <1395280135-10644-13-git-send-email-afaerber@suse.de> In-Reply-To: <1395280135-10644-1-git-send-email-afaerber@suse.de> References: <1395280135-10644-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL for-2.0 12/13] spapr: QOM'ify pseries machine List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , qemu-ppc@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf From: Alexey Kardashevskiy Signed-off-by: Alexey Kardashevskiy Signed-off-by: Andreas F=C3=A4rber --- 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 @@ =20 #define HTAB_SIZE(spapr) (1ULL << ((spapr)->htab_shift)) =20 +#define TYPE_SPAPR_MACHINE "spapr-machine" + sPAPREnvironment *spapr; =20 int spapr_allocate_irq(int hint, bool lsi) @@ -1410,9 +1412,23 @@ static QEMUMachine spapr_machine =3D { .kvm_type =3D spapr_kvm_type, }; =20 -static void spapr_machine_init(void) +static void spapr_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + + mc->qemu_machine =3D data; +} + +static const TypeInfo spapr_machine_info =3D { + .name =3D TYPE_SPAPR_MACHINE, + .parent =3D TYPE_MACHINE, + .class_init =3D spapr_machine_class_init, + .class_data =3D &spapr_machine, +}; + +static void spapr_machine_register_types(void) { - qemu_register_machine(&spapr_machine); + type_register_static(&spapr_machine_info); } =20 -machine_init(spapr_machine_init); +type_init(spapr_machine_register_types) --=20 1.8.4.5