From patchwork Sat Jul 27 14:04:40 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: 262456 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 070842C0105 for ; Sun, 28 Jul 2013 01:05:08 +1000 (EST) Received: from localhost ([::1]:56385 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V363N-0001DG-8i for incoming@patchwork.ozlabs.org; Sat, 27 Jul 2013 11:05:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56961) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3636-00018b-JE for qemu-devel@nongnu.org; Sat, 27 Jul 2013 11:04:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3628-0006mH-Cu for qemu-devel@nongnu.org; Sat, 27 Jul 2013 11:03:50 -0400 Received: from cantor2.suse.de ([195.135.220.15]:36924 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V356z-0007T2-IW for qemu-devel@nongnu.org; Sat, 27 Jul 2013 10:04:45 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 9FFCCA3B99; Sat, 27 Jul 2013 16:04:44 +0200 (CEST) Message-ID: <51F3D378.5000609@suse.de> Date: Sat, 27 Jul 2013 16:04:40 +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-5-git-send-email-afaerber@suse.de> In-Reply-To: <1374652104-26756-5-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 04/29] integratorcp: QOM'ify icp_pic_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:47, schrieb Andreas Färber: > diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c > index 58f4ed7..af31007 100644 > --- a/hw/arm/integratorcp.c > +++ b/hw/arm/integratorcp.c [...] > @@ -376,7 +382,7 @@ static const MemoryRegionOps icp_pic_ops = { > > static int icp_pic_init(SysBusDevice *dev) > { > - icp_pic_state *s = FROM_SYSBUS(icp_pic_state, dev); > + icp_pic_state *s = INTEGRATOR_PIC(dev); > > qdev_init_gpio_in(&dev->qdev, icp_pic_set_irq, 32); > sysbus_init_irq(dev, &s->parent_irq); [snip] Needs the following addition for ->qdev. Andreas diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c index af31007..d518188 100644 --- a/hw/arm/integratorcp.c +++ b/hw/arm/integratorcp.c @@ -380,16 +380,17 @@ static const MemoryRegionOps icp_pic_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static int icp_pic_init(SysBusDevice *dev) +static int icp_pic_init(SysBusDevice *sbd) { + DeviceState *dev = DEVICE(sbd); icp_pic_state *s = INTEGRATOR_PIC(dev); - qdev_init_gpio_in(&dev->qdev, icp_pic_set_irq, 32); - sysbus_init_irq(dev, &s->parent_irq); - sysbus_init_irq(dev, &s->parent_fiq); + qdev_init_gpio_in(dev, icp_pic_set_irq, 32); + sysbus_init_irq(sbd, &s->parent_irq); + sysbus_init_irq(sbd, &s->parent_fiq); memory_region_init_io(&s->iomem, OBJECT(s), &icp_pic_ops, s, "icp-pic", 0x00800000); - sysbus_init_mmio(dev, &s->iomem); + sysbus_init_mmio(sbd, &s->iomem); return 0; }