|
 |
7a3408 |
From 202a17ed092c28749335bc7ed1641c5590841be6 Mon Sep 17 00:00:00 2001
|
|
|
7a3408 |
Message-Id: <202a17ed092c28749335bc7ed1641c5590841be6@dist-git>
|
|
|
7a3408 |
From: Andrea Bolognani <abologna@redhat.com>
|
|
|
7a3408 |
Date: Fri, 21 Aug 2015 16:36:01 -0700
|
|
|
7a3408 |
Subject: [PATCH] cpu: Don't update host-model guest CPUs on ppc64
|
|
|
7a3408 |
|
|
|
7a3408 |
If a guest CPU is defined using
|
|
|
7a3408 |
|
|
|
7a3408 |
<cpu mode='host-model'/>
|
|
|
7a3408 |
|
|
|
7a3408 |
the <model> sub-element will contain the compatibility mode to use.
|
|
|
7a3408 |
That means we can't just copy the host CPU model on cpuUpdate(),
|
|
|
7a3408 |
otherwise we'll overwrite that information and migration of such
|
|
|
7a3408 |
guests will fail.
|
|
|
7a3408 |
|
|
|
7a3408 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1251927
|
|
|
7a3408 |
(cherry picked from commit 6d7c2f65c103c9b98baf595d14725e62651bdb1b)
|
|
|
7a3408 |
|
|
|
7a3408 |
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1251927
|
|
|
7a3408 |
|
|
|
7a3408 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
7a3408 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
7a3408 |
---
|
|
|
7a3408 |
src/cpu/cpu_ppc64.c | 2 +-
|
|
|
7a3408 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
7a3408 |
|
|
|
7a3408 |
diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c
|
|
|
7a3408 |
index 85aa5bc..72b8fa0 100644
|
|
|
7a3408 |
--- a/src/cpu/cpu_ppc64.c
|
|
|
7a3408 |
+++ b/src/cpu/cpu_ppc64.c
|
|
|
7a3408 |
@@ -667,13 +667,13 @@ ppc64DriverUpdate(virCPUDefPtr guest,
|
|
|
7a3408 |
const virCPUDef *host)
|
|
|
7a3408 |
{
|
|
|
7a3408 |
switch ((virCPUMode) guest->mode) {
|
|
|
7a3408 |
- case VIR_CPU_MODE_HOST_MODEL:
|
|
|
7a3408 |
case VIR_CPU_MODE_HOST_PASSTHROUGH:
|
|
|
7a3408 |
guest->match = VIR_CPU_MATCH_EXACT;
|
|
|
7a3408 |
guest->fallback = VIR_CPU_FALLBACK_FORBID;
|
|
|
7a3408 |
virCPUDefFreeModel(guest);
|
|
|
7a3408 |
return virCPUDefCopyModel(guest, host, true);
|
|
|
7a3408 |
|
|
|
7a3408 |
+ case VIR_CPU_MODE_HOST_MODEL:
|
|
|
7a3408 |
case VIR_CPU_MODE_CUSTOM:
|
|
|
7a3408 |
return 0;
|
|
|
7a3408 |
|
|
|
7a3408 |
--
|
|
|
7a3408 |
2.5.0
|
|
|
7a3408 |
|