From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46587)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1Um5Se-0007Iq-Lw
	for qemu-devel@nongnu.org; Mon, 10 Jun 2013 13:00:56 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1Um5SY-0001pc-HY
	for qemu-devel@nongnu.org; Mon, 10 Jun 2013 13:00:52 -0400
Date: Mon, 10 Jun 2013 20:00:40 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20130610170040.GA31383@redhat.com>
References: <1370857984-17584-1-git-send-email-fred.konrad@greensocs.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1370857984-17584-1-git-send-email-fred.konrad@greensocs.com>
Subject: Re: [Qemu-devel] [PATCH] virtio-scsi: forward scsibus for
	virtio-scsi-pci.
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: fred.konrad@greensocs.com
Cc: aliguori@us.ibm.com, aik@ozlabs.ru, mark.burton@greensocs.com, qemu-devel@nongnu.org, qemu-stable@nongnu.org, pbonzini@redhat.com, david@gibson.dropbear.id.au

On Mon, Jun 10, 2013 at 11:53:04AM +0200, fred.konrad@greensocs.com wrote:
> From: KONRAD Frederic <fred.konrad@greensocs.com>
> 
> This fix a bug with scsi hotplug on virtio-scsi-pci:
> 
> As virtio-scsi-pci doesn't have any scsi bus, we need to forward scsi-hot-add
> to the virtio-scsi-device plugged on the virtio-bus.
> 
> Reported-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
> ---
>  hw/pci/pci-hotplug.c | 19 +++++++++++++++++--
>  1 file changed, 17 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/pci/pci-hotplug.c b/hw/pci/pci-hotplug.c
> index 12287d1..c708752 100644
> --- a/hw/pci/pci-hotplug.c
> +++ b/hw/pci/pci-hotplug.c
> @@ -30,6 +30,8 @@
>  #include "monitor/monitor.h"
>  #include "hw/scsi/scsi.h"
>  #include "hw/virtio/virtio-blk.h"
> +#include "hw/virtio/virtio-scsi.h"
> +#include "hw/virtio/virtio-pci.h"
>  #include "qemu/config-file.h"
>  #include "sysemu/blockdev.h"
>  #include "qapi/error.h"
> @@ -79,13 +81,26 @@ static int scsi_hot_add(Monitor *mon, DeviceState *adapter,
>  {
>      SCSIBus *scsibus;
>      SCSIDevice *scsidev;
> +    VirtIOPCIProxy *virtio_proxy;
>  
>      scsibus = (SCSIBus *)
>          object_dynamic_cast(OBJECT(QLIST_FIRST(&adapter->child_bus)),
>                              TYPE_SCSI_BUS);
>      if (!scsibus) {
> -	error_report("Device is not a SCSI adapter");
> -	return -1;
> +        /*
> +         * Check if the adapter is a virtio-scsi-pci, and forward scsi_hot_add
> +         * to the virtio-scsi-device.
> +         */
> +        if (!object_dynamic_cast(OBJECT(adapter), TYPE_VIRTIO_SCSI_PCI)) {
> +            error_report("Device is not a SCSI adapter");
> +            return -1;
> +        }
> +        virtio_proxy = VIRTIO_PCI(adapter);
> +        adapter = DEVICE(virtio_proxy->bus.vdev);
> +        scsibus = (SCSIBus *)
> +                  object_dynamic_cast(OBJECT(QLIST_FIRST(&adapter->child_bus)),
> +                            TYPE_SCSI_BUS);
> +        assert(scsibus);
>      }
>  
>      /*

By the way I really wonder. pci-hotplug.c was supposed to
be legacy interface.
Is this the only way to add scsi disks?
And are other ways broken, too?

> -- 
> 1.8.1.4