|
 |
9bac43 |
From b303e792c3084c0b5535ec58fbae84a5fd4b892b Mon Sep 17 00:00:00 2001
|
|
|
9bac43 |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
Date: Fri, 13 Oct 2017 11:56:48 +0200
|
|
|
9bac43 |
Subject: [PATCH 17/69] Disable vhost-user-scsi and vhost-user-scsi-pci
|
|
|
9bac43 |
|
|
|
9bac43 |
RH-Author: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
Message-id: <20171013115649.20817-2-mrezanin@redhat.com>
|
|
|
9bac43 |
Patchwork-id: 77263
|
|
|
9bac43 |
O-Subject: [RHV7.5 qemu-kvm-rhev PATCHv2 1/2] Disable vhost-user-scsi and vhost-user-scsi-pci
|
|
|
9bac43 |
Bugzilla: 1498496
|
|
|
9bac43 |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
9bac43 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
|
|
|
9bac43 |
We are not going to support these new devices. CONFIG_VHOST_USER_SCSI option
|
|
|
9bac43 |
removes only vhost-user-scsi so we have to manually disable
|
|
|
9bac43 |
vhost-user-scsi-pci.
|
|
|
9bac43 |
|
|
|
9bac43 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9bac43 |
---
|
|
|
9bac43 |
default-configs/aarch64-softmmu.mak | 2 +-
|
|
|
9bac43 |
default-configs/pci.mak | 2 +-
|
|
|
9bac43 |
default-configs/ppc64-softmmu.mak | 2 +-
|
|
|
9bac43 |
default-configs/s390x-softmmu.mak | 2 +-
|
|
|
9bac43 |
hw/virtio/virtio-pci.c | 2 ++
|
|
|
9bac43 |
5 files changed, 6 insertions(+), 4 deletions(-)
|
|
|
9bac43 |
|
|
|
9bac43 |
diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak
|
|
|
9bac43 |
index 5d57303..a2d05f4 100644
|
|
|
9bac43 |
--- a/default-configs/aarch64-softmmu.mak
|
|
|
9bac43 |
+++ b/default-configs/aarch64-softmmu.mak
|
|
|
9bac43 |
@@ -22,7 +22,7 @@ CONFIG_SMBIOS=y
|
|
|
9bac43 |
CONFIG_PL061=y
|
|
|
9bac43 |
CONFIG_GPIO_KEY=y
|
|
|
9bac43 |
CONFIG_ARM_V7M=y
|
|
|
9bac43 |
-CONFIG_VHOST_USER_SCSI=$(and $(CONFIG_VHOST_USER),$(CONFIG_LINUX))
|
|
|
9bac43 |
+#CONFIG_VHOST_USER_SCSI=$(and $(CONFIG_VHOST_USER),$(CONFIG_LINUX))
|
|
|
9bac43 |
CONFIG_PCIE_PORT=y
|
|
|
9bac43 |
CONFIG_XIO3130=y
|
|
|
9bac43 |
CONFIG_IOH3420=y
|
|
|
9bac43 |
diff --git a/default-configs/pci.mak b/default-configs/pci.mak
|
|
|
9bac43 |
index 9bd8452..8cf0b60 100644
|
|
|
9bac43 |
--- a/default-configs/pci.mak
|
|
|
9bac43 |
+++ b/default-configs/pci.mak
|
|
|
9bac43 |
@@ -43,4 +43,4 @@ CONFIG_VGA=y
|
|
|
9bac43 |
CONFIG_VGA_PCI=y
|
|
|
9bac43 |
CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM)
|
|
|
9bac43 |
#CONFIG_ROCKER=y
|
|
|
9bac43 |
-CONFIG_VHOST_USER_SCSI=$(and $(CONFIG_VHOST_USER),$(CONFIG_LINUX))
|
|
|
9bac43 |
+#CONFIG_VHOST_USER_SCSI=$(and $(CONFIG_VHOST_USER),$(CONFIG_LINUX))
|
|
|
9bac43 |
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
|
|
|
9bac43 |
index 31ef40c..46e356b 100644
|
|
|
9bac43 |
--- a/default-configs/ppc64-softmmu.mak
|
|
|
9bac43 |
+++ b/default-configs/ppc64-softmmu.mak
|
|
|
9bac43 |
@@ -8,7 +8,7 @@ CONFIG_USB_XHCI=y
|
|
|
9bac43 |
CONFIG_USB_XHCI_NEC=y
|
|
|
9bac43 |
CONFIG_WDT_IB6300ESB=y
|
|
|
9bac43 |
CONFIG_PCI_TESTDEV=y
|
|
|
9bac43 |
-CONFIG_VHOST_USER_SCSI=$(and $(CONFIG_VHOST_USER),$(CONFIG_LINUX))
|
|
|
9bac43 |
+#CONFIG_VHOST_USER_SCSI=$(and $(CONFIG_VHOST_USER),$(CONFIG_LINUX))
|
|
|
9bac43 |
|
|
|
9bac43 |
include sound.mak
|
|
|
9bac43 |
include usb.mak
|
|
|
9bac43 |
diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
|
|
|
9bac43 |
index 2846634..02f62de 100644
|
|
|
9bac43 |
--- a/default-configs/s390x-softmmu.mak
|
|
|
9bac43 |
+++ b/default-configs/s390x-softmmu.mak
|
|
|
9bac43 |
@@ -1,6 +1,6 @@
|
|
|
9bac43 |
CONFIG_PCI=y
|
|
|
9bac43 |
#CONFIG_VIRTIO_PCI=y
|
|
|
9bac43 |
-CONFIG_VHOST_USER_SCSI=$(and $(CONFIG_VHOST_USER),$(CONFIG_LINUX))
|
|
|
9bac43 |
+#CONFIG_VHOST_USER_SCSI=$(and $(CONFIG_VHOST_USER),$(CONFIG_LINUX))
|
|
|
9bac43 |
CONFIG_VIRTIO=y
|
|
|
9bac43 |
CONFIG_SCLPCONSOLE=y
|
|
|
9bac43 |
# Disabled for Red Hat Enterprise Linux:
|
|
|
9bac43 |
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
|
|
|
9bac43 |
index eccf809..8208aa2 100644
|
|
|
9bac43 |
--- a/hw/virtio/virtio-pci.c
|
|
|
9bac43 |
+++ b/hw/virtio/virtio-pci.c
|
|
|
9bac43 |
@@ -2665,9 +2665,11 @@ static void virtio_pci_register_types(void)
|
|
|
9bac43 |
#ifdef CONFIG_VHOST_SCSI
|
|
|
9bac43 |
type_register_static(&vhost_scsi_pci_info);
|
|
|
9bac43 |
#endif
|
|
|
9bac43 |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
9bac43 |
#if defined(CONFIG_VHOST_USER) && defined(CONFIG_LINUX)
|
|
|
9bac43 |
type_register_static(&vhost_user_scsi_pci_info);
|
|
|
9bac43 |
#endif
|
|
|
9bac43 |
+#endif
|
|
|
9bac43 |
#ifdef CONFIG_VHOST_VSOCK
|
|
|
9bac43 |
type_register_static(&vhost_vsock_pci_info);
|
|
|
9bac43 |
#endif
|
|
|
9bac43 |
--
|
|
|
9bac43 |
1.8.3.1
|
|
|
9bac43 |
|