diff options
| author | KONRAD Frederic <fred.konrad@greensocs.com> | 2013-04-30 16:08:47 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-03 12:05:14 -0500 |
| commit | f4dd69aa4ce96196b3d84cd3d3e14a79ea029630 (patch) | |
| tree | abdb81126d4104f46f8b2afb5597f6a8e0057bcd /hw/s390x | |
| parent | 0057a0d59006d00c294de0b012d9a290eb1a5c80 (diff) | |
virtio-x-bus: force bus name to virtio-bus.
When the proxy id is set, this bus takes the name "id.0" which is expected
to be the virtio-device's first bus.
So force this name to "virtio-bus" as it is an internal bus.
Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
Tested-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Message-id: 1367330931-12994-2-git-send-email-fred.konrad@greensocs.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/s390x')
| -rw-r--r-- | hw/s390x/s390-virtio-bus.c | 5 | ||||
| -rw-r--r-- | hw/s390x/virtio-ccw.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c index 2cff6b794d..d52a54725f 100644 --- a/hw/s390x/s390-virtio-bus.c +++ b/hw/s390x/s390-virtio-bus.c @@ -669,7 +669,10 @@ static void virtio_s390_bus_new(VirtioBusState *bus, VirtIOS390Device *dev) { DeviceState *qdev = DEVICE(dev); BusState *qbus; - qbus_create_inplace((BusState *)bus, TYPE_VIRTIO_S390_BUS, qdev, NULL); + char virtio_bus_name[] = "virtio-bus"; + + qbus_create_inplace((BusState *)bus, TYPE_VIRTIO_S390_BUS, qdev, + virtio_bus_name); qbus = BUS(bus); qbus->allow_hotplug = 1; } diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index c0f26460a9..ef9908001d 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -1062,8 +1062,10 @@ static void virtio_ccw_bus_new(VirtioBusState *bus, VirtioCcwDevice *dev) { DeviceState *qdev = DEVICE(dev); BusState *qbus; + char virtio_bus_name[] = "virtio-bus"; - qbus_create_inplace((BusState *)bus, TYPE_VIRTIO_CCW_BUS, qdev, NULL); + qbus_create_inplace((BusState *)bus, TYPE_VIRTIO_CCW_BUS, qdev, + virtio_bus_name); qbus = BUS(bus); qbus->allow_hotplug = 1; } |