From 2d8d4379690e55d8d9a0b194ddef33d073154c7b Mon Sep 17 00:00:00 2001

Message-Id: <2d8d4379690e55d8d9a0b194ddef33d073154c7b@dist-git>

From: Jiri Denemark <jdenemar@redhat.com>

Date: Fri, 21 Jun 2019 09:25:03 +0200

Subject: [PATCH] qemu_capabilities: Inroduce virQEMUCapsGetCPUModelX86Data

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

The code for transforming qemuMonitorCPUModelInfo data from QEMU into

virCPUDefPtr consumable by virCPU* APIs was hidden inside

virQEMUCapsInitCPUModelX86. This patch moves it into a new function to

make it usable in tests.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

(cherry picked from commit 30e4faac2f3e72aec29be9963d7a5394153e812f)

https://bugzilla.redhat.com/show_bug.cgi?id=1686895

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

Message-Id: <e91c6c1e8de59a6cc151154f7c2a9eae79249fa5.1561068591.git.jdenemar@redhat.com>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

---

 src/qemu/qemu_capabilities.c | 50 ++++++++++++++++++++++++------------

 src/qemu/qemu_capspriv.h     |  4 +++

 2 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c

index 5539d168cd..5a7160d02e 100644

--- a/src/qemu/qemu_capabilities.c

+++ b/src/qemu/qemu_capabilities.c

@@ -2812,28 +2812,17 @@ virQEMUCapsInitCPUModelS390(virQEMUCapsPtr qemuCaps,

 }

-/**

- * Returns  0 when host CPU model provided by QEMU was filled in qemuCaps,

- *          1 when the caller should fall back to using virCapsPtr->host.cpu,

- *         -1 on error.

- */

-static int

-virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps,

-                           virDomainVirtType type,

-                           qemuMonitorCPUModelInfoPtr model,

-                           virCPUDefPtr cpu,

-                           bool migratable)

+virCPUDataPtr

+virQEMUCapsGetCPUModelX86Data(qemuMonitorCPUModelInfoPtr model,

+                              bool migratable)

 {

-    virCPUDataPtr data = NULL;

     unsigned long long sigFamily = 0;

     unsigned long long sigModel = 0;

     unsigned long long sigStepping = 0;

-    int ret = -1;

+    virCPUDataPtr data = NULL;

+    virCPUDataPtr ret = NULL;

     size_t i;

-    if (!model)

-        return 1;

-

     if (!(data = virCPUDataNew(VIR_ARCH_X86_64)))

         goto cleanup;

@@ -2874,6 +2863,35 @@ virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps,

     if (virCPUx86DataSetSignature(data, sigFamily, sigModel, sigStepping) < 0)

         goto cleanup;

+    VIR_STEAL_PTR(ret, data);

+

+ cleanup:

+    virCPUDataFree(data);

+    return ret;

+}

+

+

+/**

+ * Returns  0 when host CPU model provided by QEMU was filled in qemuCaps,

+ *          1 when the caller should fall back to using virCapsPtr->host.cpu,

+ *         -1 on error.

+ */

+static int

+virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps,

+                           virDomainVirtType type,

+                           qemuMonitorCPUModelInfoPtr model,

+                           virCPUDefPtr cpu,

+                           bool migratable)

+{

+    virCPUDataPtr data = NULL;

+    int ret = -1;

+

+    if (!model)

+        return 1;

+

+    if (!(data = virQEMUCapsGetCPUModelX86Data(model, migratable)))

+        goto cleanup;

+

     if (cpuDecode(cpu, data, virQEMUCapsGetCPUDefinitions(qemuCaps, type)) < 0)

         goto cleanup;

diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h

index cb5e0dd9a9..70cdbbc504 100644

--- a/src/qemu/qemu_capspriv.h

+++ b/src/qemu/qemu_capspriv.h

@@ -80,6 +80,10 @@ virQEMUCapsSetCPUModelInfo(virQEMUCapsPtr qemuCaps,

                            virDomainVirtType type,

                            qemuMonitorCPUModelInfoPtr modelInfo);

+virCPUDataPtr

+virQEMUCapsGetCPUModelX86Data(qemuMonitorCPUModelInfoPtr model,

+                              bool migratable);

+

 virCPUDefPtr

 virQEMUCapsProbeHostCPUForEmulator(virArch hostArch,

                                    virQEMUCapsPtr qemuCaps,

-- 

2.22.0