|
 |
a41c76 |
From e6a402520fef59636ede2d24249ae6b4fe45ac60 Mon Sep 17 00:00:00 2001
|
|
|
a41c76 |
Message-Id: <e6a402520fef59636ede2d24249ae6b4fe45ac60@dist-git>
|
|
|
a41c76 |
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
|
a41c76 |
Date: Wed, 4 Mar 2020 12:42:39 +0100
|
|
|
a41c76 |
Subject: [PATCH] qemu: add QEMU_CAPS_DEVICE_VHOST_USER_FS
|
|
|
a41c76 |
MIME-Version: 1.0
|
|
|
a41c76 |
Content-Type: text/plain; charset=UTF-8
|
|
|
a41c76 |
Content-Transfer-Encoding: 8bit
|
|
|
a41c76 |
|
|
|
a41c76 |
Introduced by QEMU commit 98fc1ada4cf70af0f1df1a2d7183cf786fc7da05
|
|
|
a41c76 |
virtio: add vhost-user-fs base device
|
|
|
a41c76 |
|
|
|
a41c76 |
Released in QEMU v4.2.0.
|
|
|
a41c76 |
|
|
|
a41c76 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
a41c76 |
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
|
|
|
a41c76 |
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
a41c76 |
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
a41c76 |
Tested-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
a41c76 |
(cherry picked from commit d99128a62b9f84e3e5b372d1e6419f4f1d1dffe6)
|
|
|
a41c76 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
a41c76 |
|
|
|
a41c76 |
Conflicts: * different set of capabilities available downstream:
|
|
|
a41c76 |
src/qemu/qemu_capabilities.c
|
|
|
a41c76 |
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
|
|
|
a41c76 |
* missing downstream:
|
|
|
a41c76 |
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
|
|
|
a41c76 |
https://bugzilla.redhat.com/show_bug.cgi?id=1694166
|
|
|
a41c76 |
Message-Id: <2450cfcd270e664a9832a82367787b6cdfc2c6fa.1583322090.git.jtomko@redhat.com>
|
|
|
a41c76 |
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
a41c76 |
---
|
|
|
a41c76 |
src/qemu/qemu_capabilities.c | 2 ++
|
|
|
a41c76 |
src/qemu/qemu_capabilities.h | 1 +
|
|
|
a41c76 |
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 +
|
|
|
a41c76 |
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 +
|
|
|
a41c76 |
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 +
|
|
|
a41c76 |
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 +
|
|
|
a41c76 |
6 files changed, 7 insertions(+)
|
|
|
a41c76 |
|
|
|
a41c76 |
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
|
|
|
a41c76 |
index 6912a6f72b..34df4d89b3 100644
|
|
|
a41c76 |
--- a/src/qemu/qemu_capabilities.c
|
|
|
a41c76 |
+++ b/src/qemu/qemu_capabilities.c
|
|
|
a41c76 |
@@ -558,6 +558,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
|
|
|
a41c76 |
/* 350 */
|
|
|
a41c76 |
"virtio-net.failover",
|
|
|
a41c76 |
"cpu.kvm-no-adjvtime",
|
|
|
a41c76 |
+ "vhost-user-fs",
|
|
|
a41c76 |
);
|
|
|
a41c76 |
|
|
|
a41c76 |
|
|
|
a41c76 |
@@ -1272,6 +1273,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
|
|
|
a41c76 |
{ "vhost-user-vga", QEMU_CAPS_DEVICE_VHOST_USER_VGA },
|
|
|
a41c76 |
{ "ramfb", QEMU_CAPS_DEVICE_RAMFB },
|
|
|
a41c76 |
{ "max-arm-cpu", QEMU_CAPS_ARM_MAX_CPU },
|
|
|
a41c76 |
+ { "vhost-user-fs-device", QEMU_CAPS_DEVICE_VHOST_USER_FS },
|
|
|
a41c76 |
};
|
|
|
a41c76 |
|
|
|
a41c76 |
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = {
|
|
|
a41c76 |
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
|
|
|
a41c76 |
index 4ccb0c55bc..e3449a9ca3 100644
|
|
|
a41c76 |
--- a/src/qemu/qemu_capabilities.h
|
|
|
a41c76 |
+++ b/src/qemu/qemu_capabilities.h
|
|
|
a41c76 |
@@ -539,6 +539,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
|
|
|
a41c76 |
/* 350 */
|
|
|
a41c76 |
QEMU_CAPS_VIRTIO_NET_FAILOVER, /* virtio-net-*.failover */
|
|
|
a41c76 |
QEMU_CAPS_CPU_KVM_NO_ADJVTIME, /* cpu.kvm-no-adjvtime */
|
|
|
a41c76 |
+ QEMU_CAPS_DEVICE_VHOST_USER_FS, /* -device vhost-user-fs */
|
|
|
a41c76 |
|
|
|
a41c76 |
QEMU_CAPS_LAST /* this must always be the last item */
|
|
|
a41c76 |
} virQEMUCapsFlags;
|
|
|
a41c76 |
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
|
|
|
a41c76 |
index 6af09e1a83..55fa169d89 100644
|
|
|
a41c76 |
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
|
|
|
a41c76 |
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
|
|
|
a41c76 |
@@ -177,6 +177,7 @@
|
|
|
a41c76 |
<flag name='drive-nvme'/>
|
|
|
a41c76 |
<flag name='smp-dies'/>
|
|
|
a41c76 |
<flag name='virtio-net.failover'/>
|
|
|
a41c76 |
+ <flag name='vhost-user-fs'/>
|
|
|
a41c76 |
<version>4001050</version>
|
|
|
a41c76 |
<kvmVersion>0</kvmVersion>
|
|
|
a41c76 |
<microcodeVersion>61700242</microcodeVersion>
|
|
|
a41c76 |
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
|
|
|
a41c76 |
index c8746f05ef..49963b7020 100644
|
|
|
a41c76 |
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
|
|
|
a41c76 |
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
|
|
|
a41c76 |
@@ -136,6 +136,7 @@
|
|
|
a41c76 |
<flag name='blockdev-file-dynamic-auto-read-only'/>
|
|
|
a41c76 |
<flag name='drive-nvme'/>
|
|
|
a41c76 |
<flag name='smp-dies'/>
|
|
|
a41c76 |
+ <flag name='vhost-user-fs'/>
|
|
|
a41c76 |
<version>4001050</version>
|
|
|
a41c76 |
<kvmVersion>0</kvmVersion>
|
|
|
a41c76 |
<microcodeVersion>39100242</microcodeVersion>
|
|
|
a41c76 |
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
|
|
|
a41c76 |
index c71791e205..ed3dea23b3 100644
|
|
|
a41c76 |
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
|
|
|
a41c76 |
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
|
|
|
a41c76 |
@@ -220,6 +220,7 @@
|
|
|
a41c76 |
<flag name='drive-nvme'/>
|
|
|
a41c76 |
<flag name='smp-dies'/>
|
|
|
a41c76 |
<flag name='virtio-net.failover'/>
|
|
|
a41c76 |
+ <flag name='vhost-user-fs'/>
|
|
|
a41c76 |
<version>4002000</version>
|
|
|
a41c76 |
<kvmVersion>0</kvmVersion>
|
|
|
a41c76 |
<microcodeVersion>43100242</microcodeVersion>
|
|
|
a41c76 |
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
|
|
|
a41c76 |
index e871ba528e..8195da4e27 100644
|
|
|
a41c76 |
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
|
|
|
a41c76 |
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
|
|
|
a41c76 |
@@ -179,6 +179,7 @@
|
|
|
a41c76 |
<flag name='smp-dies'/>
|
|
|
a41c76 |
<flag name='virtio-net.failover'/>
|
|
|
a41c76 |
<flag name='cpu.kvm-no-adjvtime'/>
|
|
|
a41c76 |
+ <flag name='vhost-user-fs'/>
|
|
|
a41c76 |
<version>4002050</version>
|
|
|
a41c76 |
<kvmVersion>0</kvmVersion>
|
|
|
a41c76 |
<microcodeVersion>61700241</microcodeVersion>
|
|
|
a41c76 |
--
|
|
|
a41c76 |
2.25.1
|
|
|
a41c76 |
|