yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-scsi-Fix-scsi_bus_legacy_add_drive-scsi-generic-with.patch

9ae3a8
From 284ff94d1e2c50f7314d5a60e0a45d6710160420 Mon Sep 17 00:00:00 2001
9ae3a8
From: Markus Armbruster <armbru@redhat.com>
9ae3a8
Date: Mon, 30 Sep 2013 12:03:39 +0200
9ae3a8
Subject: [PATCH 09/25] scsi: Fix scsi_bus_legacy_add_drive() scsi-generic with serial
9ae3a8
MIME-Version: 1.0
9ae3a8
Content-Type: text/plain; charset=UTF-8
9ae3a8
Content-Transfer-Encoding: 8bit
9ae3a8
9ae3a8
RH-Author: Markus Armbruster <armbru@redhat.com>
9ae3a8
Message-id: <1380542619-20274-2-git-send-email-armbru@redhat.com>
9ae3a8
Patchwork-id: 54583
9ae3a8
O-Subject: [PATCH 7.0 qemu-kvm 1/1] scsi: Fix scsi_bus_legacy_add_drive() scsi-generic with serial
9ae3a8
Bugzilla: 1009285
9ae3a8
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
9ae3a8
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
9ae3a8
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
9ae3a8
9ae3a8
From: Markus Armbruster <armbru@redhat.com>
9ae3a8
9ae3a8
scsi_bus_legacy_add_drive() creates either a scsi-disk or a
9ae3a8
scsi-generic device.  It sets property "serial" to argument serial
9ae3a8
unless null.  Crashes with scsi-generic, because it doesn't have such
9ae3a8
the property.
9ae3a8
9ae3a8
Only usb_msd_initfn_storage() passes non-null serial.  Reproducer:
9ae3a8
9ae3a8
    $ qemu-system-x86_64 -nodefaults -display none -S -usb \
9ae3a8
    -drive if=none,file=/dev/sg1,id=usb-drv0 \
9ae3a8
    -device usb-storage,id=usb-msd0,drive=usb-drv0,serial=123
9ae3a8
    qemu-system-x86_64: -device usb-storage,id=usb-msd0,drive=usb-drv0,serial=123: Property '.serial' not found
9ae3a8
    Aborted (core dumped)
9ae3a8
9ae3a8
Fix by handling exactly like "removable": set the property only when
9ae3a8
it exists.
9ae3a8
9ae3a8
Cc: qemu-stable@nongnu.org
9ae3a8
Reviewed-by: Andreas Färber <afaerber@suse.de>
9ae3a8
Signed-off-by: Markus Armbruster <armbru@redhat.com>
9ae3a8
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
9ae3a8
(cherry picked from commit c24e7517ee4a98e90eee5f0f07708a1fa12326b3)
9ae3a8
---
9ae3a8
 hw/scsi/scsi-bus.c | 2 +-
9ae3a8
 1 file changed, 1 insertion(+), 1 deletion(-)
9ae3a8
9ae3a8
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
9ae3a8
---
9ae3a8
 hw/scsi/scsi-bus.c |    2 +-
9ae3a8
 1 files changed, 1 insertions(+), 1 deletions(-)
9ae3a8
9ae3a8
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
9ae3a8
index 53ea906..0885d9d 100644
9ae3a8
--- a/hw/scsi/scsi-bus.c
9ae3a8
+++ b/hw/scsi/scsi-bus.c
9ae3a8
@@ -223,7 +223,7 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockDriverState *bdrv,
9ae3a8
     if (object_property_find(OBJECT(dev), "removable", NULL)) {
9ae3a8
         qdev_prop_set_bit(dev, "removable", removable);
9ae3a8
     }
9ae3a8
-    if (serial) {
9ae3a8
+    if (serial && object_property_find(OBJECT(dev), "serial", NULL)) {
9ae3a8
         qdev_prop_set_string(dev, "serial", serial);
9ae3a8
     }
9ae3a8
     if (qdev_prop_set_drive(dev, "drive", bdrv) < 0) {
9ae3a8
-- 
9ae3a8
1.7.1
9ae3a8