Commit 395b9539 authored by Fam Zheng's avatar Fam Zheng Committed by Gerd Hoffmann
Browse files

usb-storage: Fix share-rw option parsing 



Because usb-storage creates an internal scsi device, we should propagate
options. We already do so for bootindex etc, but failed to take care of
share-rw. Fix it in an apparent way: add a new parameter to
scsi_bus_legacy_add_drive and pass in s->conf.share_rw.

Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarDarren Kenny <darren.kenny@oracle.com>
Message-id: 20180117005222.4781-1-famz@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 99761176

hw/scsi/scsi-bus.c

+8 −1
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ static void scsi_qdev_unrealize(DeviceState *qdev, Error **errp) 
/* handle legacy '-drive if=scsi,...' cmd line args */

SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk,

                                      int unit, bool removable, int bootindex,

                                      bool share_rw,

                                      const char *serial, Error **errp)

{

    const char *driver;
@@ -254,6 +255,12 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk, 
        object_unparent(OBJECT(dev));

        return NULL;

    }

    object_property_set_bool(OBJECT(dev), share_rw, "share-rw", &err);

    if (err != NULL) {

        error_propagate(errp, err);

        object_unparent(OBJECT(dev));

        return NULL;

    }

    object_property_set_bool(OBJECT(dev), true, "realized", &err);

    if (err != NULL) {

        error_propagate(errp, err);
@@ -288,7 +295,7 @@ void scsi_bus_legacy_handle_cmdline(SCSIBus *bus, bool deprecated) 
            }

        }

        scsi_bus_legacy_add_drive(bus, blk_by_legacy_dinfo(dinfo),

                                  unit, false, -1, NULL, &error_fatal);

                                  unit, false, -1, false, NULL, &error_fatal);

    }

    loc_pop(&loc);

}

hw/usb/dev-storage.c

+2 −1
Original line number Diff line number Diff line
@@ -633,7 +633,8 @@ static void usb_msd_storage_realize(USBDevice *dev, Error **errp) 
    scsi_bus_new(&s->bus, sizeof(s->bus), DEVICE(dev),

                 &usb_msd_scsi_info_storage, NULL);

    scsi_dev = scsi_bus_legacy_add_drive(&s->bus, blk, 0, !!s->removable,

                                         s->conf.bootindex, dev->serial,

                                         s->conf.bootindex, s->conf.share_rw,

                                         dev->serial,

                                         errp);

    blk_unref(blk);

    if (!scsi_dev) {

include/hw/scsi/scsi.h

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ static inline SCSIBus *scsi_bus_from_device(SCSIDevice *d) 


SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk,

                                      int unit, bool removable, int bootindex,

                                      bool share_rw,

                                      const char *serial, Error **errp);

void scsi_bus_legacy_handle_cmdline(SCSIBus *bus, bool deprecated);

void scsi_legacy_handle_cmdline(void);