|
 |
4a2fec |
From b2e6b34cedd32864edaa28dd7b7f8a8bf9578569 Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: Fam Zheng <famz@redhat.com>
|
|
|
4a2fec |
Date: Mon, 29 Jan 2018 05:38:19 +0100
|
|
|
4a2fec |
Subject: [PATCH 7/8] usb-storage: Fix share-rw option parsing
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: Fam Zheng <famz@redhat.com>
|
|
|
4a2fec |
Message-id: <20180129053819.14507-1-famz@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 78734
|
|
|
4a2fec |
O-Subject: [RHV7.5 qemu-kvm-rhev PATCH] usb-storage: Fix share-rw option parsing
|
|
|
4a2fec |
Bugzilla: 1525324
|
|
|
4a2fec |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
Because usb-storage creates an internal scsi device, we should propagate
|
|
|
4a2fec |
options. We already do so for bootindex etc, but failed to take care of
|
|
|
4a2fec |
share-rw. Fix it in an apparent way: add a new parameter to
|
|
|
4a2fec |
scsi_bus_legacy_add_drive and pass in s->conf.share_rw.
|
|
|
4a2fec |
|
|
|
4a2fec |
Cc: qemu-stable@nongnu.org
|
|
|
4a2fec |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
4a2fec |
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
|
|
|
4a2fec |
Message-id: 20180117005222.4781-1-famz@redhat.com
|
|
|
4a2fec |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
4a2fec |
(cherry picked from commit 395b95395934785ca86baafd314d0c31b307d16d)
|
|
|
4a2fec |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
Conflicts:
|
|
|
4a2fec |
hw/usb/dev-storage.c
|
|
|
4a2fec |
Contextual conflict. Upstream has cleaned up err parameter in ceff3e1f0
|
|
|
4a2fec |
(hw/block: Use errp directly rather than local_err), which is an
|
|
|
4a2fec |
unrelated code refactoring and has other dependencies.
|
|
|
4a2fec |
---
|
|
|
4a2fec |
hw/scsi/scsi-bus.c | 9 ++++++++-
|
|
|
4a2fec |
hw/usb/dev-storage.c | 3 ++-
|
|
|
4a2fec |
include/hw/scsi/scsi.h | 1 +
|
|
|
4a2fec |
3 files changed, 11 insertions(+), 2 deletions(-)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
|
|
|
4a2fec |
index 97c9525..26148aa 100644
|
|
|
4a2fec |
--- a/hw/scsi/scsi-bus.c
|
|
|
4a2fec |
+++ b/hw/scsi/scsi-bus.c
|
|
|
4a2fec |
@@ -224,6 +224,7 @@ static void scsi_qdev_unrealize(DeviceState *qdev, Error **errp)
|
|
|
4a2fec |
/* handle legacy '-drive if=scsi,...' cmd line args */
|
|
|
4a2fec |
SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk,
|
|
|
4a2fec |
int unit, bool removable, int bootindex,
|
|
|
4a2fec |
+ bool share_rw,
|
|
|
4a2fec |
const char *serial, Error **errp)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
const char *driver;
|
|
|
4a2fec |
@@ -254,6 +255,12 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk,
|
|
|
4a2fec |
object_unparent(OBJECT(dev));
|
|
|
4a2fec |
return NULL;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
+ object_property_set_bool(OBJECT(dev), share_rw, "share-rw", &err;;
|
|
|
4a2fec |
+ if (err != NULL) {
|
|
|
4a2fec |
+ error_propagate(errp, err);
|
|
|
4a2fec |
+ object_unparent(OBJECT(dev));
|
|
|
4a2fec |
+ return NULL;
|
|
|
4a2fec |
+ }
|
|
|
4a2fec |
object_property_set_bool(OBJECT(dev), true, "realized", &err;;
|
|
|
4a2fec |
if (err != NULL) {
|
|
|
4a2fec |
error_propagate(errp, err);
|
|
|
4a2fec |
@@ -292,7 +299,7 @@ void scsi_bus_legacy_handle_cmdline(SCSIBus *bus, bool deprecated)
|
|
|
4a2fec |
#endif
|
|
|
4a2fec |
}
|
|
|
4a2fec |
scsi_bus_legacy_add_drive(bus, blk_by_legacy_dinfo(dinfo),
|
|
|
4a2fec |
- unit, false, -1, NULL, &error_fatal);
|
|
|
4a2fec |
+ unit, false, -1, false, NULL, &error_fatal);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
loc_pop(&loc;;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
|
|
|
4a2fec |
index 8a61ec9..ff18ad5 100644
|
|
|
4a2fec |
--- a/hw/usb/dev-storage.c
|
|
|
4a2fec |
+++ b/hw/usb/dev-storage.c
|
|
|
4a2fec |
@@ -635,7 +635,8 @@ static void usb_msd_realize_storage(USBDevice *dev, Error **errp)
|
|
|
4a2fec |
scsi_bus_new(&s->bus, sizeof(s->bus), DEVICE(dev),
|
|
|
4a2fec |
&usb_msd_scsi_info_storage, NULL);
|
|
|
4a2fec |
scsi_dev = scsi_bus_legacy_add_drive(&s->bus, blk, 0, !!s->removable,
|
|
|
4a2fec |
- s->conf.bootindex, dev->serial,
|
|
|
4a2fec |
+ s->conf.bootindex, s->conf.share_rw,
|
|
|
4a2fec |
+ dev->serial,
|
|
|
4a2fec |
&err;;
|
|
|
4a2fec |
blk_unref(blk);
|
|
|
4a2fec |
if (!scsi_dev) {
|
|
|
4a2fec |
diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h
|
|
|
4a2fec |
index 23a8ee6..802a647 100644
|
|
|
4a2fec |
--- a/include/hw/scsi/scsi.h
|
|
|
4a2fec |
+++ b/include/hw/scsi/scsi.h
|
|
|
4a2fec |
@@ -151,6 +151,7 @@ static inline SCSIBus *scsi_bus_from_device(SCSIDevice *d)
|
|
|
4a2fec |
|
|
|
4a2fec |
SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk,
|
|
|
4a2fec |
int unit, bool removable, int bootindex,
|
|
|
4a2fec |
+ bool share_rw,
|
|
|
4a2fec |
const char *serial, Error **errp);
|
|
|
4a2fec |
void scsi_bus_legacy_handle_cmdline(SCSIBus *bus, bool deprecated);
|
|
|
4a2fec |
void scsi_legacy_handle_cmdline(void);
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|