From abcd662eb8e516ebe4a6b401e83a62f749491a15 Mon Sep 17 00:00:00 2001

From: Miroslav Rezanina <mrezanin@redhat.com>

Date: Thu, 18 Dec 2014 06:27:49 +0100

Subject: Use kvm by default

Bugzilla: 906185

RHEL uses kvm accelerator by default, if available.

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

Rebase notes (2.2.0):

- Move code from vl.c to accel.c

(cherry picked from commit 11d2767107bf05736f3285b09401424a371cc847)

(cherry picked from commit 88e7e3cc1c3ff5ca0d452a1ce1310edb51065683)

---

 accel.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/accel.c b/accel.c

index 664bb88..23fc7e8 100644

--- a/accel.c

+++ b/accel.c

@@ -87,8 +87,8 @@ void configure_accelerator(MachineState *ms)

     p = qemu_opt_get(qemu_get_machine_opts(), "accel");

     if (p == NULL) {

-        /* Use the default "accelerator", tcg */

-        p = "tcg";

+        /* Use kvm accelerator by default, fail to tcg*/

+        p = "kvm:tcg";

     }

     while (!accel_initialised && *p != '\0') {

-- 

1.8.3.1