From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40283) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmjaR-0005Qy-6X for qemu-devel@nongnu.org; Wed, 12 Jun 2013 07:51:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UmjaO-0002MA-2I for qemu-devel@nongnu.org; Wed, 12 Jun 2013 07:51:35 -0400 Date: Wed, 12 Jun 2013 14:52:06 +0300 From: "Michael S. Tsirkin" Message-ID: <20130612115206.GA29747@redhat.com> References: <1371017717-5439-1-git-send-email-fred.konrad@greensocs.com> <20130612090324.GB8060@redhat.com> <51B839B0.8070104@ozlabs.ru> <20130612091623.GA8686@redhat.com> <51B859C5.3080707@ozlabs.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <51B859C5.3080707@ozlabs.ru> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [RESEND PATCH] virtio-scsi: forward scsibus for virtio-scsi-pci. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexey Kardashevskiy Cc: kwolf@redhat.com, aliguori@us.ibm.com, mark.burton@greensocs.com, qemu-stable@nongnu.org, qemu-devel@nongnu.org, pbonzini@redhat.com, fred.konrad@greensocs.com On Wed, Jun 12, 2013 at 09:21:41PM +1000, Alexey Kardashevskiy wrote: > On 06/12/2013 07:16 PM, Michael S. Tsirkin wrote: > > On Wed, Jun 12, 2013 at 07:04:48PM +1000, Alexey Kardashevskiy wrote: > >> On 06/12/2013 07:03 PM, Michael S. Tsirkin wrote: > >>> On Wed, Jun 12, 2013 at 08:15:17AM +0200, fred.konrad@greensocs.com= wrote: > >>>> From: KONRAD Frederic > >>>> > >>>> 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 s= csi-hot-add > >>>> to the virtio-scsi-device plugged on the virtio-bus. > >>>> > >>>> Cc: qemu-stable@nongnu.org > >>>> Reported-by: Alexey Kardashevskiy > >>>> Reviewed-by: Andreas F=E4rber > >>>> Signed-off-by: KONRAD Frederic > >>> > >>> Acked-by: Michael S. Tsirkin > >>> > >>> Note: we don't seem to have any decent way to > >>> add disks to devices: no QMP interface, > >>> pci address is required instead of using an id ... > >>> > >>> Anyone can be bothered to fix this? > >> > >> > >> Actually PCI address is not always required, this field (we are talk= ing > >> about "drive_add"?) is ignored when "if=3Dnone". > >> > >=20 > > Then documentation in hmp-commands.hx is wrong, isn't it? > > Add that to the list. > >=20 > > if=3Dnone can't be actually used to hot-add > > a disk to a device, can it? It creates a disc and assumes you will > > use it by a device created later. >=20 >=20 > Yep. I run QEMU with -device "virtio-scsi-pci,id=3Ddevice0" and then do= in > console: > drive_add auto file=3Dvirtimg/fc18guest,if=3Dnone,id=3Dbar1 > device_add scsi-disk,bus=3Ddevice0.0,drive=3Dbar1 >=20 > Pretty hot plug :) I see. So you pass the device id of a patent as a bus option? So the real problem is that there's no documentation and what is there in hmp-commands.hx, is wrong. >=20 > >=20 > >=20 > >> > >>>> --- > >>>> 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, DeviceSt= ate *adapter, > >>>> { > >>>> SCSIBus *scsibus; > >>>> SCSIDevice *scsidev; > >>>> + VirtIOPCIProxy *virtio_proxy; > >>>> =20 > >>>> scsibus =3D (SCSIBus *) > >>>> object_dynamic_cast(OBJECT(QLIST_FIRST(&adapter->child_bu= s)), > >>>> 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_SCS= I_PCI)) { > >>>> + error_report("Device is not a SCSI adapter"); > >>>> + return -1; > >>>> + } > >>>> + virtio_proxy =3D VIRTIO_PCI(adapter); > >>>> + adapter =3D DEVICE(virtio_proxy->bus.vdev); > >>>> + scsibus =3D (SCSIBus *) > >>>> + object_dynamic_cast(OBJECT(QLIST_FIRST(&adapter= ->child_bus)), > >>>> + TYPE_SCSI_BUS); > >>>> + assert(scsibus); > >>>> } > >>>> =20 > >>>> /* >=20 >=20 > --=20 > Alexey