External/libvirt
1
0
Fork 0
Code

Revert "cpu: Drop feature filtering from virCPUUpdate"

Browse Source 
This reverts commit 5f96b3feb6b345d3c3bfb68b05b16194ad3fea9d which was
pushed accidentally.
This commit is contained in:
Jiri Denemark 2017-04-07 13:17:02 +02:00
parent dfe8aa37ad
commit 8a1c7ed6d5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cpu/cpu_x86.c
View File

@ -2549,7 +2549,8 @@ x86Baseline(virCPUDefPtr *cpus,
static int static int
x86UpdateHostModel(virCPUDefPtr guest, x86UpdateHostModel(virCPUDefPtr guest,
const virCPUDef *host) const virCPUDef *host,
virCPUx86MapPtr map)
{ {
virCPUDefPtr updated = NULL; virCPUDefPtr updated = NULL;
size_t i; size_t i;
@ -2558,9 +2559,11 @@ x86UpdateHostModel(virCPUDefPtr guest,
if (!(updated = virCPUDefCopyWithoutModel(host))) if (!(updated = virCPUDefCopyWithoutModel(host)))
goto cleanup; goto cleanup;
/* Remove non-migratable features by default */
updated->type = VIR_CPU_TYPE_GUEST; updated->type = VIR_CPU_TYPE_GUEST;
updated->mode = VIR_CPU_MODE_CUSTOM; updated->mode = VIR_CPU_MODE_CUSTOM;
if (virCPUDefCopyModel(updated, host, true) < 0) if (virCPUDefCopyModelFilter(updated, host, true,
x86FeatureIsMigratable, map) < 0)
goto cleanup; goto cleanup;
if (guest->vendor_id) { if (guest->vendor_id) {
@ -2624,7 +2627,7 @@ virCPUx86Update(virCPUDefPtr guest,
if (guest->mode == VIR_CPU_MODE_HOST_MODEL || if (guest->mode == VIR_CPU_MODE_HOST_MODEL ||
guest->match == VIR_CPU_MATCH_MINIMUM) guest->match == VIR_CPU_MATCH_MINIMUM)
ret = x86UpdateHostModel(guest, host); ret = x86UpdateHostModel(guest, host, map);
else else
ret = 0; ret = 0;