From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46775) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YV2FF-0000zp-8N for qemu-devel@nongnu.org; Mon, 09 Mar 2015 14:17:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YV2FA-0004wq-8c for qemu-devel@nongnu.org; Mon, 09 Mar 2015 14:17:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47269) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YV2F9-0004wf-W7 for qemu-devel@nongnu.org; Mon, 09 Mar 2015 14:17:32 -0400 From: Markus Armbruster Date: Mon, 9 Mar 2015 19:17:27 +0100 Message-Id: <1425925048-15482-4-git-send-email-armbru@redhat.com> In-Reply-To: <1425925048-15482-1-git-send-email-armbru@redhat.com> References: <1425925048-15482-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 3/4] scsi: Improve error reporting for invalid drive property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, peter.crosthwaite@xilinx.com, hare@suse.de When setting "realized" fails, scsi_bus_legacy_add_drive() passes the error to qerror_report_err(), then returns an unspecific "Setting drive property failed" error, which is reported further up the call chain. Example: $ qemu-system-x86_64 -nodefaults -S -display none \ > -drive if=scsi,id=foo,file=tmp.qcow2 -global isa-fdc.driveA=foo qemu-system-x86_64: -drive if=scsi,id=foo,file=tmp.qcow2: Property 'scsi-disk.drive' can't take value 'foo', it's in use qemu-system-x86_64: Setting drive property failed qemu-system-x86_64: Initialization of device lsi53c895a failed: Device initialization failed Clean up the obvious way: simply return the original error to the caller. Gets rid of the second message in the above error cascade. Signed-off-by: Markus Armbruster Reviewed-by: Peter Crosthwaite --- hw/scsi/scsi-bus.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 61c595f..bd2c0e4 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -7,7 +7,6 @@ #include "sysemu/blockdev.h" #include "trace.h" #include "sysemu/dma.h" -#include "qapi/qmp/qerror.h" static char *scsibus_get_dev_path(DeviceState *dev); static char *scsibus_get_fw_dev_path(DeviceState *dev); @@ -245,9 +244,7 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk, } qdev_prop_set_drive(dev, "drive", blk, &err); if (err) { - qerror_report_err(err); - error_free(err); - error_setg(errp, "Setting drive property failed"); + error_propagate(errp, err); object_unparent(OBJECT(dev)); return NULL; } -- 1.9.3