From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60794) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXBF1-0000im-7V for qemu-devel@nongnu.org; Tue, 30 Apr 2013 10:09:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UXBEw-0005Hp-4m for qemu-devel@nongnu.org; Tue, 30 Apr 2013 10:09:11 -0400 Received: from greensocs.com ([87.106.252.221]:54418 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXBEv-0005HD-VT for qemu-devel@nongnu.org; Tue, 30 Apr 2013 10:09:06 -0400 From: fred.konrad@greensocs.com Date: Tue, 30 Apr 2013 16:08:47 +0200 Message-Id: <1367330931-12994-2-git-send-email-fred.konrad@greensocs.com> In-Reply-To: <1367330931-12994-1-git-send-email-fred.konrad@greensocs.com> References: <1367330931-12994-1-git-send-email-fred.konrad@greensocs.com> Subject: [Qemu-devel] [PATCH for-1.5 v2 1/5] virtio-x-bus: force bus name to virtio-bus. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com, qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, mark.burton@greensocs.com, agraf@suse.de, amit.shah@redhat.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com, afaerber@suse.de, fred.konrad@greensocs.com From: KONRAD Frederic 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 --- hw/s390x/s390-virtio-bus.c | 5 ++++- hw/s390x/virtio-ccw.c | 4 +++- hw/virtio/virtio-pci.c | 5 ++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c index 2cff6b7..d52a547 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 c0f2646..ef99080 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; } diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 41bb41e..070df44 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1474,7 +1474,10 @@ static void virtio_pci_bus_new(VirtioBusState *bus, VirtIOPCIProxy *dev) { DeviceState *qdev = DEVICE(dev); BusState *qbus; - qbus_create_inplace((BusState *)bus, TYPE_VIRTIO_PCI_BUS, qdev, NULL); + char virtio_bus_name[] = "virtio-bus"; + + qbus_create_inplace((BusState *)bus, TYPE_VIRTIO_PCI_BUS, qdev, + virtio_bus_name); qbus = BUS(bus); qbus->allow_hotplug = 1; } -- 1.8.1.4