From patchwork Sat Apr 27 20:18:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 240178 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C3D592C00AD for ; Sun, 28 Apr 2013 06:19:53 +1000 (EST) Received: from localhost ([::1]:36546 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWBb5-0000YT-TF for incoming@patchwork.ozlabs.org; Sat, 27 Apr 2013 16:19:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49763) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWBaT-0000XD-DD for qemu-devel@nongnu.org; Sat, 27 Apr 2013 16:19:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UWBaP-000214-H1 for qemu-devel@nongnu.org; Sat, 27 Apr 2013 16:19:13 -0400 Received: from cantor2.suse.de ([195.135.220.15]:41898 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWBaP-00020v-Ag for qemu-devel@nongnu.org; Sat, 27 Apr 2013 16:19:09 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 6295F5E00020B for ; Sat, 27 Apr 2013 22:19:08 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sat, 27 Apr 2013 22:18:37 +0200 Message-Id: <1367093935-29091-3-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1367093935-29091-1-git-send-email-afaerber@suse.de> References: <1367093935-29091-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH for-1.5 v2 02/20] cirrus_vga: QOM'ify ISA Cirrus VGA X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Introduce type constant and cast macro to obsolete DO_UPCAST(). Prepares for ISA realizefn. Signed-off-by: Andreas Färber --- hw/display/cirrus_vga.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 6e47956..64bfe2b 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -250,8 +250,13 @@ typedef struct PCICirrusVGAState { CirrusVGAState cirrus_vga; } PCICirrusVGAState; +#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; @@ -2904,7 +2909,7 @@ static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci, static int vga_initfn(ISADevice *dev) { - ISACirrusVGAState *d = DO_UPCAST(ISACirrusVGAState, dev, dev); + ISACirrusVGAState *d = ISA_CIRRUS_VGA(dev); VGACommonState *s = &d->cirrus_vga.vga; vga_common_init(s); @@ -2917,7 +2922,7 @@ static int vga_initfn(ISADevice *dev) return 0; } -static Property isa_vga_cirrus_properties[] = { +static Property isa_cirrus_vga_properties[] = { 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) dc->vmsd = &vmstate_cirrus_vga; k->init = vga_initfn; - dc->props = isa_vga_cirrus_properties; + dc->props = isa_cirrus_vga_properties; } static const TypeInfo isa_cirrus_vga_info = { - .name = "isa-cirrus-vga", + .name = TYPE_ISA_CIRRUS_VGA, .parent = TYPE_ISA_DEVICE, .instance_size = sizeof(ISACirrusVGAState), .class_init = isa_cirrus_vga_class_init,