qemu-patch-raspberry4/hw/scsi
Markus Armbruster fa61718183 scsi: Clean up duplicated error in legacy if=scsi code
Commit a818a4b changed scsi_bus_legacy_handle_cmdline() to report
errors from scsi_bus_legacy_add_drive() with error_report() in
addition to returning them.  That's inappropriate.

Two kinds of callers:

1. realize methods (devices "esp", "virtio-scsi-device" and
   "spapr-vscsi")

   The error object gets passed up the call chain until it gets
   reported again and freed.

   Example:

   $ qemu-system-arm -M virt -S -display none \
   > -drive if=scsi,id=foo,bus=1,file=tmp.qcow2 \
   > -device nec-usb-xhci -device usb-storage,drive=foo \
   > -device virtio-scsi-pci
   qemu-system-arm: -drive if=scsi,id=foo,bus=1,file=tmp.qcow2: Property 'scsi-disk.drive' can't take value 'foo', it's in use
   qemu-system-arm: -drive if=scsi,id=foo,bus=1,file=tmp.qcow2: Setting drive property failed
   qemu-system-arm: -device virtio-scsi-pci: Setting drive property failed
   qemu-system-arm: -device virtio-scsi-pci: Device initialization failed
   qemu-system-arm: -device virtio-scsi-pci: Device 'virtio-scsi-pci' could not be initialized

   The second message in this error cascade comes from
   scsi_bus_legacy_handle_cmdline().  The error object then gets
   passed up to the qdev_init() called from
   virtio_scsi_pci_init_pci(), which reports it again.

2. init methods (devices "am53c974", "dc390", "lsi53c895a",
   "lsi53c810", "megasas", "megasas-gen2")

   init methods need to report their errors with qerror_report().
   These don't.  The inappropriate error_report() papers over the bug.

   error_report() isn't the same as qerror_report() in QMP context,
   but this can't actually happen: QMP can still only hot-plug, and
   callers call scsi_bus_legacy_handle_cmdline() only on cold-plug.
   Except for sysbus_esp_realize(), but that can't be hot-plugged at
   all, as far as I can tell.

Fix the init methods and drop the inappropriate error_report() in
scsi_bus_legacy_handle_cmdline().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Message-Id: <1425925048-15482-2-git-send-email-armbru@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2015-03-10 11:18:23 +01:00
..
esp-pci.c scsi: Clean up duplicated error in legacy if=scsi code 2015-03-10 11:18:23 +01:00
esp.c esp: Do not overwrite ESP_TCHI after reset 2014-11-12 10:27:03 +01:00
lsi53c895a.c scsi: Clean up duplicated error in legacy if=scsi code 2015-03-10 11:18:23 +01:00
Makefile.objs virtio-scsi-dataplane: Code to run virtio-scsi on iothread 2014-09-30 11:11:20 +02:00
megasas.c scsi: Clean up duplicated error in legacy if=scsi code 2015-03-10 11:18:23 +01:00
mfi.h megasas: add MegaRAID SAS 2108 emulation 2014-10-31 11:29:00 +01:00
scsi-bus.c scsi: Clean up duplicated error in legacy if=scsi code 2015-03-10 11:18:23 +01:00
scsi-disk.c scsi-disk: provide maximum transfer length 2014-12-15 12:21:02 +01:00
scsi-generic.c scsi: Drop superfluous conditionals around g_free() 2014-12-15 12:21:02 +01:00
spapr_vscsi.c spapr_vio: Convert to realize() 2015-03-09 15:00:07 +01:00
srp.h spapr-vscsi: add task management 2013-09-12 08:46:21 +02:00
vhost-scsi.c Clean up around error_get_pretty(), qerror_report_err() 2015-02-26 07:01:08 +00:00
viosrp.h hw: move private headers to hw/ subdirectories. 2013-04-08 18:13:16 +02:00
virtio-scsi-dataplane.c virtio-scsi: Allocate op blocker reason before blocking 2015-03-02 10:57:07 +01:00
virtio-scsi.c pci, pc, virtio fixes and cleanups 2015-03-09 09:14:28 +00:00
vmw_pvscsi.c scsi: Convert pvscsi HBA to hotplug handler API 2014-10-15 05:03:14 +02:00
vmw_pvscsi.h scsi: VMWare PVSCSI paravirtual device implementation 2013-04-19 10:44:17 +02:00