110 lines
4.2 KiB
Diff
110 lines
4.2 KiB
Diff
From 445b61e0c0f68d91a5e7bad7fb12b82005dd0e85 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <445b61e0c0f68d91a5e7bad7fb12b82005dd0e85@dist-git>
|
|
From: Andrea Bolognani <abologna@redhat.com>
|
|
Date: Tue, 4 Dec 2018 16:46:18 +0100
|
|
Subject: [PATCH] qemu: Introduce QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
(cherry picked from commit 0029eace520bfc0cbb1b176611304401ea9eae8f)
|
|
|
|
Conflicts in
|
|
|
|
src/qemu/qemu_capabilities.c
|
|
src/qemu/qemu_capabilities.h
|
|
|
|
because we're missing
|
|
|
|
29ad952f7e qemu: Introduce zPCI capability
|
|
21b18ea5d9 qemu: add memory-backend-memfd capability check
|
|
a6fd5b596a qemu: check memory-backend-memfd.hugetlb capability
|
|
9aec374b01 qemu: Detect whether iothread polling is supported
|
|
|
|
downstream.
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1647822
|
|
|
|
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
---
|
|
src/qemu/qemu_capabilities.c | 2 ++
|
|
src/qemu/qemu_capabilities.h | 1 +
|
|
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 +
|
|
tests/qemuxml2argvtest.c | 1 +
|
|
tests/qemuxml2xmltest.c | 1 +
|
|
5 files changed, 6 insertions(+)
|
|
|
|
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
|
|
index feef102874..57b1b99076 100644
|
|
--- a/src/qemu/qemu_capabilities.c
|
|
+++ b/src/qemu/qemu_capabilities.c
|
|
@@ -508,6 +508,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
|
|
/* 315 */
|
|
"vfio-pci.display",
|
|
"vfio-ap",
|
|
+ "machine.pseries.cap-nested-hv",
|
|
);
|
|
|
|
|
|
@@ -1439,6 +1440,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMemoryBackendFile[] =
|
|
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsSPAPRMachine[] = {
|
|
{ "cap-hpt-max-page-size", QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE },
|
|
{ "cap-htm", QEMU_CAPS_MACHINE_PSERIES_CAP_HTM },
|
|
+ { "cap-nested-hv", QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV },
|
|
};
|
|
|
|
static virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
|
|
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
|
|
index 1a9e5386a8..0c06081107 100644
|
|
--- a/src/qemu/qemu_capabilities.h
|
|
+++ b/src/qemu/qemu_capabilities.h
|
|
@@ -492,6 +492,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
|
|
/* 315 */
|
|
QEMU_CAPS_VFIO_PCI_DISPLAY, /* -device vfio-pci.display */
|
|
QEMU_CAPS_DEVICE_VFIO_AP, /* -device vfio-ap */
|
|
+ QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV, /* -machine pseries.cap-nested-hv */
|
|
|
|
QEMU_CAPS_LAST /* this must always be the last item */
|
|
} virQEMUCapsFlags;
|
|
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
|
|
index bdd339c54a..279e946e2a 100644
|
|
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
|
|
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
|
|
@@ -171,6 +171,7 @@
|
|
<flag name='usb-storage.werror'/>
|
|
<flag name='egl-headless'/>
|
|
<flag name='vfio-pci.display'/>
|
|
+ <flag name='machine.pseries.cap-nested-hv'/>
|
|
<version>3000091</version>
|
|
<kvmVersion>0</kvmVersion>
|
|
<microcodeVersion>439018</microcodeVersion>
|
|
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
|
|
index 13e95fe28a..0908bc5d08 100644
|
|
--- a/tests/qemuxml2argvtest.c
|
|
+++ b/tests/qemuxml2argvtest.c
|
|
@@ -1886,6 +1886,7 @@ mymain(void)
|
|
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
|
|
QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE,
|
|
QEMU_CAPS_MACHINE_PSERIES_CAP_HTM,
|
|
+ QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV,
|
|
QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
|
|
DO_TEST_FAILURE("pseries-features",
|
|
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE);
|
|
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
|
|
index b76410b2c1..db088fff6b 100644
|
|
--- a/tests/qemuxml2xmltest.c
|
|
+++ b/tests/qemuxml2xmltest.c
|
|
@@ -627,6 +627,7 @@ mymain(void)
|
|
QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
|
|
QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE,
|
|
QEMU_CAPS_MACHINE_PSERIES_CAP_HTM,
|
|
+ QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV,
|
|
QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
|
|
|
|
DO_TEST("pseries-serial-native",
|
|
--
|
|
2.20.1
|
|
|