summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2011-08-05 09:50:29 +0100
committerMarcelo Tosatti <mtosatti@redhat.com>2011-08-05 14:08:40 -0300
commit45996cb4d86eac786015e565c1bf5528761f592b (patch)
tree790adce0534bce2c6df307a6a1f4a1df868dcf6b
parentFix VERSION to reflect that we're in 0.15.0-rc1 (diff)
downloadqemu-kvm-45996cb4d86eac786015e565c1bf5528761f592b.tar.gz
qemu-kvm-45996cb4d86eac786015e565c1bf5528761f592b.tar.bz2
qemu-kvm-45996cb4d86eac786015e565c1bf5528761f592b.zip
Fix default accelerator when configured with --disable-kvm
The default accelerator is hardcoded to 'kvm'. This is a fine default for qemu-kvm normally, but if the user built with ./configure --disable-kvm, then the resulting binaries will not work by default * vl.c: Default to 'tcg' unless CONFIG_KVM is defined Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r--vl.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/vl.c b/vl.c
index 7ae549eac..28fd2f317 100644
--- a/vl.c
+++ b/vl.c
@@ -1953,8 +1953,13 @@ static int configure_accelerator(void)
}
if (p == NULL) {
+#ifdef CONFIG_KVM
/* Use the default "accelerator", kvm */
p = "kvm";
+#else
+ /* Use the default "accelerator", tcg */
+ p = "tcg";
+#endif
}
while (!accel_initalised && *p != '\0') {