|
 |
c480ed |
From 5354c931f98f2d95d131bf4d490d0e5e057157fe Mon Sep 17 00:00:00 2001
|
|
|
c480ed |
Message-Id: <5354c931f98f2d95d131bf4d490d0e5e057157fe@dist-git>
|
|
|
c480ed |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
c480ed |
Date: Fri, 21 Jun 2019 09:25:32 +0200
|
|
|
c480ed |
Subject: [PATCH] cpu_x86: Introduce virCPUx86DataCmp
|
|
|
c480ed |
MIME-Version: 1.0
|
|
|
c480ed |
Content-Type: text/plain; charset=UTF-8
|
|
|
c480ed |
Content-Transfer-Encoding: 8bit
|
|
|
c480ed |
|
|
|
c480ed |
virCPUx86DataSorter already compares two virCPUx86DataItem structs.
|
|
|
c480ed |
Let's add a tiny wrapper around it called virCPUx86DataCmp and use it
|
|
|
c480ed |
instead of open coded comparisons.
|
|
|
c480ed |
|
|
|
c480ed |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
c480ed |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
c480ed |
(cherry picked from commit 559ccd7815056af23de24b7a01e8f644d97b6a92)
|
|
|
c480ed |
|
|
|
c480ed |
https://bugzilla.redhat.com/show_bug.cgi?id=1697627
|
|
|
c480ed |
|
|
|
c480ed |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
c480ed |
Message-Id: <9623fdd20059ec6abc7f09c5e7f1e13927c56944.1561068591.git.jdenemar@redhat.com>
|
|
|
c480ed |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
c480ed |
---
|
|
|
c480ed |
src/cpu/cpu_x86.c | 13 ++++++++++---
|
|
|
c480ed |
1 file changed, 10 insertions(+), 3 deletions(-)
|
|
|
c480ed |
|
|
|
c480ed |
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
|
|
|
c480ed |
index 0582be63e2..5a09033d2a 100644
|
|
|
c480ed |
--- a/src/cpu/cpu_x86.c
|
|
|
c480ed |
+++ b/src/cpu/cpu_x86.c
|
|
|
c480ed |
@@ -304,6 +304,13 @@ virCPUx86DataSorter(const void *a, const void *b)
|
|
|
c480ed |
return 0;
|
|
|
c480ed |
}
|
|
|
c480ed |
|
|
|
c480ed |
+static int
|
|
|
c480ed |
+virCPUx86DataItemCmp(const virCPUx86DataItem *item1,
|
|
|
c480ed |
+ const virCPUx86DataItem *item2)
|
|
|
c480ed |
+{
|
|
|
c480ed |
+ return virCPUx86DataSorter(item1, item2);
|
|
|
c480ed |
+}
|
|
|
c480ed |
+
|
|
|
c480ed |
|
|
|
c480ed |
/* skips all zero CPUID leaves */
|
|
|
c480ed |
static virCPUx86DataItemPtr
|
|
|
c480ed |
@@ -332,9 +339,9 @@ virCPUx86DataGet(const virCPUx86Data *data,
|
|
|
c480ed |
size_t i;
|
|
|
c480ed |
|
|
|
c480ed |
for (i = 0; i < data->len; i++) {
|
|
|
c480ed |
- if (data->items[i].cpuid.eax_in == item->cpuid.eax_in &&
|
|
|
c480ed |
- data->items[i].cpuid.ecx_in == item->cpuid.ecx_in)
|
|
|
c480ed |
- return data->items + i;
|
|
|
c480ed |
+ virCPUx86DataItemPtr di = data->items + i;
|
|
|
c480ed |
+ if (virCPUx86DataItemCmp(di, item) == 0)
|
|
|
c480ed |
+ return di;
|
|
|
c480ed |
}
|
|
|
c480ed |
|
|
|
c480ed |
return NULL;
|
|
|
c480ed |
--
|
|
|
c480ed |
2.22.0
|
|
|
c480ed |
|