From patchwork Tue Apr 30 14:08:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fred.konrad@greensocs.com X-Patchwork-Id: 240627 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 18E882C00CC for ; Wed, 1 May 2013 00:10:07 +1000 (EST) Received: from localhost ([::1]:35316 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXBFt-0001Oh-1i for incoming@patchwork.ozlabs.org; Tue, 30 Apr 2013 10:10:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60860) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXBFF-000168-TW for qemu-devel@nongnu.org; Tue, 30 Apr 2013 10:09:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UXBF9-0005YR-D7 for qemu-devel@nongnu.org; Tue, 30 Apr 2013 10:09:25 -0400 Received: from greensocs.com ([87.106.252.221]:54461 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UXBF9-0005YN-2C for qemu-devel@nongnu.org; Tue, 30 Apr 2013 10:09:19 -0400 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id 6AED740EC69; Tue, 30 Apr 2013 14:09:18 +0000 (UTC) Received: from s15328186.onlinehome-server.info ([127.0.0.1]) by localhost (s15328186.onlinehome-server.info [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MZjajD4LKJOD; Tue, 30 Apr 2013 16:09:13 +0200 (CEST) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id 6BCBA40EC6D; Tue, 30 Apr 2013 16:09:11 +0200 (CEST) Received: from localhost.localdomain (lan31-11-83-155-143-136.fbx.proxad.net [83.155.143.136]) by s15328186.onlinehome-server.info (Postfix) with ESMTPSA id 9134840B250; Tue, 30 Apr 2013 16:09:09 +0200 (CEST) From: fred.konrad@greensocs.com To: aliguori@us.ibm.com, qemu-devel@nongnu.org Date: Tue, 30 Apr 2013 16:08:51 +0200 Message-Id: <1367330931-12994-6-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1367330931-12994-1-git-send-email-fred.konrad@greensocs.com> References: <1367330931-12994-1-git-send-email-fred.konrad@greensocs.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 87.106.252.221 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 Subject: [Qemu-devel] [PATCH for-1.5 v2 5/5] virtio-scsi: fix the command line compatibility. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: KONRAD Frederic The bus name is wrong since the refactoring. This keeps the behaviour of the command line. Signed-off-by: KONRAD Frederic --- hw/s390x/s390-virtio-bus.c | 12 ++++++++++++ hw/s390x/virtio-ccw.c | 12 ++++++++++++ hw/scsi/virtio-scsi.c | 3 ++- hw/virtio/virtio-pci.c | 12 ++++++++++++ include/hw/virtio/virtio-scsi.h | 1 - 5 files changed, 38 insertions(+), 2 deletions(-) diff --git a/hw/s390x/s390-virtio-bus.c b/hw/s390x/s390-virtio-bus.c index 83faf97..5a3d97c 100644 --- a/hw/s390x/s390-virtio-bus.c +++ b/hw/s390x/s390-virtio-bus.c @@ -235,6 +235,18 @@ static int s390_virtio_scsi_init(VirtIOS390Device *s390_dev) { VirtIOSCSIS390 *dev = VIRTIO_SCSI_S390(s390_dev); DeviceState *vdev = DEVICE(&dev->vdev); + DeviceState *qdev = DEVICE(s390_dev); + char *bus_name; + + /* + * For command line compatibility, this sets the virtio-scsi-device bus + * name as before. + */ + if (qdev->id) { + bus_name = g_strdup_printf("%s.0", qdev->id); + virtio_device_set_child_bus_name(VIRTIO_DEVICE(vdev), bus_name); + g_free(bus_name); + } qdev_set_parent_bus(vdev, BUS(&s390_dev->bus)); if (qdev_init(vdev) < 0) { diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 4ebefd8..76e6d32 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -680,6 +680,18 @@ static int virtio_ccw_scsi_init(VirtioCcwDevice *ccw_dev) { VirtIOSCSICcw *dev = VIRTIO_SCSI_CCW(ccw_dev); DeviceState *vdev = DEVICE(&dev->vdev); + DeviceState *qdev = DEVICE(ccw_dev); + char *bus_name; + + /* + * For command line compatibility, this sets the virtio-scsi-device bus + * name as before. + */ + if (qdev->id) { + bus_name = g_strdup_printf("%s.0", qdev->id); + virtio_device_set_child_bus_name(VIRTIO_DEVICE(vdev), bus_name); + g_free(bus_name); + } qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus)); if (qdev_init(vdev) < 0) { diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index f7ce743..08dd3f3 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -624,7 +624,8 @@ static int virtio_scsi_device_init(VirtIODevice *vdev) return ret; } - scsi_bus_new(&s->bus, qdev, &virtio_scsi_scsi_info, NULL); + scsi_bus_new(&s->bus, qdev, &virtio_scsi_scsi_info, vdev->bus_name); + if (!qdev->hotplugged) { scsi_bus_legacy_handle_cmdline(&s->bus); } diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index abd2a3e..ec0066b 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1106,11 +1106,23 @@ static int virtio_scsi_pci_init_pci(VirtIOPCIProxy *vpci_dev) VirtIOSCSIPCI *dev = VIRTIO_SCSI_PCI(vpci_dev); DeviceState *vdev = DEVICE(&dev->vdev); VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(vdev); + DeviceState *proxy = DEVICE(vpci_dev); + char *bus_name; if (vpci_dev->nvectors == DEV_NVECTORS_UNSPECIFIED) { vpci_dev->nvectors = vs->conf.num_queues + 3; } + /* + * For command line compatibility, this sets the virtio-scsi-device bus + * name as before. + */ + if (proxy->id) { + bus_name = g_strdup_printf("%s.0", proxy->id); + virtio_device_set_child_bus_name(VIRTIO_DEVICE(vdev), bus_name); + g_free(bus_name); + } + qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus)); if (qdev_init(vdev) < 0) { return -1; diff --git a/include/hw/virtio/virtio-scsi.h b/include/hw/virtio/virtio-scsi.h index 4db346b..9a98540 100644 --- a/include/hw/virtio/virtio-scsi.h +++ b/include/hw/virtio/virtio-scsi.h @@ -189,5 +189,4 @@ typedef struct { int virtio_scsi_common_init(VirtIOSCSICommon *vs); int virtio_scsi_common_exit(VirtIOSCSICommon *vs); - #endif /* _QEMU_VIRTIO_SCSI_H */