qemuMonitorJSONGetCPUModelExpansion: Introduce @hv_passthrough argument

This continues and finishes propagation of the @hv_passthrough
argument started in the previous commit.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 0c16366f217d30a906880be5a953e52466a7dbc2..4c75eea64e000ec8301ae3d44032fd3a962f1010 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3069,15 +3069,15 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCaps *qemuCaps,
     if (ARCH_IS_S390(qemuCaps->arch))
         fail_no_props = false;
 
-    if (qemuMonitorGetCPUModelExpansion(mon, type, cpu, true, fail_no_props,
-                                        &modelInfo) < 0)
+    if (qemuMonitorGetCPUModelExpansion(mon, type, cpu, true, false,
+                                        fail_no_props, &modelInfo) < 0)
         return -1;
 
     /* Try to check migratability of each feature. */
     if (modelInfo &&
         ARCH_IS_X86(qemuCaps->arch) &&
-        qemuMonitorGetCPUModelExpansion(mon, type, cpu, false, fail_no_props,
-                                        &nonMigratable) < 0)
+        qemuMonitorGetCPUModelExpansion(mon, type, cpu, false, false,
+                                        fail_no_props, &nonMigratable) < 0)
         return -1;
 
     if (nonMigratable) {

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d5095827190f8494b95197a3c50efe47269ce1e7..13ef9285fc6fe52bc296049e52c84b39c1e47091 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -12210,7 +12210,8 @@ qemuConnectCPUModelBaseline(virQEMUCaps *qemuCaps,
                                          : QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC;
 
         if (qemuMonitorGetCPUModelExpansion(proc->mon, expansion_type,
-                                            baseline, true, false, &result) < 0)
+                                            baseline, true,
+                                            false, false, &result) < 0)
             return NULL;
 
         if (qemuConnectStealCPUModelFromInfo(baseline, &result) < 0)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 734364e0701730dc1300129142a90a75f7654984..b2e4311ea9dd4dca437e6257e76a61247c1e999a 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3181,6 +3181,7 @@ qemuMonitorGetCPUModelExpansion(qemuMonitor *mon,
                                 qemuMonitorCPUModelExpansionType type,
                                 virCPUDef *cpu,
                                 bool migratable,
+                                bool hv_passthrough,
                                 bool fail_no_props,
                                 qemuMonitorCPUModelInfo **model_info)
 {
@@ -3189,8 +3190,8 @@ qemuMonitorGetCPUModelExpansion(qemuMonitor *mon,
     QEMU_CHECK_MONITOR(mon);
 
     return qemuMonitorJSONGetCPUModelExpansion(mon, type, cpu,
-                                               migratable, fail_no_props,
-                                               model_info);
+                                               migratable, hv_passthrough,
+                                               fail_no_props, model_info);
 }
 
 

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 906a919f52626a8fe9d2f83713246c9525267c89..0d4a52bf4ae6f8a43161fabddaea3e691ee9a964 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1140,6 +1140,7 @@ int qemuMonitorGetCPUModelExpansion(qemuMonitor *mon,
                                     qemuMonitorCPUModelExpansionType type,
                                     virCPUDef *cpu,
                                     bool migratable,
+                                    bool hv_passthrough,
                                     bool fail_no_props,
                                     qemuMonitorCPUModelInfo **model_info);
 

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index f9928b03939a84e40d6fa33f6bce4592995bf59c..3b96f4e03783f8e116fa01f945e867a449e91e14 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -5072,6 +5072,7 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitor *mon,
                                     qemuMonitorCPUModelExpansionType type,
                                     virCPUDef *cpu,
                                     bool migratable,
+                                    bool hv_passthrough,
                                     bool fail_no_props,
                                     qemuMonitorCPUModelInfo **model_info)
 {
@@ -5085,7 +5086,7 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitor *mon,
 
     *model_info = NULL;
 
-    if (!(model = qemuMonitorJSONMakeCPUModel(cpu, migratable, false)))
+    if (!(model = qemuMonitorJSONMakeCPUModel(cpu, migratable, hv_passthrough)))
         return -1;
 
     if ((rc = qemuMonitorJSONQueryCPUModelExpansionOne(mon, type, &model, &data)) <= 0)

diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 484cb098303d6eb19a6e176fce5292f8f0221764..a86f054b8bdf76e8d84bc524ccc74cf8d326c45e 100644 (file)
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -449,6 +449,7 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitor *mon,
                                     qemuMonitorCPUModelExpansionType type,
                                     virCPUDef *cpu,
                                     bool migratable,
+                                    bool hv_passthrough,
                                     bool fail_no_props,
                                     qemuMonitorCPUModelInfo **model_info)
     ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(6);

diff --git a/tests/cputest.c b/tests/cputest.c
index 52e0022ac3959e314a683ef1f74968d3eb54f06a..9b76cce2a84d20e10964eb952a78a2eb25f29289 100644 (file)
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -455,7 +455,7 @@ cpuTestMakeQEMUCaps(const struct data *data)
 
     if (qemuMonitorGetCPUModelExpansion(qemuMonitorTestGetMonitor(testMon),
                                         QEMU_MONITOR_CPU_MODEL_EXPANSION_STATIC,
-                                        cpu, true, fail_no_props, &model) < 0)
+                                        cpu, true, false, fail_no_props, &model) < 0)
         return NULL;
 
     if (!(qemuCaps = virQEMUCapsNew()))