From patchwork Sat Apr 27 20:18:39 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: 240179 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 95EA02C00AD for ; Sun, 28 Apr 2013 06:19:56 +1000 (EST) Received: from localhost ([::1]:36622 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWBb8-0000b7-PJ for incoming@patchwork.ozlabs.org; Sat, 27 Apr 2013 16:19:54 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49799) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWBaV-0000XH-Ph for qemu-devel@nongnu.org; Sat, 27 Apr 2013 16:19:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UWBaQ-00021V-Lg for qemu-devel@nongnu.org; Sat, 27 Apr 2013 16:19:15 -0400 Received: from cantor2.suse.de ([195.135.220.15]:41901 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWBaQ-00021O-Fq for qemu-devel@nongnu.org; Sat, 27 Apr 2013 16:19:10 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 164A55E00020A for ; Sat, 27 Apr 2013 22:19:10 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sat, 27 Apr 2013 22:18:39 +0200 Message-Id: <1367093935-29091-5-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 04/20] i82374: QOM'ify 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/dma/i82374.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/dma/i82374.c b/hw/dma/i82374.c index 835639d..f3d1924 100644 --- a/hw/dma/i82374.c +++ b/hw/dma/i82374.c @@ -104,8 +104,12 @@ static void i82374_init(I82374State *s) memset(s->commands, 0, sizeof(s->commands)); } +#define TYPE_I82374 "i82374" +#define I82374(obj) OBJECT_CHECK(ISAi82374State, (obj), TYPE_I82374) + typedef struct ISAi82374State { - ISADevice dev; + ISADevice parent_obj; + uint32_t iobase; I82374State state; } ISAi82374State; @@ -122,7 +126,7 @@ static const VMStateDescription vmstate_isa_i82374 = { static int i82374_isa_init(ISADevice *dev) { - ISAi82374State *isa = DO_UPCAST(ISAi82374State, dev, dev); + ISAi82374State *isa = I82374(dev); I82374State *s = &isa->state; register_ioport_read(isa->iobase + 0x0A, 1, 1, i82374_read_isr, s); @@ -154,7 +158,7 @@ static void i82374_class_init(ObjectClass *klass, void *data) } static const TypeInfo i82374_isa_info = { - .name = "i82374", + .name = TYPE_I82374, .parent = TYPE_ISA_DEVICE, .instance_size = sizeof(ISAi82374State), .class_init = i82374_class_init,