|
 |
c313de |
From e4f000025ac57ed4c731ffb0939f2e02bb84d856 Mon Sep 17 00:00:00 2001
|
|
|
c313de |
Message-Id: <e4f000025ac57ed4c731ffb0939f2e02bb84d856@dist-git>
|
|
|
c313de |
From: Jiri Denemark <jdenemar@redhat.com>
|
|
|
c313de |
Date: Fri, 21 Jun 2019 09:26:11 +0200
|
|
|
c313de |
Subject: [PATCH] qemu: Forbid MSR features with old QEMU
|
|
|
c313de |
MIME-Version: 1.0
|
|
|
c313de |
Content-Type: text/plain; charset=UTF-8
|
|
|
c313de |
Content-Transfer-Encoding: 8bit
|
|
|
c313de |
|
|
|
c313de |
Without "unavailable-features" CPU property we cannot properly detect
|
|
|
c313de |
whether a specific MSR feature we asked for (either explicitly or
|
|
|
c313de |
implicitly via a CPU model) was disabled by QEMU for some reason.
|
|
|
c313de |
Because this could break migration, snapshots, and save/restore
|
|
|
c313de |
operaions, it's better to just forbid any use of MSR features with QEMU
|
|
|
c313de |
which lacks "unavailable-features" CPU property.
|
|
|
c313de |
|
|
|
c313de |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
c313de |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
c313de |
(cherry picked from commit 8eb4a89f5f7973f50aa8b6fa0b1a45b825dda208)
|
|
|
c313de |
|
|
|
c313de |
https://bugzilla.redhat.com/show_bug.cgi?id=1697627
|
|
|
c313de |
|
|
|
c313de |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
c313de |
Message-Id: <b077794613a01d8ebd69b27afef1ad2452a4810d.1561068591.git.jdenemar@redhat.com>
|
|
|
c313de |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
c313de |
---
|
|
|
c313de |
src/qemu/qemu_process.c | 30 +++++++++++++++++++++++++++---
|
|
|
c313de |
1 file changed, 27 insertions(+), 3 deletions(-)
|
|
|
c313de |
|
|
|
c313de |
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
|
|
|
c313de |
index d147e524ee..db14d322f5 100644
|
|
|
c313de |
--- a/src/qemu/qemu_process.c
|
|
|
c313de |
+++ b/src/qemu/qemu_process.c
|
|
|
c313de |
@@ -53,6 +53,7 @@
|
|
|
c313de |
#include "qemu_extdevice.h"
|
|
|
c313de |
|
|
|
c313de |
#include "cpu/cpu.h"
|
|
|
c313de |
+#include "cpu/cpu_x86.h"
|
|
|
c313de |
#include "datatypes.h"
|
|
|
c313de |
#include "virlog.h"
|
|
|
c313de |
#include "virerror.h"
|
|
|
c313de |
@@ -5226,9 +5227,32 @@ qemuProcessStartValidate(virQEMUDriverPtr driver,
|
|
|
c313de |
if (qemuProcessStartValidateShmem(vm) < 0)
|
|
|
c313de |
return -1;
|
|
|
c313de |
|
|
|
c313de |
- if (vm->def->cpu &&
|
|
|
c313de |
- virCPUValidateFeatures(vm->def->os.arch, vm->def->cpu) < 0)
|
|
|
c313de |
- return -1;
|
|
|
c313de |
+ if (vm->def->cpu) {
|
|
|
c313de |
+ if (virCPUValidateFeatures(vm->def->os.arch, vm->def->cpu) < 0)
|
|
|
c313de |
+ return -1;
|
|
|
c313de |
+
|
|
|
c313de |
+ if (ARCH_IS_X86(vm->def->os.arch) &&
|
|
|
c313de |
+ !virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_UNAVAILABLE_FEATURES)) {
|
|
|
c313de |
+ VIR_AUTOSTRINGLIST features = NULL;
|
|
|
c313de |
+ int n;
|
|
|
c313de |
+
|
|
|
c313de |
+ if ((n = virCPUDefCheckFeatures(vm->def->cpu,
|
|
|
c313de |
+ virCPUx86FeatureFilterSelectMSR,
|
|
|
c313de |
+ NULL,
|
|
|
c313de |
+ &features)) < 0)
|
|
|
c313de |
+ return -1;
|
|
|
c313de |
+
|
|
|
c313de |
+ if (n > 0) {
|
|
|
c313de |
+ VIR_AUTOFREE(char *) str = NULL;
|
|
|
c313de |
+
|
|
|
c313de |
+ str = virStringListJoin((const char **)features, ", ");
|
|
|
c313de |
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
|
c313de |
+ _("Some features cannot be reliably used "
|
|
|
c313de |
+ "with this QEMU: %s"), str);
|
|
|
c313de |
+ return -1;
|
|
|
c313de |
+ }
|
|
|
c313de |
+ }
|
|
|
c313de |
+ }
|
|
|
c313de |
|
|
|
c313de |
if (qemuProcessStartValidateDisks(vm, qemuCaps) < 0)
|
|
|
c313de |
return -1;
|
|
|
c313de |
--
|
|
|
c313de |
2.22.0
|
|
|
c313de |
|