[PATCH master+STABLE-0.15] Fix default accelerator when configured with --disable-kvm

[PATCH master+STABLE-0.15] Fix default accelerator when configured with --disable-kvm

[Daniel P. Berrange]

From: "Daniel P. Berrange" <berrange@redhat.com>

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>
---
 vl.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/vl.c b/vl.c
index 7ae549e..28fd2f3 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') {
-- 
1.7.6

Re: [PATCH master+STABLE-0.15] Fix default accelerator when configured with --disable-kvm

[Marcelo Tosatti]

On Fri, Aug 05, 2011 at 09:50:29AM +0100, Daniel P. Berrange wrote:
> From: "Daniel P. Berrange" <berrange@redhat.com>
> 
> 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>

Applied, thanks.

Re: [PATCH master+STABLE-0.15] Fix default accelerator when configured with --disable-kvm

[Anthony Liguori]

On 08/05/2011 12:10 PM, Marcelo Tosatti wrote:
> On Fri, Aug 05, 2011 at 09:50:29AM +0100, Daniel P. Berrange wrote:
>> From: "Daniel P. Berrange"<berrange@redhat.com>
>>
>> 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>
>
> Applied, thanks.

FYI, you can now do the same thing by just patching 
sysconfig/target-x86_64.conf.  I just modify my 
/usr/local/etc/qemu/target-x86_64.conf and now even with qemu.git, I get 
kvm enablement by default.

diff --git a/sysconfigs/target/target-x86_64.conf 
b/sysconfigs/target/target-x86
index 43ad282..2eabef9 100644
--- a/sysconfigs/target/target-x86_64.conf
+++ b/sysconfigs/target/target-x86_64.conf
@@ -84,3 +84,5 @@
     xlevel = "0x80000008"
     model_id = "AMD Opteron 23xx (Gen 3 Class Opteron)"

+[machine]
+   accel = "kvm:tcg"

Regards,

Anthony Liguori

>
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH master+STABLE-0.15] Fix default accelerator when configured with --disable-kvm

[Marcelo Tosatti]

On Thu, Aug 04, 2011 at 03:02:24PM +0100, Daniel P. Berrange wrote:
> From: "Daniel P. Berrange" <berrange@redhat.com>
> 
> 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

Signed-off-by, please.

[PATCH master+STABLE-0.15] Fix default accelerator when configured with --disable-kvm

[Daniel P. Berrange]

From: "Daniel P. Berrange" <berrange@redhat.com>

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
---
 vl.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/vl.c b/vl.c
index 7ae549e..28fd2f3 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') {
-- 
1.7.6