[libvirt] [PATCH v3 31/52] qemu: Introduce virQEMUCapsProbeCPUDefinitionsTest

Jiri Denemark jdenemar at redhat.com
Tue Nov 5 13:27:29 UTC 2019


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 at redhat.com>
---

Notes:
    Version 3:
    - new ptach

 src/qemu/qemu_capabilities.c | 10 +++++++++-
 src/qemu/qemu_capspriv.h     |  5 ++---
 tests/cputest.c              |  5 ++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 2bd0297364..2dca1b353b 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -2526,7 +2526,7 @@ virQEMUCapsFetchCPUModels(qemuMonitorPtr mon,
 }
 
 
-int
+static int
 virQEMUCapsProbeQMPCPUDefinitions(virQEMUCapsPtr qemuCaps,
                                   qemuMonitorPtr mon,
                                   bool tcg)
@@ -2548,6 +2548,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 e8fe48d8f0..9fc3f43f32 100644
--- 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 ef2d4e28df..f3d23ebd36 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -513,9 +513,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:
-- 
2.23.0




More information about the libvir-list mailing list