summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKONRAD Frederic <fred.konrad@greensocs.com>2013-01-15 00:08:06 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2013-01-21 13:23:14 -0600
commit11e9235b1a88a98124fe005c93ade019d6a09c0b (patch)
tree1d71626c1eca56076265254ab9bdec41fe154a1e
parentea35d4f1e9781a4b489d550e4bbc4568704f34bf (diff)
downloadfocaccia-qemu-11e9235b1a88a98124fe005c93ade019d6a09c0b.tar.gz
focaccia-qemu-11e9235b1a88a98124fe005c93ade019d6a09c0b.zip
virtio-s390-device: create a virtio-s390-bus during init.
A virtio-s390-bus is created during the init. So one VirtIODevice can be
connected on the virtio-s390-device through this bus.

Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--hw/s390-virtio-bus.c2
-rw-r--r--hw/s390-virtio-bus.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
index f78725fa91..b5d1f2be16 100644
--- a/hw/s390-virtio-bus.c
+++ b/hw/s390-virtio-bus.c
@@ -503,6 +503,8 @@ static int s390_virtio_busdev_init(DeviceState *dev)
     VirtIOS390Device *_dev = (VirtIOS390Device *)dev;
     VirtIOS390DeviceClass *_info = VIRTIO_S390_DEVICE_GET_CLASS(dev);
 
+    virtio_s390_bus_new(&_dev->bus, _dev);
+
     return _info->init(_dev);
 }
 
diff --git a/hw/s390-virtio-bus.h b/hw/s390-virtio-bus.h
index ffc6f88a89..438b37fd82 100644
--- a/hw/s390-virtio-bus.h
+++ b/hw/s390-virtio-bus.h
@@ -96,6 +96,7 @@ struct VirtIOS390Device {
     virtio_net_conf net;
     VirtIOSCSIConf scsi;
     VirtIORNGConf rng;
+    VirtioBusState bus;
 };
 
 typedef struct VirtIOS390Bus {