From 7b0ce42ca96a2cd47de485b12ae68932e060c2cf Mon Sep 17 00:00:00 2001
From: Li Zhang <zhlcindy@linux.vnet.ibm.com>
Date: Fri, 6 Sep 2013 12:15:25 +0100
Subject: [PATCH] qemu: avoid users specifying CPU features for non-x86
plaftorm.
Currently, only X86 provides users CPU features with CPUID instruction.
If users specify the features for non-x86, it should tell users to
remove them.
This patch is to report one error if features are specified by
users for non-x86 platform.
Signed-off-by: Li Zhang <zhlcindy@linux.vnet.ibm.com>
---
src/qemu/qemu_command.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index adb498397b..152143158f 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -10645,6 +10645,14 @@ qemuParseCommandLineCPU(virDomainDefPtr dom,
if (*feature == '\0')
goto syntax;
+ if (dom->os.arch != VIR_ARCH_X86_64 &&
+ dom->os.arch != VIR_ARCH_I686) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("%s platform doesn't support CPU features'"),
+ virArchToString(dom->os.arch));
+ goto cleanup;
+ }
+
if (STREQ(feature, "kvmclock")) {
bool present = (policy == VIR_CPU_FEATURE_REQUIRE);
size_t j;