|
 |
127bba |
From 444d00e9ead63e1bd96a2ba36fa678dbcaf9c6c2 Mon Sep 17 00:00:00 2001
|
|
|
127bba |
Message-Id: <444d00e9ead63e1bd96a2ba36fa678dbcaf9c6c2@dist-git>
|
|
|
127bba |
From: Martin Kletzander <mkletzan@redhat.com>
|
|
|
127bba |
Date: Fri, 4 Nov 2016 10:29:51 +0100
|
|
|
127bba |
Subject: [PATCH] qemu: Add capabilities for ivshmem-{plain, doorbell}
|
|
|
127bba |
|
|
|
127bba |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
127bba |
(cherry picked from commit 22d94ca46d797a7e7abd61134ad4490bf196baf5)
|
|
|
127bba |
|
|
|
127bba |
Conflicts (due to bunch of other capabilities):
|
|
|
127bba |
src/qemu/qemu_capabilities.c
|
|
|
127bba |
src/qemu/qemu_capabilities.h
|
|
|
127bba |
tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
|
|
|
127bba |
tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
|
|
|
127bba |
tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
|
|
|
127bba |
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
|
|
|
127bba |
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
|
|
|
127bba |
|
|
|
127bba |
https://bugzilla.redhat.com/show_bug.cgi?id=1392031
|
|
|
127bba |
|
|
|
127bba |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
127bba |
---
|
|
|
127bba |
src/qemu/qemu_capabilities.c | 4 ++++
|
|
|
127bba |
src/qemu/qemu_capabilities.h | 2 ++
|
|
|
127bba |
tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml | 2 ++
|
|
|
127bba |
tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml | 2 ++
|
|
|
127bba |
tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 2 ++
|
|
|
127bba |
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 ++
|
|
|
127bba |
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 ++
|
|
|
127bba |
7 files changed, 16 insertions(+)
|
|
|
127bba |
|
|
|
127bba |
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
|
|
|
127bba |
index 2c49109..e511b8e 100644
|
|
|
127bba |
--- a/src/qemu/qemu_capabilities.c
|
|
|
127bba |
+++ b/src/qemu/qemu_capabilities.c
|
|
|
127bba |
@@ -342,6 +342,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
|
|
|
127bba |
"query-hotpluggable-cpus",
|
|
|
127bba |
|
|
|
127bba |
"virtio-net.rx_queue_size", /* 235 */
|
|
|
127bba |
+ "ivshmem-plain",
|
|
|
127bba |
+ "ivshmem-doorbell",
|
|
|
127bba |
);
|
|
|
127bba |
|
|
|
127bba |
|
|
|
127bba |
@@ -1563,6 +1565,8 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
|
|
|
127bba |
{ "pxb-pcie", QEMU_CAPS_DEVICE_PXB_PCIE },
|
|
|
127bba |
{ "tls-creds-x509", QEMU_CAPS_OBJECT_TLS_CREDS_X509 },
|
|
|
127bba |
{ "intel-iommu", QEMU_CAPS_DEVICE_INTEL_IOMMU },
|
|
|
127bba |
+ { "ivshmem-plain", QEMU_CAPS_DEVICE_IVSHMEM_PLAIN },
|
|
|
127bba |
+ { "ivshmem-doorbell", QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL },
|
|
|
127bba |
};
|
|
|
127bba |
|
|
|
127bba |
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[] = {
|
|
|
127bba |
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
|
|
|
127bba |
index 6949ec8..f6f624d 100644
|
|
|
127bba |
--- a/src/qemu/qemu_capabilities.h
|
|
|
127bba |
+++ b/src/qemu/qemu_capabilities.h
|
|
|
127bba |
@@ -376,6 +376,8 @@ typedef enum {
|
|
|
127bba |
|
|
|
127bba |
/* 235 */
|
|
|
127bba |
QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, /* virtio-net-*.rx_queue_size */
|
|
|
127bba |
+ QEMU_CAPS_DEVICE_IVSHMEM_PLAIN, /* -device ivshmem-plain */
|
|
|
127bba |
+ QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL, /* -device ivshmem-doorbell */
|
|
|
127bba |
|
|
|
127bba |
QEMU_CAPS_LAST /* this must always be the last item */
|
|
|
127bba |
} virQEMUCapsFlags;
|
|
|
127bba |
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
|
|
|
127bba |
index 7586269..63b9a30 100644
|
|
|
127bba |
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
|
|
|
127bba |
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
|
|
|
127bba |
@@ -157,6 +157,8 @@
|
|
|
127bba |
<flag name='drive-detect-zeroes'/>
|
|
|
127bba |
<flag name='tls-creds-x509'/>
|
|
|
127bba |
<flag name='smm'/>
|
|
|
127bba |
+ <flag name='ivshmem-plain'/>
|
|
|
127bba |
+ <flag name='ivshmem-doorbell'/>
|
|
|
127bba |
<version>2005094</version>
|
|
|
127bba |
<kvmVersion>0</kvmVersion>
|
|
|
127bba |
<package></package>
|
|
|
127bba |
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
|
|
|
127bba |
index cc146f6..e2f01ec 100644
|
|
|
127bba |
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
|
|
|
127bba |
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
|
|
|
127bba |
@@ -157,6 +157,8 @@
|
|
|
127bba |
<flag name='drive-detect-zeroes'/>
|
|
|
127bba |
<flag name='tls-creds-x509'/>
|
|
|
127bba |
<flag name='smm'/>
|
|
|
127bba |
+ <flag name='ivshmem-plain'/>
|
|
|
127bba |
+ <flag name='ivshmem-doorbell'/>
|
|
|
127bba |
<version>2005094</version>
|
|
|
127bba |
<kvmVersion>0</kvmVersion>
|
|
|
127bba |
<package></package>
|
|
|
127bba |
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
|
|
|
127bba |
index cf77e92..d10a604 100644
|
|
|
127bba |
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
|
|
|
127bba |
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
|
|
|
127bba |
@@ -151,6 +151,8 @@
|
|
|
127bba |
<flag name='drive-detect-zeroes'/>
|
|
|
127bba |
<flag name='tls-creds-x509'/>
|
|
|
127bba |
<flag name='smm'/>
|
|
|
127bba |
+ <flag name='ivshmem-plain'/>
|
|
|
127bba |
+ <flag name='ivshmem-doorbell'/>
|
|
|
127bba |
<version>2005094</version>
|
|
|
127bba |
<kvmVersion>0</kvmVersion>
|
|
|
127bba |
<package></package>
|
|
|
127bba |
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
|
|
|
127bba |
index 5a2512e..70bf9f4 100644
|
|
|
127bba |
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
|
|
|
127bba |
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
|
|
|
127bba |
@@ -194,6 +194,8 @@
|
|
|
127bba |
<flag name='tls-creds-x509'/>
|
|
|
127bba |
<flag name='intel-iommu'/>
|
|
|
127bba |
<flag name='smm'/>
|
|
|
127bba |
+ <flag name='ivshmem-plain'/>
|
|
|
127bba |
+ <flag name='ivshmem-doorbell'/>
|
|
|
127bba |
<version>2006000</version>
|
|
|
127bba |
<kvmVersion>0</kvmVersion>
|
|
|
127bba |
<package></package>
|
|
|
127bba |
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
|
|
|
127bba |
index 8f878fe..78bbaf8 100644
|
|
|
127bba |
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
|
|
|
127bba |
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
|
|
|
127bba |
@@ -192,6 +192,8 @@
|
|
|
127bba |
<flag name='intel-iommu'/>
|
|
|
127bba |
<flag name='smm'/>
|
|
|
127bba |
<flag name='query-hotpluggable-cpus'/>
|
|
|
127bba |
+ <flag name='ivshmem-plain'/>
|
|
|
127bba |
+ <flag name='ivshmem-doorbell'/>
|
|
|
127bba |
<version>2006091</version>
|
|
|
127bba |
<kvmVersion>0</kvmVersion>
|
|
|
127bba |
<package> (v2.7.0-rc1-52-g42e0d60)</package>
|
|
|
127bba |
--
|
|
|
127bba |
2.10.2
|
|
|
127bba |
|