From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=39416 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OWA9d-0006OP-EE for qemu-devel@nongnu.org; Tue, 06 Jul 2010 11:33:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OWA9c-00009r-3Z for qemu-devel@nongnu.org; Tue, 06 Jul 2010 11:33:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60915) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OWA9b-00009j-QI for qemu-devel@nongnu.org; Tue, 06 Jul 2010 11:33:48 -0400 From: Kevin Wolf Date: Tue, 6 Jul 2010 17:33:20 +0200 Message-Id: <1278430406-18667-12-git-send-email-kwolf@redhat.com> In-Reply-To: <1278430406-18667-1-git-send-email-kwolf@redhat.com> References: <1278430406-18667-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 11/17] scsi: Error locations for -drive if=scsi device initialization List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Markus Armbruster Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- hw/scsi-bus.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index b84b9b9..d69c74c 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -102,19 +102,23 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockDriverState *bdrv, int int scsi_bus_legacy_handle_cmdline(SCSIBus *bus) { + Location loc; DriveInfo *dinfo; int res = 0, unit; + loc_push_none(&loc); for (unit = 0; unit < MAX_SCSI_DEVS; unit++) { dinfo = drive_get(IF_SCSI, bus->busnr, unit); if (dinfo == NULL) { continue; } + qemu_opts_loc_restore(dinfo->opts); if (!scsi_bus_legacy_add_drive(bus, dinfo->bdrv, unit)) { res = -1; break; } } + loc_pop(&loc); return res; } -- 1.6.6.1