From 0b98a3d385f3d46949c5b2bc15c27c7c62739496 Mon Sep 17 00:00:00 2001

Message-Id: <0b98a3d385f3d46949c5b2bc15c27c7c62739496@dist-git>

From: Jiri Denemark <jdenemar@redhat.com>

Date: Fri, 21 Jun 2019 09:24:59 +0200

Subject: [PATCH] cpu_x86: Add x86ModelCopySignatures helper

MIME-Version: 1.0

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

Content-Transfer-Encoding: 8bit

Introduce a helper for copying CPU signature between two CPU models.

It's not very useful until the way we store signatures is changed in the

next patch.

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

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

(cherry picked from commit 2254c1cfb854dfc52f3b4bfdfca2bd995b0a163c)

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

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

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

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

---

 src/cpu/cpu_x86.c | 16 +++++++++++++---

 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c

index 51cb9b7143..e25bc691ae 100644

--- a/src/cpu/cpu_x86.c

+++ b/src/cpu/cpu_x86.c

@@ -977,6 +977,16 @@ x86ModelFree(virCPUx86ModelPtr model)

 }

+static int

+x86ModelCopySignatures(virCPUx86ModelPtr dst,

+                       virCPUx86ModelPtr src)

+{

+    dst->signature = src->signature;

+

+    return 0;

+}

+

+

 static virCPUx86ModelPtr

 x86ModelCopy(virCPUx86ModelPtr model)

 {

@@ -984,13 +994,13 @@ x86ModelCopy(virCPUx86ModelPtr model)

     if (VIR_ALLOC(copy) < 0 ||

         VIR_STRDUP(copy->name, model->name) < 0 ||

+        x86ModelCopySignatures(copy, model) < 0 ||

         x86DataCopy(&copy->data, &model->data) < 0) {

         x86ModelFree(copy);

         return NULL;

     }

     copy->vendor = model->vendor;

-    copy->signature = model->signature;

     return copy;

 }

@@ -1176,8 +1186,8 @@ x86ModelParseAncestor(virCPUx86ModelPtr model,

     }

     model->vendor = ancestor->vendor;

-    model->signature = ancestor->signature;

-    if (x86DataCopy(&model->data, &ancestor->data) < 0)

+    if (x86ModelCopySignatures(model, ancestor) < 0 ||

+        x86DataCopy(&model->data, &ancestor->data) < 0)

         return -1;

     return 0;

-- 

2.22.0