scsi: Add BSG checks into scsi-bus and scsi-disk
PATCH 4/5 scsi: Add BSG checks into scsi-bus and scsi-disk
From: Nicholas Bellinger <[email protected]>
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 <[email protected]>
--- hw/scsi-bus.c | 3 ++- hw/scsi-disk.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletions(-)
hw/scsi-bus.c +2 -1
@@ -89,7 +89,8 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockDriverState *bdrv, intconst 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 ) {
hw/scsi-disk.c +5 -0
@@ -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 {
Signature · 1 line
1.5.6.5