cpu_x86: Introduce virCPUx86DataCmp

virCPUx86DataSorter already compares two virCPUx86DataItem structs.
Let's add a tiny wrapper around it called virCPUx86DataCmp and use it
instead of open coded comparisons.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark 2019-03-15 18:36:58 +01:00
parent 0fdc0ad84c
commit 559ccd7815

View File

@ -306,6 +306,13 @@ virCPUx86DataSorter(const void *a, const void *b)
return 0; return 0;
} }
static int
virCPUx86DataItemCmp(const virCPUx86DataItem *item1,
const virCPUx86DataItem *item2)
{
return virCPUx86DataSorter(item1, item2);
}
/* skips all zero CPUID leaves */ /* skips all zero CPUID leaves */
static virCPUx86DataItemPtr static virCPUx86DataItemPtr
@ -334,9 +341,9 @@ virCPUx86DataGet(const virCPUx86Data *data,
size_t i; size_t i;
for (i = 0; i < data->len; i++) { for (i = 0; i < data->len; i++) {
if (data->items[i].cpuid.eax_in == item->cpuid.eax_in && virCPUx86DataItemPtr di = data->items + i;
data->items[i].cpuid.ecx_in == item->cpuid.ecx_in) if (virCPUx86DataItemCmp(di, item) == 0)
return data->items + i; return di;
} }
return NULL; return NULL;