[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] virtio-blk: switch off scsi-passthrough by default
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH] virtio-blk: switch off scsi-passthrough by default |
Date: |
Fri, 16 Oct 2015 10:40:30 +0200 |
Devices that are compliant with virtio-1 do not support scsi
passthrough any more (and it has not been a recommended setup
anyway for quite some time). To avoid having to switch it off
explicitly in newer qemus that turn on virtio-1 by default, let's
switch the default to scsi=false for 2.5.
Signed-off-by: Cornelia Huck <address@hidden>
---
Note: this is based upon my s390x series from 10/14, as I otherwise
could not test compat on s390x.
---
hw/block/virtio-blk.c | 2 +-
hw/s390x/s390-virtio-ccw.c | 4 ++++
include/hw/compat.h | 6 +++++-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 8beb26b..999dbd7 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -975,7 +975,7 @@ static Property virtio_blk_properties[] = {
DEFINE_PROP_STRING("serial", VirtIOBlock, conf.serial),
DEFINE_PROP_BIT("config-wce", VirtIOBlock, conf.config_wce, 0, true),
#ifdef __linux__
- DEFINE_PROP_BIT("scsi", VirtIOBlock, conf.scsi, 0, true),
+ DEFINE_PROP_BIT("scsi", VirtIOBlock, conf.scsi, 0, false),
#endif
DEFINE_PROP_BIT("request-merging", VirtIOBlock, conf.request_merging, 0,
true),
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 20883ff..2c72358 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -272,6 +272,10 @@ static const TypeInfo ccw_machine_info = {
.driver = "vhost-scsi-ccw",\
.property = "max_revision",\
.value = "0",\
+ },{\
+ .driver = "virtio-blk-ccw",\
+ .property = "scsi",\
+ .value = "true",\
},
static void ccw_machine_2_4_class_init(ObjectClass *oc, void *data)
diff --git a/include/hw/compat.h b/include/hw/compat.h
index 095de5d..bbf1ab2 100644
--- a/include/hw/compat.h
+++ b/include/hw/compat.h
@@ -2,7 +2,11 @@
#define HW_COMPAT_H
#define HW_COMPAT_2_4 \
- /* empty */
+ {\
+ .driver = "virtio-blk-pci",\
+ .property = "scsi",\
+ .value = "true",\
+ },
#define HW_COMPAT_2_3 \
{\
--
2.3.9
- [Qemu-devel] [PATCH] virtio-blk: switch off scsi-passthrough by default,
Cornelia Huck <=