cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
26ba25
From 4fa8ef564ee9326ceb0b6a4898dee294fa2b4bb4 Mon Sep 17 00:00:00 2001
26ba25
From: Kevin Wolf <kwolf@redhat.com>
26ba25
Date: Mon, 2 Jul 2018 12:20:17 +0200
26ba25
Subject: [PATCH 180/268] usb-storage: Add rerror/werror properties
26ba25
26ba25
RH-Author: Kevin Wolf <kwolf@redhat.com>
26ba25
Message-id: <20180702122017.29664-2-kwolf@redhat.com>
26ba25
Patchwork-id: 81183
26ba25
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH 1/1] usb-storage: Add rerror/werror properties
26ba25
Bugzilla: 1595180
26ba25
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
26ba25
RH-Acked-by: Max Reitz <mreitz@redhat.com>
26ba25
RH-Acked-by: John Snow <jsnow@redhat.com>
26ba25
26ba25
The error handling policy was traditionally set with -drive, but with
26ba25
-blockdev it is no longer possible to set frontend options. scsi-disk
26ba25
(and other block devices) have long supported qdev properties to
26ba25
configure the error handling policy, so let's add these options to
26ba25
usb-storage as well and just forward them to the internal scsi-disk
26ba25
instance.
26ba25
26ba25
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
26ba25
Reviewed-by: Markus Armbruster <armbru@redhat.com>
26ba25
(cherry picked from commit b8efb36b9e99dbea7370139c0866b97a933f78d4)
26ba25
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
26ba25
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
---
26ba25
 hw/scsi/scsi-bus.c     | 11 ++++++++++-
26ba25
 hw/usb/dev-storage.c   |  2 ++
26ba25
 include/hw/scsi/scsi.h |  2 ++
26ba25
 3 files changed, 14 insertions(+), 1 deletion(-)
26ba25
26ba25
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
26ba25
index 9646743..5905f6b 100644
26ba25
--- a/hw/scsi/scsi-bus.c
26ba25
+++ b/hw/scsi/scsi-bus.c
26ba25
@@ -226,6 +226,8 @@ static void scsi_qdev_unrealize(DeviceState *qdev, Error **errp)
26ba25
 SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk,
26ba25
                                       int unit, bool removable, int bootindex,
26ba25
                                       bool share_rw,
26ba25
+                                      BlockdevOnError rerror,
26ba25
+                                      BlockdevOnError werror,
26ba25
                                       const char *serial, Error **errp)
26ba25
 {
26ba25
     const char *driver;
26ba25
@@ -262,6 +264,10 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk,
26ba25
         object_unparent(OBJECT(dev));
26ba25
         return NULL;
26ba25
     }
26ba25
+
26ba25
+    qdev_prop_set_enum(dev, "rerror", rerror);
26ba25
+    qdev_prop_set_enum(dev, "werror", werror);
26ba25
+
26ba25
     object_property_set_bool(OBJECT(dev), true, "realized", &err;;
26ba25
     if (err != NULL) {
26ba25
         error_propagate(errp, err);
26ba25
@@ -285,7 +291,10 @@ void scsi_bus_legacy_handle_cmdline(SCSIBus *bus)
26ba25
         }
26ba25
         qemu_opts_loc_restore(dinfo->opts);
26ba25
         scsi_bus_legacy_add_drive(bus, blk_by_legacy_dinfo(dinfo),
26ba25
-                                  unit, false, -1, false, NULL, &error_fatal);
26ba25
+                                  unit, false, -1, false,
26ba25
+                                  BLOCKDEV_ON_ERROR_AUTO,
26ba25
+                                  BLOCKDEV_ON_ERROR_AUTO,
26ba25
+                                  NULL, &error_fatal);
26ba25
     }
26ba25
     loc_pop(&loc;;
26ba25
 }
26ba25
diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
26ba25
index b56c75a..68e2062 100644
26ba25
--- a/hw/usb/dev-storage.c
26ba25
+++ b/hw/usb/dev-storage.c
26ba25
@@ -634,6 +634,7 @@ static void usb_msd_storage_realize(USBDevice *dev, Error **errp)
26ba25
                  &usb_msd_scsi_info_storage, NULL);
26ba25
     scsi_dev = scsi_bus_legacy_add_drive(&s->bus, blk, 0, !!s->removable,
26ba25
                                          s->conf.bootindex, s->conf.share_rw,
26ba25
+                                         s->conf.rerror, s->conf.werror,
26ba25
                                          dev->serial,
26ba25
                                          errp);
26ba25
     blk_unref(blk);
26ba25
@@ -687,6 +688,7 @@ static const VMStateDescription vmstate_usb_msd = {
26ba25
 
26ba25
 static Property msd_properties[] = {
26ba25
     DEFINE_BLOCK_PROPERTIES(MSDState, conf),
26ba25
+    DEFINE_BLOCK_ERROR_PROPERTIES(MSDState, conf),
26ba25
     DEFINE_PROP_BIT("removable", MSDState, removable, 0, false),
26ba25
     DEFINE_PROP_END_OF_LIST(),
26ba25
 };
26ba25
diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h
26ba25
index e35137e..1a7290d 100644
26ba25
--- a/include/hw/scsi/scsi.h
26ba25
+++ b/include/hw/scsi/scsi.h
26ba25
@@ -154,6 +154,8 @@ static inline SCSIBus *scsi_bus_from_device(SCSIDevice *d)
26ba25
 SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk,
26ba25
                                       int unit, bool removable, int bootindex,
26ba25
                                       bool share_rw,
26ba25
+                                      BlockdevOnError rerror,
26ba25
+                                      BlockdevOnError werror,
26ba25
                                       const char *serial, Error **errp);
26ba25
 void scsi_bus_legacy_handle_cmdline(SCSIBus *bus);
26ba25
 void scsi_legacy_handle_cmdline(void);
26ba25
-- 
26ba25
1.8.3.1
26ba25