NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

cpu_x86: Fix host-model CPUs on hosts with CMT

Browse Source 
Since the introduction of CMT features (commit v1.3.5-461-gf294b83)
starting a domain with host-model CPU on a host which supports CMT fails
because QEMU complains about unknown 'cmt' feature:

    qemu-system-x86_64: CPU feature cmt not found

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

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2016-08-09 15:15:20 +02:00
parent 58ba240df8
commit 300f668c66
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cpu/cpu_x86.c
View File

@ -2542,12 +2542,16 @@ x86UpdateHostModel(virCPUDefPtr guest,
goto cleanup; goto cleanup;
} }
/* Remove non-migratable features by default /* Remove non-migratable features and CMT related features which QEMU
* knows nothing about.
* Note: this only works as long as no CPU model contains non-migratable * Note: this only works as long as no CPU model contains non-migratable
* features directly */ * features directly */
i = 0; i = 0;
while (i < guest->nfeatures) { while (i < guest->nfeatures) {
if (x86FeatureIsMigratable(guest->features[i].name, map)) { if (x86FeatureIsMigratable(guest->features[i].name, map) &&
STRNEQ(guest->features[i].name, "cmt") &&
STRNEQ(guest->features[i].name, "mbm_total") &&
STRNEQ(guest->features[i].name, "mbm_local")) {
i++; i++;
} else { } else {
VIR_FREE(guest->features[i].name); VIR_FREE(guest->features[i].name);

2
tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-cmt.args
View File

@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
-S \ -S \
-M pc \ -M pc \
-cpu Haswell,+vme,+ds,+acpi,+ss,+ht,+tm,+pbe,+dtes64,+monitor,+ds_cpl,+vmx,\ -cpu Haswell,+vme,+ds,+acpi,+ss,+ht,+tm,+pbe,+dtes64,+monitor,+ds_cpl,+vmx,\
+smx,+est,+tm2,+xtpr,+pdcm,+osxsave,+f16c,+rdrand,+cmt,+pdpe1gb,+abm \ +smx,+est,+tm2,+xtpr,+pdcm,+osxsave,+f16c,+rdrand,+pdpe1gb,+abm \
-m 214 \ -m 214 \
-smp 6,sockets=6,cores=1,threads=1 \ -smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \