summaryrefslogtreecommitdiff
path: root/hw/s390x/s390-virtio-ccw.c
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2016-07-11 12:55:44 +0200
committerCornelia Huck <cornelia.huck@de.ibm.com>2016-07-20 15:47:25 +0200
commit2a79eb1a616a07b0e8c41430f03af254fefe219d (patch)
tree8c54cb1bb49185e0e1e5f6fa70a7c597f0996143 /hw/s390x/s390-virtio-ccw.c
parent727a0424dd77a2c9176d63e7b92d017ee3e8b761 (diff)
downloadqemu-2a79eb1a616a07b0e8c41430f03af254fefe219d.tar.gz
qemu-2a79eb1a616a07b0e8c41430f03af254fefe219d.tar.bz2
qemu-2a79eb1a616a07b0e8c41430f03af254fefe219d.zip
s390x/css: provide a dev_path for css devices
We need to implement the get_dev_path method for the css bus, or else we might end up with two different devices having the same qdev_path. This was noticed when adding two scsi_hd controllers: The SCSIBus code will produce a non-unique dev_path for vmstate usage if the parent bus does not provide the get_dev_path method. We simply use the device's bus id, as this is unique and we won't have any deeper hierarchy from a channel subsystem perspective anyway. Note that we need to disable this for older machine versions, as this changes the migration format. Reported-by: Marc Hartmayer <mhartmay@linux.vnet.ibm.com> Reviewed-by: Halil Pasic <pasic@linux.vnet.ibm.com> Reviewed-by: Sascha Silbe <silbe@linux.vnet.ibm.com> Tested-by: Marc Hartmayer <mhartmay@linux.vnet.ibm.com> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'hw/s390x/s390-virtio-ccw.c')
-rw-r--r--hw/s390x/s390-virtio-ccw.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index caf0a682a7..91d9cefbb5 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -322,6 +322,10 @@ static const TypeInfo ccw_machine_info = {
.driver = TYPE_S390_IPL,\
.property = "iplbext_migration",\
.value = "off",\
+ }, {\
+ .driver = TYPE_VIRTUAL_CSS_BRIDGE,\
+ .property = "css_dev_path",\
+ .value = "off",\
},
#define CCW_COMPAT_2_5 \