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