|
 |
6d3351 |
From 2642333131bda397dc4b00fd945efdd34e2aa314 Mon Sep 17 00:00:00 2001
|
|
|
6d3351 |
Message-Id: <2642333131bda397dc4b00fd945efdd34e2aa314@dist-git>
|
|
|
6d3351 |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6d3351 |
Date: Wed, 29 Mar 2017 15:00:21 +0200
|
|
|
6d3351 |
Subject: [PATCH] cpu: Drop feature filtering from virCPUUpdate
|
|
|
6d3351 |
|
|
|
6d3351 |
Because of the changes done in the previous commit, @host is already a
|
|
|
6d3351 |
migratable CPU and there's no need to do any additional filtering.
|
|
|
6d3351 |
|
|
|
6d3351 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6d3351 |
(cherry picked from commit 232d87c7dd081d126a079fb45178e0be096cc680)
|
|
|
6d3351 |
|
|
|
6d3351 |
https://bugzilla.redhat.com/show_bug.cgi?id=1444421
|
|
|
6d3351 |
|
|
|
6d3351 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6d3351 |
---
|
|
|
6d3351 |
src/cpu/cpu_x86.c | 9 +++------
|
|
|
6d3351 |
1 file changed, 3 insertions(+), 6 deletions(-)
|
|
|
6d3351 |
|
|
|
6d3351 |
diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
|
|
|
6d3351 |
index a771b251e..53359ff9b 100644
|
|
|
6d3351 |
--- a/src/cpu/cpu_x86.c
|
|
|
6d3351 |
+++ b/src/cpu/cpu_x86.c
|
|
|
6d3351 |
@@ -2549,8 +2549,7 @@ x86Baseline(virCPUDefPtr *cpus,
|
|
|
6d3351 |
|
|
|
6d3351 |
static int
|
|
|
6d3351 |
x86UpdateHostModel(virCPUDefPtr guest,
|
|
|
6d3351 |
- const virCPUDef *host,
|
|
|
6d3351 |
- virCPUx86MapPtr map)
|
|
|
6d3351 |
+ const virCPUDef *host)
|
|
|
6d3351 |
{
|
|
|
6d3351 |
virCPUDefPtr updated = NULL;
|
|
|
6d3351 |
size_t i;
|
|
|
6d3351 |
@@ -2559,11 +2558,9 @@ x86UpdateHostModel(virCPUDefPtr guest,
|
|
|
6d3351 |
if (!(updated = virCPUDefCopyWithoutModel(host)))
|
|
|
6d3351 |
goto cleanup;
|
|
|
6d3351 |
|
|
|
6d3351 |
- /* Remove non-migratable features by default */
|
|
|
6d3351 |
updated->type = VIR_CPU_TYPE_GUEST;
|
|
|
6d3351 |
updated->mode = VIR_CPU_MODE_CUSTOM;
|
|
|
6d3351 |
- if (virCPUDefCopyModelFilter(updated, host, true,
|
|
|
6d3351 |
- x86FeatureIsMigratable, map) < 0)
|
|
|
6d3351 |
+ if (virCPUDefCopyModel(updated, host, true) < 0)
|
|
|
6d3351 |
goto cleanup;
|
|
|
6d3351 |
|
|
|
6d3351 |
if (guest->vendor_id) {
|
|
|
6d3351 |
@@ -2627,7 +2624,7 @@ virCPUx86Update(virCPUDefPtr guest,
|
|
|
6d3351 |
|
|
|
6d3351 |
if (guest->mode == VIR_CPU_MODE_HOST_MODEL ||
|
|
|
6d3351 |
guest->match == VIR_CPU_MATCH_MINIMUM)
|
|
|
6d3351 |
- ret = x86UpdateHostModel(guest, host, map);
|
|
|
6d3351 |
+ ret = x86UpdateHostModel(guest, host);
|
|
|
6d3351 |
else
|
|
|
6d3351 |
ret = 0;
|
|
|
6d3351 |
|
|
|
6d3351 |
--
|
|
|
6d3351 |
2.12.2
|
|
|
6d3351 |
|