forked from rpms/libvirt
98 lines
4.0 KiB
Diff
98 lines
4.0 KiB
Diff
From f1de31795f1010016beab3b669db821799e5a6d3 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <f1de31795f1010016beab3b669db821799e5a6d3@dist-git>
|
|
From: Michal Privoznik <mprivozn@redhat.com>
|
|
Date: Wed, 7 Oct 2020 18:45:42 +0200
|
|
Subject: [PATCH] qemu: Introduce QEMU_CAPS_NUMA_HMAT capability
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This capability tracks whether QEMU is capable of defining HMAT
|
|
ACPI table for the guest.
|
|
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
|
|
(cherry picked from commit c2f15f1b1869c1732e529967d1851582409290fb)
|
|
|
|
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1749518
|
|
|
|
Conflicts:
|
|
- src/qemu/qemu_capabilities.c: The set of capabilities diverged.
|
|
- src/qemu/qemu_capabilities.h: Ditto.
|
|
- tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml: Ditto.
|
|
- tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml: Ditto.
|
|
- tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml: Doesn't exist
|
|
downstream.
|
|
- tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml: Ditto.
|
|
- tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml: Ditto.
|
|
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
Message-Id: <bf15c10c27c81f8f2d5a23568e4aebd216756642.1602087923.git.mprivozn@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_5.0.0.aarch64.xml | 1 +
|
|
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 +
|
|
4 files changed, 5 insertions(+)
|
|
|
|
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
|
|
index 278eaa0009..ce52c51199 100644
|
|
--- a/src/qemu/qemu_capabilities.c
|
|
+++ b/src/qemu/qemu_capabilities.c
|
|
@@ -568,6 +568,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
|
|
"storage.werror",
|
|
"pcie-root-port.hotplug",
|
|
"i8042",
|
|
+ "numa.hmat",
|
|
);
|
|
|
|
|
|
@@ -1451,6 +1452,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
|
|
{ "human-monitor-command/$savevm-monitor-nodes", QEMU_CAPS_SAVEVM_MONITOR_NODES },
|
|
{ "blockdev-add/arg-type/+nvme", QEMU_CAPS_DRIVE_NVME },
|
|
{ "blockdev-snapshot/$allow-write-only-overlay", QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY },
|
|
+ { "set-numa-node/arg-type/+hmat-lb", QEMU_CAPS_NUMA_HMAT },
|
|
};
|
|
|
|
typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps;
|
|
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
|
|
index 15ebcb5077..98cac5b9dc 100644
|
|
--- a/src/qemu/qemu_capabilities.h
|
|
+++ b/src/qemu/qemu_capabilities.h
|
|
@@ -548,6 +548,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
|
|
QEMU_CAPS_STORAGE_WERROR, /* virtio-blk,scsi-hd.werror */
|
|
QEMU_CAPS_PCIE_ROOT_PORT_HOTPLUG, /* pcie-root-port.hotplug */
|
|
QEMU_CAPS_DEVICE_I8042, /* PS/2 controller */
|
|
+ QEMU_CAPS_NUMA_HMAT, /* -numa hmat */
|
|
|
|
QEMU_CAPS_LAST /* this must always be the last item */
|
|
} virQEMUCapsFlags;
|
|
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
|
|
index 140a466910..92da5cbd94 100644
|
|
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
|
|
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
|
|
@@ -181,6 +181,7 @@
|
|
<flag name='cpu.kvm-no-adjvtime'/>
|
|
<flag name='vhost-user-fs'/>
|
|
<flag name='storage.werror'/>
|
|
+ <flag name='numa.hmat'/>
|
|
<version>4002050</version>
|
|
<kvmVersion>0</kvmVersion>
|
|
<microcodeVersion>61700241</microcodeVersion>
|
|
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
|
|
index 733e6b1eb4..0b841a49ac 100644
|
|
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
|
|
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
|
|
@@ -226,6 +226,7 @@
|
|
<flag name='storage.werror'/>
|
|
<flag name='pcie-root-port.hotplug'/>
|
|
<flag name='i8042'/>
|
|
+ <flag name='numa.hmat'/>
|
|
<version>4002091</version>
|
|
<kvmVersion>0</kvmVersion>
|
|
<microcodeVersion>43100241</microcodeVersion>
|
|
--
|
|
2.29.2
|
|
|