ef809b76a6
- esxConnectListAllDomains: Don't propagate failure to lookup a single domain (RHEL-80606) - conf: parse interface/source/@dev for all interface types (with backend type='passt') (RHEL-82539) - libvirt-host: Clarify/fix description of the CPU frequency field (RHEL-86197) - virNodeGetInfo: Improve description of the case when fake data is reported (RHEL-86197) - manpages: virsh: Use disclaimer from 'virNodeGetInfo()' for 'virsh nodeinfo' (RHEL-86197) - esx: Accept empty "path" URI component same way as "/" (RHEL-86459) - qemu: Rename outgoingMigration parameter in various TPM functions (RHEL-86800) - qemu: Properly propagate migration state to TPM cleanup code (RHEL-86800) - qemuDomainBlockCopyCommon: Don't revoke access to file twice on failure (RHEL-7357) - qemuxmlconftest: Drop s390-default-cpu-...ccw-virtio-2.7 test cases (RHEL-72976) - tests: add capabilities for QEMU 10.0.0 on s390x (RHEL-72976) - qemu: Do NOT autoadd NUMA node for s390 (RHEL-72976) - qemu_command: Use qemuBuildVirtioDevProps() to build cmd line for virtio-mem and virtio-pmem (RHEL-72976) - qemuxmlconftest: Introduce memory-hotplug-virtio-mem-pci-s390x.xml (RHEL-72976) - qemu_caps: Introduce QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW (RHEL-72976) - qemu: Validate virtio-mem-ccw (RHEL-72976) - qemu: Allow virtio-mem on CCW (RHEL-72976) - qemuxmlconftest: Introduce memory-hotplug-virtio-mem-ccw-s390x.xml (RHEL-72976) - qemu_domain_address: fix CCW virtio-mem hotplug (RHEL-72976) Resolves: RHEL-72976, RHEL-7357, RHEL-80606, RHEL-82539, RHEL-86197 Resolves: RHEL-86459, RHEL-86800
77 lines
3.2 KiB
Diff
77 lines
3.2 KiB
Diff
From 4cf058f2a32fac160803b45c818d798ff268b172 Mon Sep 17 00:00:00 2001
|
|
Message-ID: <4cf058f2a32fac160803b45c818d798ff268b172.1744876588.git.jdenemar@redhat.com>
|
|
From: Michal Privoznik <mprivozn@redhat.com>
|
|
Date: Wed, 15 Jan 2025 10:46:16 +0100
|
|
Subject: [PATCH] qemu_caps: Introduce QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW
|
|
|
|
This capability tracks whether QEMU supports virtio-mem-ccw
|
|
device. Introduced in QEMU commit v9.2.0-492-gaa910c20ec only
|
|
upcoming release of QEMU supports the device.
|
|
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
|
|
(cherry picked from commit a46e33a92597ed03147e7f6a0c674cda55a0ec52)
|
|
|
|
Conflicts:
|
|
src/qemu/qemu_capabilities.c: Upstream has more caps added meanwhile.
|
|
src/qemu/qemu_capabilities.h: Ditto.
|
|
|
|
Resolves: https://issues.redhat.com/browse/RHEL-72976
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
---
|
|
src/qemu/qemu_capabilities.c | 4 ++++
|
|
src/qemu/qemu_capabilities.h | 3 +++
|
|
tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml | 1 +
|
|
3 files changed, 8 insertions(+)
|
|
|
|
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
|
|
index 65e19965dd..1a9cf72482 100644
|
|
--- a/src/qemu/qemu_capabilities.c
|
|
+++ b/src/qemu/qemu_capabilities.c
|
|
@@ -722,6 +722,9 @@ VIR_ENUM_IMPL(virQEMUCaps,
|
|
"virtio-ccw.loadparm", /* QEMU_CAPS_VIRTIO_CCW_DEVICE_LOADPARM */
|
|
"netdev-stream-reconnect-miliseconds", /* QEMU_CAPS_NETDEV_STREAM_RECONNECT_MILISECONDS */
|
|
"blockdev-set-active", /* QEMU_CAPS_BLOCKDEV_SET_ACTIVE */
|
|
+
|
|
+ /* 470 */
|
|
+ "virtio-mem-ccw", /* QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW */
|
|
);
|
|
|
|
|
|
@@ -1411,6 +1414,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
|
|
{ "virtio-sound-device", QEMU_CAPS_DEVICE_VIRTIO_SOUND },
|
|
{ "sev-snp-guest", QEMU_CAPS_SEV_SNP_GUEST },
|
|
{ "acpi-erst", QEMU_CAPS_DEVICE_ACPI_ERST },
|
|
+ { "virtio-mem-ccw", QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW },
|
|
};
|
|
|
|
|
|
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
|
|
index e93e6a01cc..6467a09796 100644
|
|
--- a/src/qemu/qemu_capabilities.h
|
|
+++ b/src/qemu/qemu_capabilities.h
|
|
@@ -702,6 +702,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
|
|
QEMU_CAPS_NETDEV_STREAM_RECONNECT_MILISECONDS, /* 'reconnect-ms' option for netdev stream supported */
|
|
QEMU_CAPS_BLOCKDEV_SET_ACTIVE, /* blockdev-set-active QMP command supported */
|
|
|
|
+ /* 470 */
|
|
+ QEMU_CAPS_DEVICE_VIRTIO_MEM_CCW, /* -device virtio-mem-ccw */
|
|
+
|
|
QEMU_CAPS_LAST /* this must always be the last item */
|
|
} virQEMUCapsFlags;
|
|
|
|
diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
|
|
index 5c5ab096d1..82cabd13b2 100644
|
|
--- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
|
|
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
|
|
@@ -139,6 +139,7 @@
|
|
<flag name='chardev-reconnect-miliseconds'/>
|
|
<flag name='virtio-ccw.loadparm'/>
|
|
<flag name='netdev-stream-reconnect-miliseconds'/>
|
|
+ <flag name='virtio-mem-ccw'/>
|
|
<version>9002050</version>
|
|
<microcodeVersion>39100285</microcodeVersion>
|
|
<package>v9.2.0-1203-gd6430c17d7</package>
|
|
--
|
|
2.49.0
|