From patchwork Sat Apr 27 20:18:47 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: 240188 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 C84FE2C00AD for ; Sun, 28 Apr 2013 06:26:12 +1000 (EST) Received: from localhost ([::1]:56081 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWBhD-0003Ci-1F for incoming@patchwork.ozlabs.org; Sat, 27 Apr 2013 16:26:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49881) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWBaa-0000b8-0M for qemu-devel@nongnu.org; Sat, 27 Apr 2013 16:19:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UWBaW-0002AN-D2 for qemu-devel@nongnu.org; Sat, 27 Apr 2013 16:19:19 -0400 Received: from cantor2.suse.de ([195.135.220.15]:41913 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWBaW-000281-6k for qemu-devel@nongnu.org; Sat, 27 Apr 2013 16:19:16 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 942615E00020B for ; Sat, 27 Apr 2013 22:19:15 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sat, 27 Apr 2013 22:18:47 +0200 Message-Id: <1367093935-29091-13-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 12/20] pckbd: 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/input/pckbd.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 08ceb9f..17a5614 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -431,8 +431,12 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq, qemu_register_reset(kbd_reset, s); } +#define TYPE_I8042 "i8042" +#define I8042(obj) OBJECT_CHECK(ISAKBDState, (obj), TYPE_I8042) + typedef struct ISAKBDState { - ISADevice dev; + ISADevice parent_obj; + KBDState kbd; MemoryRegion io[2]; } ISAKBDState; @@ -440,14 +444,16 @@ typedef struct ISAKBDState { void i8042_isa_mouse_fake_event(void *opaque) { ISADevice *dev = opaque; - KBDState *s = &(DO_UPCAST(ISAKBDState, dev, dev)->kbd); + ISAKBDState *isa = I8042(dev); + KBDState *s = &isa->kbd; ps2_mouse_fake_event(s->mouse); } void i8042_setup_a20_line(ISADevice *dev, qemu_irq *a20_out) { - KBDState *s = &(DO_UPCAST(ISAKBDState, dev, dev)->kbd); + ISAKBDState *isa = I8042(dev); + KBDState *s = &isa->kbd; s->a20_out = a20_out; } @@ -485,7 +491,7 @@ static const MemoryRegionOps i8042_cmd_ops = { static int i8042_initfn(ISADevice *dev) { - ISAKBDState *isa_s = DO_UPCAST(ISAKBDState, dev, dev); + ISAKBDState *isa_s = I8042(dev); KBDState *s = &isa_s->kbd; isa_init_irq(dev, &s->irq_kbd, 1); @@ -513,7 +519,7 @@ static void i8042_class_initfn(ObjectClass *klass, void *data) } static const TypeInfo i8042_info = { - .name = "i8042", + .name = TYPE_I8042, .parent = TYPE_ISA_DEVICE, .instance_size = sizeof(ISAKBDState), .class_init = i8042_class_initfn,