From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 17 Jul 2009 03:20:22 +0000 (-0500)
Subject: Only allow -cpu host when KVM is enabled
X-Git-Tag: v0.11.0-rc1~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8fe7911401747e3687e7215140a81d671d7f789a;p=thirdparty%2Fqemu.git

Only allow -cpu host when KVM is enabled

-cpu host is not at all useful when using tcg.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/target-i386/helper.c b/target-i386/helper.c
index 5f335331b14..dd898852c5d 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -358,11 +358,10 @@ static int cpu_x86_find_by_name(x86_def_t *x86_cpu_def, const char *cpu_model)
             break;
         }
     }
-    if (!def) {
-        if (strcmp(name, "host") != 0) {
-            goto error;
-        }
+    if (kvm_enabled() && strcmp(name, "host") == 0) {
         cpu_x86_fill_host(x86_cpu_def);
+    } else if (!def) {
+        goto error;
     } else {
         memcpy(x86_cpu_def, def, sizeof(*def));
     }