qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Andreas Färber" <afaerber@suse.de>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Paul Brook <paul@codesourcery.com>
Subject: Re: [Qemu-devel] [PATCH qom-next for-1.6 20/29] stellaris: QOM'ify gptm_state
Date: Sat, 27 Jul 2013 16:15:44 +0200	[thread overview]
Message-ID: <51F3D610.2070207@suse.de> (raw)
In-Reply-To: <1374652104-26756-21-git-send-email-afaerber@suse.de>

Am 24.07.2013 09:48, schrieb Andreas Färber:
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
>  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;
 }




-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

  reply	other threads:[~2013-07-27 14:27 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-24  7:47 [Qemu-devel] [PATCH qom-next for-1.6 00/29] arm: QOM cast cleanups Andreas Färber
2013-07-24  7:47 ` [Qemu-devel] [PATCH qom-next for-1.6 01/29] armv7m: QOM'ify BitBandState Andreas Färber
2013-07-24  7:47 ` [Qemu-devel] [PATCH qom-next for-1.6 02/29] highbank: QOM'ify HighbankRegsState Andreas Färber
2013-07-24  7:47 ` [Qemu-devel] [PATCH qom-next for-1.6 03/29] integratorcp: QOM'ify integratorcm_state Andreas Färber
2013-07-24  7:47 ` [Qemu-devel] [PATCH qom-next for-1.6 04/29] integratorcp: QOM'ify icp_pic_state Andreas Färber
2013-07-27 14:04   ` Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 05/29] musicpal: QOM'ify mv88w8618_eth_state Andreas Färber
2013-07-27 14:07   ` Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 06/29] musicpal: QOM'ify musicpal_lcd_state Andreas Färber
2013-07-27 14:10   ` Andreas Färber
2013-07-27 14:33     ` Jan Kiszka
2013-07-27 15:32       ` Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 07/29] musicpal: Use TYPE_MV88W8618_ETH Andreas Färber
2013-07-24  7:56   ` Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 08/29] musicpal: QOM'ify mv88w8618_pic_state Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 09/29] musicpal: QOM'ify mv88w8618_pit_state Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 10/29] musicpal: QOM'ify mv88w8618_flashcfg Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 11/29] musicpal: QOM'ify musicpal_gpio_state Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 12/29] musicpal: QOM'ify musicpal_key_state Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 13/29] pxa2xx: QOM'ify PXA2xxSSPState Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 14/29] pxa2xx: QOM'ify PXA2xxRTCState Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 15/29] pxa2xx: QOM'ify PXA2xxI2CState Andreas Färber
2013-07-27 14:19   ` Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 16/29] pxa2xx_gpio: QOM'ify PXA2xxGPIOInfo Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 17/29] pxa2xx_pic: QOM'ify PXA2xxPICState Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 18/29] spitz: QOM'ify SLNANDState Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 19/29] spitz: QOM'ify SpitzKeyboardState Andreas Färber
2013-07-27 14:12   ` Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 20/29] stellaris: QOM'ify gptm_state Andreas Färber
2013-07-27 14:15   ` Andreas Färber [this message]
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 21/29] stellaris: QOM'ify stellaris_i2c_state Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 22/29] stellaris: QOM'ify stellaris_adc_state Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 23/29] strongarm: QOM'ify StrongARMPICState Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 24/29] strongarm: QOM'ify StrongARMRTCState Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 25/29] strongarm: QOM'ify StrongARMGPIOInfo Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 26/29] strongarm: QOM'ify StrongARMPPCInfo Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 27/29] strongarm: QOM'ify StrongARMUARTState Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 28/29] strongarm: QOM'ify StrongARMSSPState Andreas Färber
2013-07-24  7:48 ` [Qemu-devel] [PATCH qom-next for-1.6 29/29] versatilepb: QOM'ify vpb_sic_state Andreas Färber

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=51F3D610.2070207@suse.de \
    --to=afaerber@suse.de \
    --cc=paul@codesourcery.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).