From patchwork Sat Jul 27 14:15:44 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: 262453 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CE43A2C0111 for ; Sun, 28 Jul 2013 00:27:44 +1000 (EST) Received: from localhost ([::1]:49582 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V35TB-0004Ga-W9 for incoming@patchwork.ozlabs.org; Sat, 27 Jul 2013 10:27:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39462) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V35Sr-0004AH-Sa for qemu-devel@nongnu.org; Sat, 27 Jul 2013 10:27:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V35QU-0003ih-Lu for qemu-devel@nongnu.org; Sat, 27 Jul 2013 10:24:56 -0400 Received: from cantor2.suse.de ([195.135.220.15]:37099 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V35Hh-0001mm-0n for qemu-devel@nongnu.org; Sat, 27 Jul 2013 10:15:49 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 8A247A4EB7; Sat, 27 Jul 2013 16:15:48 +0200 (CEST) Message-ID: <51F3D610.2070207@suse.de> Date: Sat, 27 Jul 2013 16:15:44 +0200 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= Organization: SUSE LINUX Products GmbH User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130620 Thunderbird/17.0.7 MIME-Version: 1.0 To: qemu-devel@nongnu.org References: <1374652104-26756-1-git-send-email-afaerber@suse.de> <1374652104-26756-21-git-send-email-afaerber@suse.de> In-Reply-To: <1374652104-26756-21-git-send-email-afaerber@suse.de> X-Enigmail-Version: 1.6a1pre X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: Peter Maydell , Paul Brook Subject: Re: [Qemu-devel] [PATCH qom-next for-1.6 20/29] stellaris: QOM'ify gptm_state 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 Am 24.07.2013 09:48, schrieb Andreas Färber: > Signed-off-by: Andreas Färber > --- > hw/arm/stellaris.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c > index a2b6b17..1c69bcf 100644 > --- a/hw/arm/stellaris.c > +++ b/hw/arm/stellaris.c > @@ -43,8 +43,13 @@ typedef const struct { > > /* General purpose timer module. */ > > +#define TYPE_STELLARIS_GPTM "stellaris-gptm" > +#define STELLARIS_GPTM(obj) \ > + OBJECT_CHECK(gptm_state, (obj), TYPE_STELLARIS_GPTM) > + > typedef struct gptm_state { > - SysBusDevice busdev; > + SysBusDevice parent_obj; > + > MemoryRegion iomem; > uint32_t config; > uint32_t mode[2]; > @@ -302,7 +307,7 @@ static const VMStateDescription vmstate_stellaris_gptm = { > > static int stellaris_gptm_init(SysBusDevice *dev) > { > - gptm_state *s = FROM_SYSBUS(gptm_state, dev); > + gptm_state *s = STELLARIS_GPTM(dev); > > sysbus_init_irq(dev, &s->irq); > qdev_init_gpio_out(&dev->qdev, &s->trigger, 1); [snip] Needs the following addition. Andreas diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index 27205d0..79f6b4e 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -305,21 +305,22 @@ static const VMStateDescription vmstate_stellaris_gptm = { } }; -static int stellaris_gptm_init(SysBusDevice *dev) +static int stellaris_gptm_init(SysBusDevice *sbd) { + DeviceState *dev = DEVICE(sbd); gptm_state *s = STELLARIS_GPTM(dev); - sysbus_init_irq(dev, &s->irq); - qdev_init_gpio_out(&dev->qdev, &s->trigger, 1); + sysbus_init_irq(sbd, &s->irq); + qdev_init_gpio_out(dev, &s->trigger, 1); memory_region_init_io(&s->iomem, OBJECT(s), &gptm_ops, s, "gptm", 0x1000); - sysbus_init_mmio(dev, &s->iomem); + sysbus_init_mmio(sbd, &s->iomem); s->opaque[0] = s->opaque[1] = s; s->timer[0] = qemu_new_timer_ns(vm_clock, gptm_tick, &s->opaque[0]); s->timer[1] = qemu_new_timer_ns(vm_clock, gptm_tick, &s->opaque[1]); - vmstate_register(&dev->qdev, -1, &vmstate_stellaris_gptm, s); + vmstate_register(dev, -1, &vmstate_stellaris_gptm, s); return 0; }