|
 |
99cbc7 |
From d86f12106d012206eebeef6a9713da3a53a00eec Mon Sep 17 00:00:00 2001
|
|
|
99cbc7 |
Message-Id: <d86f12106d012206eebeef6a9713da3a53a00eec@dist-git>
|
|
|
99cbc7 |
From: Erik Skultety <eskultet@redhat.com>
|
|
|
99cbc7 |
Date: Thu, 19 Jul 2018 15:03:59 +0200
|
|
|
99cbc7 |
Subject: [PATCH] qemu: caps: Add vfio-pci.display capability
|
|
|
99cbc7 |
MIME-Version: 1.0
|
|
|
99cbc7 |
Content-Type: text/plain; charset=UTF-8
|
|
|
99cbc7 |
Content-Transfer-Encoding: 8bit
|
|
|
99cbc7 |
|
|
|
99cbc7 |
QEMU 2.12 introduced a new vfio-pci device option 'display=on/off/auto'.
|
|
|
99cbc7 |
This patch introduces the necessary capability.
|
|
|
99cbc7 |
|
|
|
99cbc7 |
Signed-off-by: Erik Skultety <eskultet@redhat.com>
|
|
|
99cbc7 |
Reviewed-by: John Ferlan <jferlan@redhat.com>
|
|
|
99cbc7 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
99cbc7 |
(cherry picked from commit 11c7bdac6dbe8659c2f8bf7a35b97288b0acb207)
|
|
|
99cbc7 |
|
|
|
99cbc7 |
https://bugzilla.redhat.com/show_bug.cgi?id=1475770
|
|
|
99cbc7 |
Signed-off-by: Erik Skultety <eskultet@redhat.com>
|
|
|
99cbc7 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
99cbc7 |
---
|
|
|
99cbc7 |
src/qemu/qemu_capabilities.c | 4 ++++
|
|
|
99cbc7 |
src/qemu/qemu_capabilities.h | 3 +++
|
|
|
99cbc7 |
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 +
|
|
|
99cbc7 |
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 +
|
|
|
99cbc7 |
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 +
|
|
|
99cbc7 |
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 +
|
|
|
99cbc7 |
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 +
|
|
|
99cbc7 |
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 +
|
|
|
99cbc7 |
8 files changed, 13 insertions(+)
|
|
|
99cbc7 |
|
|
|
99cbc7 |
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
|
|
|
99cbc7 |
index 05be8f1416..d1e4fafe7d 100644
|
|
|
99cbc7 |
--- a/src/qemu/qemu_capabilities.c
|
|
|
99cbc7 |
+++ b/src/qemu/qemu_capabilities.c
|
|
|
99cbc7 |
@@ -504,6 +504,9 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
|
|
|
99cbc7 |
"machine.pseries.cap-htm",
|
|
|
99cbc7 |
"usb-storage.werror",
|
|
|
99cbc7 |
"egl-headless",
|
|
|
99cbc7 |
+
|
|
|
99cbc7 |
+ /* 315 */
|
|
|
99cbc7 |
+ "vfio-pci.display",
|
|
|
99cbc7 |
);
|
|
|
99cbc7 |
|
|
|
99cbc7 |
|
|
|
99cbc7 |
@@ -1198,6 +1201,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsPCIAssign[] = {
|
|
|
99cbc7 |
|
|
|
99cbc7 |
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVfioPCI[] = {
|
|
|
99cbc7 |
{ "bootindex", QEMU_CAPS_VFIO_PCI_BOOTINDEX },
|
|
|
99cbc7 |
+ { "display", QEMU_CAPS_VFIO_PCI_DISPLAY },
|
|
|
99cbc7 |
};
|
|
|
99cbc7 |
|
|
|
99cbc7 |
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsSCSIDisk[] = {
|
|
|
99cbc7 |
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
|
|
|
99cbc7 |
index 55221e7e57..9e8ad5f5c3 100644
|
|
|
99cbc7 |
--- a/src/qemu/qemu_capabilities.h
|
|
|
99cbc7 |
+++ b/src/qemu/qemu_capabilities.h
|
|
|
99cbc7 |
@@ -489,6 +489,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
|
|
|
99cbc7 |
QEMU_CAPS_USB_STORAGE_WERROR, /* -device usb-storage,werror=..,rerror=.. */
|
|
|
99cbc7 |
QEMU_CAPS_EGL_HEADLESS, /* -display egl-headless */
|
|
|
99cbc7 |
|
|
|
99cbc7 |
+ /* 315 */
|
|
|
99cbc7 |
+ QEMU_CAPS_VFIO_PCI_DISPLAY, /* -device vfio-pci.display */
|
|
|
99cbc7 |
+
|
|
|
99cbc7 |
QEMU_CAPS_LAST /* this must always be the last item */
|
|
|
99cbc7 |
} virQEMUCapsFlags;
|
|
|
99cbc7 |
|
|
|
99cbc7 |
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
|
|
|
99cbc7 |
index 80e7afec04..0cc6327573 100644
|
|
|
99cbc7 |
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
|
|
|
99cbc7 |
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
|
|
|
99cbc7 |
@@ -170,6 +170,7 @@
|
|
|
99cbc7 |
<flag name='chardev-fd-pass'/>
|
|
|
99cbc7 |
<flag name='tpm-emulator'/>
|
|
|
99cbc7 |
<flag name='egl-headless'/>
|
|
|
99cbc7 |
+ <flag name='vfio-pci.display'/>
|
|
|
99cbc7 |
<version>2011090</version>
|
|
|
99cbc7 |
<kvmVersion>0</kvmVersion>
|
|
|
99cbc7 |
<microcodeVersion>347550</microcodeVersion>
|
|
|
99cbc7 |
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
|
|
|
99cbc7 |
index c4b09c0003..a88da6193e 100644
|
|
|
99cbc7 |
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
|
|
|
99cbc7 |
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
|
|
|
99cbc7 |
@@ -168,6 +168,7 @@
|
|
|
99cbc7 |
<flag name='tpm-emulator'/>
|
|
|
99cbc7 |
<flag name='machine.pseries.cap-htm'/>
|
|
|
99cbc7 |
<flag name='egl-headless'/>
|
|
|
99cbc7 |
+ <flag name='vfio-pci.display'/>
|
|
|
99cbc7 |
<version>2011090</version>
|
|
|
99cbc7 |
<kvmVersion>0</kvmVersion>
|
|
|
99cbc7 |
<microcodeVersion>428334</microcodeVersion>
|
|
|
99cbc7 |
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
|
|
|
99cbc7 |
index 1ff2fe45e1..7121da27a0 100644
|
|
|
99cbc7 |
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
|
|
|
99cbc7 |
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
|
|
|
99cbc7 |
@@ -134,6 +134,7 @@
|
|
|
99cbc7 |
<flag name='chardev-fd-pass'/>
|
|
|
99cbc7 |
<flag name='tpm-emulator'/>
|
|
|
99cbc7 |
<flag name='egl-headless'/>
|
|
|
99cbc7 |
+ <flag name='vfio-pci.display'/>
|
|
|
99cbc7 |
<version>2012000</version>
|
|
|
99cbc7 |
<kvmVersion>0</kvmVersion>
|
|
|
99cbc7 |
<microcodeVersion>375999</microcodeVersion>
|
|
|
99cbc7 |
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
|
|
|
99cbc7 |
index 37d17786cf..78889facce 100644
|
|
|
99cbc7 |
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
|
|
|
99cbc7 |
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
|
|
|
99cbc7 |
@@ -212,6 +212,7 @@
|
|
|
99cbc7 |
<flag name='mch.extended-tseg-mbytes'/>
|
|
|
99cbc7 |
<flag name='sev-guest'/>
|
|
|
99cbc7 |
<flag name='egl-headless'/>
|
|
|
99cbc7 |
+ <flag name='vfio-pci.display'/>
|
|
|
99cbc7 |
<version>2011090</version>
|
|
|
99cbc7 |
<kvmVersion>0</kvmVersion>
|
|
|
99cbc7 |
<microcodeVersion>416196</microcodeVersion>
|
|
|
99cbc7 |
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
|
|
|
99cbc7 |
index 57bf5dba11..01bb968938 100644
|
|
|
99cbc7 |
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
|
|
|
99cbc7 |
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
|
|
|
99cbc7 |
@@ -168,6 +168,7 @@
|
|
|
99cbc7 |
<flag name='machine.pseries.cap-hpt-max-page-size'/>
|
|
|
99cbc7 |
<flag name='machine.pseries.cap-htm'/>
|
|
|
99cbc7 |
<flag name='egl-headless'/>
|
|
|
99cbc7 |
+ <flag name='vfio-pci.display'/>
|
|
|
99cbc7 |
<version>2012050</version>
|
|
|
99cbc7 |
<kvmVersion>0</kvmVersion>
|
|
|
99cbc7 |
<microcodeVersion>446771</microcodeVersion>
|
|
|
99cbc7 |
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
|
|
|
99cbc7 |
index 431910a9e3..4bc7cfeebc 100644
|
|
|
99cbc7 |
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
|
|
|
99cbc7 |
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
|
|
|
99cbc7 |
@@ -215,6 +215,7 @@
|
|
|
99cbc7 |
<flag name='sev-guest'/>
|
|
|
99cbc7 |
<flag name='usb-storage.werror'/>
|
|
|
99cbc7 |
<flag name='egl-headless'/>
|
|
|
99cbc7 |
+ <flag name='vfio-pci.display'/>
|
|
|
99cbc7 |
<version>2012090</version>
|
|
|
99cbc7 |
<kvmVersion>0</kvmVersion>
|
|
|
99cbc7 |
<microcodeVersion>438109</microcodeVersion>
|
|
|
99cbc7 |
--
|
|
|
99cbc7 |
2.18.0
|
|
|
99cbc7 |
|