From patchwork Mon Nov 26 00:12:30 2012 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: 201605 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 52F5B2C007C for ; Mon, 26 Nov 2012 12:21:25 +1100 (EST) Received: from localhost ([::1]:42132 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcmL9-0000Xf-DF for incoming@patchwork.ozlabs.org; Sun, 25 Nov 2012 19:14:23 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33559) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcmKX-0007Ob-39 for qemu-devel@nongnu.org; Sun, 25 Nov 2012 19:13:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TcmKT-0000IF-HU for qemu-devel@nongnu.org; Sun, 25 Nov 2012 19:13:45 -0500 Received: from cantor2.suse.de ([195.135.220.15]:46229 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TcmKT-0000Gv-6i for qemu-devel@nongnu.org; Sun, 25 Nov 2012 19:13:41 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 9BDF2A398D; Mon, 26 Nov 2012 01:13:15 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 26 Nov 2012 01:12:30 +0100 Message-Id: <1353888766-6951-19-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 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 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Anthony Liguori , =?UTF-8?q?Andreas=20F=C3=A4rber?= , anthony@codemonkey.ws Subject: [Qemu-devel] [RFC 18/34] pc: QOM'ify port 92 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/pc.c | 16 ++++++++++------ 1 Datei geändert, 10 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-) diff --git a/hw/pc.c b/hw/pc.c index 5fc2076..e878106 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -413,9 +413,13 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, qemu_register_reset(pc_cmos_init_late, &arg); } +#define TYPE_PORT92 "port92" +#define PORT92(obj) OBJECT_CHECK(Port92State, (obj), TYPE_PORT92) + /* port 92 stuff: could be split off */ typedef struct Port92State { - ISADevice dev; + ISADevice parent_obj; + MemoryRegion io; uint8_t outport; qemu_irq *a20_out; @@ -447,7 +451,7 @@ static uint64_t port92_read(void *opaque, hwaddr addr, static void port92_init(ISADevice *dev, qemu_irq *a20_out) { - Port92State *s = DO_UPCAST(Port92State, dev, dev); + Port92State *s = PORT92(dev); s->a20_out = a20_out; } @@ -465,7 +469,7 @@ static const VMStateDescription vmstate_port92_isa = { static void port92_reset(DeviceState *d) { - Port92State *s = container_of(d, Port92State, dev.qdev); + Port92State *s = PORT92(d); s->outport &= ~1; } @@ -482,7 +486,7 @@ static const MemoryRegionOps port92_ops = { static int port92_initfn(ISADevice *dev) { - Port92State *s = DO_UPCAST(Port92State, dev, dev); + Port92State *s = PORT92(dev); memory_region_init_io(&s->io, &port92_ops, s, "port92", 1); isa_register_ioport(dev, &s->io, 0x92); @@ -501,8 +505,8 @@ static void port92_class_initfn(ObjectClass *klass, void *data) dc->vmsd = &vmstate_port92_isa; } -static TypeInfo port92_info = { - .name = "port92", +static const TypeInfo port92_info = { + .name = TYPE_PORT92, .parent = TYPE_ISA_DEVICE, .instance_size = sizeof(Port92State), .class_init = port92_class_initfn,