Received: from [140.186.70.92] (port=43547 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PLAu0-0000cI-58 for qemu-devel@nongnu.org; Wed, 24 Nov 2010 03:40:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PLAty-0007LK-V0 for qemu-devel@nongnu.org; Wed, 24 Nov 2010 03:40:31 -0500 Received: from nm19.bullet.mail.ac4.yahoo.com ([98.139.52.216]:35583) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1PLAty-0007LF-QK for qemu-devel@nongnu.org; Wed, 24 Nov 2010 03:40:30 -0500 From: "Nicholas A. Bellinger" Date: Wed, 24 Nov 2010 00:40:27 -0800 Message-Id: <1290588027-8931-1-git-send-email-nab@linux-iscsi.org> Subject: [Qemu-devel] [PATCH 4/5] scsi: Add BSG checks into scsi-bus and scsi-disk List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Hannes Reinecke , Kevin Wolf Cc: qemu-devel , Stefan Hajnoczi , Gerd Hoffmann , Nicholas Bellinger , Paolo Bonzini From: Nicholas Bellinger This patch updates hw/scsi-bus.c:scsi_bus_legacy_add_drive() to check for the scsi-bsg backstore. It also updates hw/scsi-disk.c:scsi_disk_initfn() to check for when bdrv_is_bsg() is present and we need to fail for the fileio backed scsi-disk code. Signed-off-by: Nicholas A. Bellinger --- hw/scsi-bus.c | 3 ++- hw/scsi-disk.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 0f8fd57..502d3f3 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -89,7 +89,8 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockDriverState *bdrv, int const char *driver; DeviceState *dev; - driver = bdrv_is_sg(bdrv) ? "scsi-generic" : "scsi-disk"; + driver = bdrv_is_bsg(bdrv) ? "scsi-bsg" : + bdrv_is_sg(bdrv) ? "scsi-generic" : "scsi-disk"; dev = qdev_create(&bus->qbus, driver); qdev_prop_set_uint32(dev, "scsi-id", unit); if (qdev_prop_set_drive(dev, "drive", bdrv) < 0) { diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 88a2f74..5a5aa8f 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1201,6 +1201,11 @@ static int scsi_disk_initfn(SCSIDevice *dev) return -1; } + if (bdrv_is_bsg(s->bs)) { + error_report("scsi-disk: unwanted BSG"); + return -1; + } + if (is_cd) { s->qdev.blocksize = 2048; } else { -- 1.5.6.5