qemu: Introduce virQEMUCapsProbeCPUDefinitionsTest

It is a tiny wrapper around virQEMUCapsProbeQMPCPUDefinitions which will
soon get private parameters and thus it cannot be exposed outside
qemu_capabilities.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 86cf63df4e66dbf08439cf726133def5fc081637..ff9b2c607c61545a1d3a0b83dbc009253920142c 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -2524,7 +2524,7 @@ virQEMUCapsFetchCPUModels(qemuMonitorPtr mon,
 }
 
 
-int
+static int
 virQEMUCapsProbeQMPCPUDefinitions(virQEMUCapsPtr qemuCaps,
                                   qemuMonitorPtr mon,
                                   bool tcg)
@@ -2546,6 +2546,14 @@ virQEMUCapsProbeQMPCPUDefinitions(virQEMUCapsPtr qemuCaps,
 }
 
 
+int
+virQEMUCapsProbeCPUDefinitionsTest(virQEMUCapsPtr qemuCaps,
+                                   qemuMonitorPtr mon)
+{
+    return virQEMUCapsProbeQMPCPUDefinitions(qemuCaps, mon, false);
+}
+
+
 static int
 virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps,
                            qemuMonitorPtr mon,

diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h
index e8fe48d8f02a15d3f86d6b81efe4e9f768c00c65..9fc3f43f3230533e608955f16efe20ac3e0089ab 100644 (file)
--- a/src/qemu/qemu_capspriv.h
+++ b/src/qemu/qemu_capspriv.h
@@ -95,9 +95,8 @@ virQEMUCapsSetSEVCapabilities(virQEMUCapsPtr qemuCaps,
                               virSEVCapability *capabilities);
 
 int
-virQEMUCapsProbeQMPCPUDefinitions(virQEMUCapsPtr qemuCaps,
-                                  qemuMonitorPtr mon,
-                                  bool tcg);
+virQEMUCapsProbeCPUDefinitionsTest(virQEMUCapsPtr qemuCaps,
+                                   qemuMonitorPtr mon);
 
 void
 virQEMUCapsSetMicrocodeVersion(virQEMUCapsPtr qemuCaps,

diff --git a/tests/cputest.c b/tests/cputest.c
index 3af4bb93967b51b8d6625b2811be752fc94e5b91..b883ba7b80d873f5f0dfd40f438d81776e2164b5 100644 (file)
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -507,9 +507,8 @@ cpuTestMakeQEMUCaps(const struct data *data)
     virQEMUCapsSetCPUModelInfo(qemuCaps, VIR_DOMAIN_VIRT_KVM, model);
     model = NULL;
 
-    if (virQEMUCapsProbeQMPCPUDefinitions(qemuCaps,
-                                          qemuMonitorTestGetMonitor(testMon),
-                                          false) < 0)
+    if (virQEMUCapsProbeCPUDefinitionsTest(qemuCaps,
+                                           qemuMonitorTestGetMonitor(testMon)) < 0)
         goto error;
 
  cleanup: