External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 14:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu_x86: Allow multiple signatures for a CPU model

Browse Source 
CPU signatures in the cpu_map serve as a hint for CPUID to CPU model
matching algorithm. If the CPU signatures matches any CPU model in the
cpu_map, this model will be the preferred one.

This works out well and solved several mismatches, but in real world
CPUs which should match a single CPU model may be produced with several
different signatures. For example, low voltage Broadwell CPUs for
laptops and Broadwell CPUs for servers differ in CPU model numbers while
we should detect them all as Broadwell CPU model.

This patch adds support for storing several signatures for a single CPU
model to make this hint useful for more CPUs. Later commits will provide
additional signatures for existing CPU models, which will correct some
results in our CPU test suite.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark 2019-02-22 17:20:59 +01:00
parent b07b8b7750
commit dfeb3e5984
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/cpu/cpu_x86.c
View File

@ -1206,22 +1206,32 @@ x86ModelParseAncestor(virCPUx86ModelPtr model,
static int
x86ModelParseSignature(virCPUx86ModelPtr model,
xmlXPathContextPtr ctxt)
x86ModelParseSignatures(virCPUx86ModelPtr model,
xmlXPathContextPtr ctxt)
{
VIR_AUTOFREE(xmlNodePtr *) nodes = NULL;
xmlNodePtr root = ctxt->node;
size_t i;
int n;
if ((n = virXPathNodeSet("./signature", ctxt, &nodes)) <= 0)
return n;
/* Remove inherited signatures. */
VIR_FREE(model->signatures);
if (virXPathBoolean("boolean(./signature)", ctxt)) {
model->nsignatures = n;
if (VIR_ALLOC_N(model->signatures, n) < 0)
return -1;
for (i = 0; i < n; i++) {
unsigned int sigFamily = 0;
unsigned int sigModel = 0;
int rc;
model->nsignatures = 1;
if (VIR_ALLOC_N(model->signatures, 1) < 0)
return -1;
ctxt->node = nodes[i];
rc = virXPathUInt("string(./signature/@family)", ctxt, &sigFamily);
rc = virXPathUInt("string(@family)", ctxt, &sigFamily);
if (rc < 0 || sigFamily == 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Invalid CPU signature family in model %s"),
@ -1229,7 +1239,7 @@ x86ModelParseSignature(virCPUx86ModelPtr model,
return -1;
}
rc = virXPathUInt("string(./signature/@model)", ctxt, &sigModel);
rc = virXPathUInt("string(@model)", ctxt, &sigModel);
if (rc < 0 || sigModel == 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Invalid CPU signature model in model %s"),
@ -1237,9 +1247,10 @@ x86ModelParseSignature(virCPUx86ModelPtr model,
return -1;
}
model->signatures[0] = x86MakeSignature(sigFamily, sigModel, 0);
model->signatures[i] = x86MakeSignature(sigFamily, sigModel, 0);
}
ctxt->node = root;
return 0;
}
@ -1336,7 +1347,7 @@ x86ModelParse(xmlXPathContextPtr ctxt,
if (x86ModelParseAncestor(model, ctxt, map) < 0)
goto cleanup;
if (x86ModelParseSignature(model, ctxt) < 0)
if (x86ModelParseSignatures(model, ctxt) < 0)
goto cleanup;
if (x86ModelParseVendor(model, ctxt, map) < 0)