From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcmKV-0007NH-0u for qemu-devel@nongnu.org; Sun, 25 Nov 2012 19:13:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TcmKS-0000GP-PU for qemu-devel@nongnu.org; Sun, 25 Nov 2012 19:13:42 -0500 Received: from cantor2.suse.de ([195.135.220.15]:46219 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcmKS-0000Fy-GG for qemu-devel@nongnu.org; Sun, 25 Nov 2012 19:13:40 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 26 Nov 2012 01:12:19 +0100 Message-Id: <1353888766-6951-8-git-send-email-afaerber@suse.de> In-Reply-To: <1353888766-6951-1-git-send-email-afaerber@suse.de> References: <1353888766-6951-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] [RFC 07/34] cirrus_vga: QOM'ify ISA Cirrus VGA List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , anthony@codemonkey.ws Introduce type constant and cast macro to obsolete DO_UPCAST(). Prepares for ISA realizefn. Signed-off-by: Andreas F=C3=A4rber --- hw/cirrus_vga.c | 17 +++++++++++------ 1 Datei ge=C3=A4ndert, 11 Zeilen hinzugef=C3=BCgt(+), 6 Zeilen entfernt(= -) diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 40efa8a..9687b6b 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -250,8 +250,13 @@ typedef struct PCICirrusVGAState { CirrusVGAState cirrus_vga; } PCICirrusVGAState; =20 +#define TYPE_ISA_CIRRUS_VGA "isa-cirrus-vga" +#define ISA_CIRRUS_VGA(obj) \ + OBJECT_CHECK(ISACirrusVGAState, (obj), TYPE_ISA_CIRRUS_VGA) + typedef struct ISACirrusVGAState { - ISADevice dev; + ISADevice parent_obj; + CirrusVGAState cirrus_vga; } ISACirrusVGAState; =20 @@ -2902,7 +2907,7 @@ static void cirrus_init_common(CirrusVGAState * s, = int device_id, int is_pci, =20 static int vga_initfn(ISADevice *dev) { - ISACirrusVGAState *d =3D DO_UPCAST(ISACirrusVGAState, dev, dev); + ISACirrusVGAState *d =3D ISA_CIRRUS_VGA(dev); VGACommonState *s =3D &d->cirrus_vga.vga; =20 vga_common_init(s); @@ -2917,7 +2922,7 @@ static int vga_initfn(ISADevice *dev) return 0; } =20 -static Property isa_vga_cirrus_properties[] =3D { +static Property isa_cirrus_vga_properties[] =3D { DEFINE_PROP_UINT32("vgamem_mb", struct ISACirrusVGAState, cirrus_vga.vga.vram_size_mb, 8), DEFINE_PROP_END_OF_LIST(), @@ -2930,11 +2935,11 @@ static void isa_cirrus_vga_class_init(ObjectClass= *klass, void *data) =20 dc->vmsd =3D &vmstate_cirrus_vga; k->init =3D vga_initfn; - dc->props =3D isa_vga_cirrus_properties; + dc->props =3D isa_cirrus_vga_properties; } =20 -static TypeInfo isa_cirrus_vga_info =3D { - .name =3D "isa-cirrus-vga", +static const TypeInfo isa_cirrus_vga_info =3D { + .name =3D TYPE_ISA_CIRRUS_VGA, .parent =3D TYPE_ISA_DEVICE, .instance_size =3D sizeof(ISACirrusVGAState), .class_init =3D isa_cirrus_vga_class_init, --=20 1.7.10.4