[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/17] virtio-mmio: Pass size to virtio_mmio_bus_new(
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 13/17] virtio-mmio: Pass size to virtio_mmio_bus_new() |
Date: |
Fri, 30 Aug 2013 21:29:39 +0200 |
To be passed to qbus_create_initialize().
Reviewed-by: Wenchao Xia <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/virtio/virtio-mmio.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c
index 4bd2953..692979e 100644
--- a/hw/virtio/virtio-mmio.c
+++ b/hw/virtio/virtio-mmio.c
@@ -89,7 +89,8 @@ typedef struct {
VirtioBusState bus;
} VirtIOMMIOProxy;
-static void virtio_mmio_bus_new(VirtioBusState *bus, VirtIOMMIOProxy *dev);
+static void virtio_mmio_bus_new(VirtioBusState *bus, size_t bus_size,
+ VirtIOMMIOProxy *dev);
static uint64_t virtio_mmio_read(void *opaque, hwaddr offset, unsigned size)
{
@@ -360,7 +361,7 @@ static void virtio_mmio_realizefn(DeviceState *d, Error
**errp)
VirtIOMMIOProxy *proxy = VIRTIO_MMIO(d);
SysBusDevice *sbd = SYS_BUS_DEVICE(d);
- virtio_mmio_bus_new(&proxy->bus, proxy);
+ virtio_mmio_bus_new(&proxy->bus, sizeof(proxy->bus), proxy);
sysbus_init_irq(sbd, &proxy->irq);
memory_region_init_io(&proxy->iomem, OBJECT(d), &virtio_mem_ops, proxy,
TYPE_VIRTIO_MMIO, 0x200);
@@ -385,7 +386,8 @@ static const TypeInfo virtio_mmio_info = {
/* virtio-mmio-bus. */
-static void virtio_mmio_bus_new(VirtioBusState *bus, VirtIOMMIOProxy *dev)
+static void virtio_mmio_bus_new(VirtioBusState *bus, size_t bus_size,
+ VirtIOMMIOProxy *dev)
{
DeviceState *qdev = DEVICE(dev);
BusState *qbus;
--
1.8.1.4
- [Qemu-devel] [PULL 03/17] qom: Fix object_initialize_with_type() argument name in documentation, (continued)
- [Qemu-devel] [PULL 03/17] qom: Fix object_initialize_with_type() argument name in documentation, Andreas Färber, 2013/08/30
- [Qemu-devel] [PULL 04/17] intel-hda: Pass size to hda_codec_bus_init(), Andreas Färber, 2013/08/30
- [Qemu-devel] [PULL 06/17] ide: Pass size to ide_bus_new(), Andreas Färber, 2013/08/30
- [Qemu-devel] [PULL 05/17] ipack: Pass size to ipack_bus_new_inplace(), Andreas Färber, 2013/08/30
- [Qemu-devel] [PULL 07/17] pci: Pass size to pci_bus_new_inplace(), Andreas Färber, 2013/08/30
- [Qemu-devel] [PULL 08/17] scsi: Pass size to scsi_bus_new(), Andreas Färber, 2013/08/30
- [Qemu-devel] [PULL 09/17] usb: Pass size to usb_bus_new(), Andreas Färber, 2013/08/30
- [Qemu-devel] [PULL 10/17] virtio-pci: Pass size to virtio_pci_bus_new(), Andreas Färber, 2013/08/30
- [Qemu-devel] [PULL 11/17] s390-virtio-bus: Pass size to virtio_s390_bus_new(), Andreas Färber, 2013/08/30
- [Qemu-devel] [PULL 12/17] virtio-ccw: Pass size to virtio_ccw_bus_new(), Andreas Färber, 2013/08/30
- [Qemu-devel] [PULL 13/17] virtio-mmio: Pass size to virtio_mmio_bus_new(),
Andreas Färber <=
- [Qemu-devel] [PULL 14/17] qdev: Pass size to qbus_create_inplace(), Andreas Färber, 2013/08/30
- [Qemu-devel] [PULL 16/17] qom: Assert instance size in object_initialize_with_type(), Andreas Färber, 2013/08/30
- [Qemu-devel] [PULL 17/17] isa: Fix documentation of isa_register_portio_list(), Andreas Färber, 2013/08/30
- [Qemu-devel] [PULL 15/17] qom: Pass available size to object_initialize(), Andreas Färber, 2013/08/30