[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/24] hw/gpio: pass owner to memory_region_init_io
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 17/24] hw/gpio: pass owner to memory_region_init_io |
Date: |
Tue, 25 Jun 2013 16:14:58 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/gpio/omap_gpio.c | 6 +++---
hw/gpio/pl061.c | 2 +-
hw/gpio/puv3_gpio.c | 2 +-
hw/gpio/zaurus.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/gpio/omap_gpio.c b/hw/gpio/omap_gpio.c
index 13399f9..855afae 100644
--- a/hw/gpio/omap_gpio.c
+++ b/hw/gpio/omap_gpio.c
@@ -677,7 +677,7 @@ static int omap_gpio_init(SysBusDevice *dev)
qdev_init_gpio_in(&dev->qdev, omap_gpio_set, 16);
qdev_init_gpio_out(&dev->qdev, s->omap1.handler, 16);
sysbus_init_irq(dev, &s->omap1.irq);
- memory_region_init_io(&s->iomem, NULL, &omap_gpio_ops, &s->omap1,
+ memory_region_init_io(&s->iomem, OBJECT(s), &omap_gpio_ops, &s->omap1,
"omap.gpio", 0x1000);
sysbus_init_mmio(dev, &s->iomem);
return 0;
@@ -692,7 +692,7 @@ static int omap2_gpio_init(SysBusDevice *dev)
}
if (s->mpu_model < omap3430) {
s->modulecount = (s->mpu_model < omap2430) ? 4 : 5;
- memory_region_init_io(&s->iomem, NULL, &omap2_gpif_top_ops, s,
+ memory_region_init_io(&s->iomem, OBJECT(s), &omap2_gpif_top_ops, s,
"omap2.gpio", 0x1000);
sysbus_init_mmio(dev, &s->iomem);
} else {
@@ -712,7 +712,7 @@ static int omap2_gpio_init(SysBusDevice *dev)
sysbus_init_irq(dev, &m->irq[0]); /* mpu irq */
sysbus_init_irq(dev, &m->irq[1]); /* dsp irq */
sysbus_init_irq(dev, &m->wkup);
- memory_region_init_io(&m->iomem, NULL, &omap2_gpio_module_ops, m,
+ memory_region_init_io(&m->iomem, OBJECT(s), &omap2_gpio_module_ops, m,
"omap.gpio-module", 0x1000);
sysbus_init_mmio(dev, &m->iomem);
}
diff --git a/hw/gpio/pl061.c b/hw/gpio/pl061.c
index d0dd636..a0bbf08 100644
--- a/hw/gpio/pl061.c
+++ b/hw/gpio/pl061.c
@@ -276,7 +276,7 @@ static int pl061_init(SysBusDevice *dev, const unsigned
char *id)
{
pl061_state *s = FROM_SYSBUS(pl061_state, dev);
s->id = id;
- memory_region_init_io(&s->iomem, NULL, &pl061_ops, s, "pl061", 0x1000);
+ memory_region_init_io(&s->iomem, OBJECT(s), &pl061_ops, s, "pl061",
0x1000);
sysbus_init_mmio(dev, &s->iomem);
sysbus_init_irq(dev, &s->irq);
qdev_init_gpio_in(&dev->qdev, pl061_set_irq, 8);
diff --git a/hw/gpio/puv3_gpio.c b/hw/gpio/puv3_gpio.c
index 333c920..18671eb 100644
--- a/hw/gpio/puv3_gpio.c
+++ b/hw/gpio/puv3_gpio.c
@@ -112,7 +112,7 @@ static int puv3_gpio_init(SysBusDevice *dev)
sysbus_init_irq(dev, &s->irq[PUV3_IRQS_GPIOLOW7]);
sysbus_init_irq(dev, &s->irq[PUV3_IRQS_GPIOHIGH]);
- memory_region_init_io(&s->iomem, NULL, &puv3_gpio_ops, s, "puv3_gpio",
+ memory_region_init_io(&s->iomem, OBJECT(s), &puv3_gpio_ops, s, "puv3_gpio",
PUV3_REGS_OFFSET);
sysbus_init_mmio(dev, &s->iomem);
diff --git a/hw/gpio/zaurus.c b/hw/gpio/zaurus.c
index a0e18c3..c235c3e 100644
--- a/hw/gpio/zaurus.c
+++ b/hw/gpio/zaurus.c
@@ -169,7 +169,7 @@ static int scoop_init(SysBusDevice *dev)
s->status = 0x02;
qdev_init_gpio_out(&s->busdev.qdev, s->handler, 16);
qdev_init_gpio_in(&s->busdev.qdev, scoop_gpio_set, 16);
- memory_region_init_io(&s->iomem, NULL, &scoop_ops, s, "scoop", 0x1000);
+ memory_region_init_io(&s->iomem, OBJECT(s), &scoop_ops, s, "scoop",
0x1000);
sysbus_init_mmio(dev, &s->iomem);
--
1.8.1.4
- [Qemu-devel] [PATCH 04/24] vga: pass owner to cirrus_init_common, (continued)
- [Qemu-devel] [PATCH 04/24] vga: pass owner to cirrus_init_common, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 06/24] vga: pass owner to vga_init_io, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 07/24] vga: set owner in vga_update_memory_access, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 08/24] ne2000: pass device to ne2000_setup_io, use it as owner, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 09/24] vfio: pass device to vfio_mmap_bar and use it to set owner, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 10/24] spapr_iommu: pass device to spapr_tce_new_table and use it to set owner, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 11/24] pam: pass device to init_pam and use it to set owner, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 12/24] piolist: add owner argument to initialization functions and pass devices, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 14/24] hw/block: pass owner to memory_region_init_io, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 15/24] hw/c*: pass owner to memory_region_init_io, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 17/24] hw/gpio: pass owner to memory_region_init_io,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 16/24] hw/d*: pass owner to memory_region_init_io, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 20/24] hw/n*: pass owner to memory_region_init_io, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 18/24] hw/i*: pass owner to memory_region_init_io, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 22/24] hw/s*: pass owner to memory_region_init_io, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 19/24] hw/m*: pass owner to memory_region_init_io, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 21/24] hw/p*: pass owner to memory_region_init_io, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 23/24] hw/t*: pass owner to memory_region_init_io, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 24/24] hw/[u-x]*: pass owner to memory_region_init_io, Paolo Bonzini, 2013/06/25
- [Qemu-devel] [PATCH 13/24] hw/a*: pass owner to memory_region_init_io, Paolo Bonzini, 2013/06/25