This capability enables baselining of CPU models via QMP.
Signed-off-by: Collin Walling <walling@xxxxxxxxxxxxx>
Reviewed-by: Daniel Henrique Barboza <danielh413@xxxxxxxxx>
Reviewed-by: Boris Fiuczynski <fiuczy@xxxxxxxxxxxxx>
Reviewed-by: Jiri Denemark <jdenemar@xxxxxxxxxx>
---
src/qemu/qemu_capabilities.c | 2 ++
src/qemu/qemu_capabilities.h | 1 +
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 +
9 files changed, 10 insertions(+)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 3020530..6fa8354 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -539,6 +539,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
"migration-file-drop-cache",
"net-socket-dgram",
"dbus-vmstate",
+ "query-cpu-model-baseline",
);
@@ -985,6 +986,7 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
{ "blockdev-del", QEMU_CAPS_BLOCKDEV_DEL },
{ "query-current-machine", QEMU_CAPS_QUERY_CURRENT_MACHINE },
{ "block-dirty-bitmap-merge", QEMU_CAPS_BITMAP_MERGE },
+ { "query-cpu-model-baseline", QEMU_CAPS_QUERY_CPU_MODEL_BASELINE },
};
struct virQEMUCapsStringFlags virQEMUCapsMigration[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 54f9115..2c10e00 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -520,6 +520,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
QEMU_CAPS_MIGRATION_FILE_DROP_CACHE, /* migration with disk cache on is safe for type='file' disks */
QEMU_CAPS_NET_SOCKET_DGRAM, /* -net socket,fd= with dgram socket */
QEMU_CAPS_DBUS_VMSTATE, /* -object dbus-vmstate */
+ QEMU_CAPS_QUERY_CPU_MODEL_BASELINE, /* qmp query-cpu-model-baseline */
QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags;
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index 21b918f..e6f7e28 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -103,6 +103,7 @@
<flag name='egl-headless'/>
<flag name='zpci'/>
<flag name='iothread.poll-max-ns'/>
+ <flag name='query-cpu-model-baseline'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>39100805</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 6cb997d..48d7742 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -110,6 +110,7 @@
<flag name='egl-headless'/>
<flag name='zpci'/>
<flag name='iothread.poll-max-ns'/>
+ <flag name='query-cpu-model-baseline'/>
<version>2011000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>39100806</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 2930381..381abd5 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -121,6 +121,7 @@
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='iothread.poll-max-ns'/>
<flag name='memory-backend-file.align'/>
+ <flag name='query-cpu-model-baseline'/>
<version>2012000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>39100807</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index 5a2b740..9516a3b 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -92,6 +92,7 @@
<flag name='sdl-gl'/>
<flag name='vhost-vsock'/>
<flag name='zpci'/>
+ <flag name='query-cpu-model-baseline'/>
<version>2007093</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>39100764</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index 72ae100..cf8bbb2 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -97,6 +97,7 @@
<flag name='vhost-vsock'/>
<flag name='zpci'/>
<flag name='iothread.poll-max-ns'/>
+ <flag name='query-cpu-model-baseline'/>
<version>2009000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>39100765</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
index d511377..40b4a2b 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@@ -123,6 +123,7 @@
<flag name='memory-backend-memfd.hugetlb'/>
<flag name='iothread.poll-max-ns'/>
<flag name='memory-backend-file.align'/>
+ <flag name='query-cpu-model-baseline'/>
<version>3000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>39100757</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index 6cad000..4909bcc 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -133,6 +133,7 @@
<flag name='nbd-bitmap'/>
<flag name='migration-file-drop-cache'/>
<flag name='net-socket-dgram'/>
+ <flag name='query-cpu-model-baseline'/>
<version>4000000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>39100758</microcodeVersion>
--
2.7.4
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
