bump version to 2.11.1-1

[pve-qemu.git] / debian / patches / pve / 0004-use-kvm-by-default.patch

diff --git a/debian/patches/pve/0004-use-kvm-by-default.patch b/debian/patches/pve/0004-use-kvm-by-default.patch
index 92d9ce0e69355bcaec6790dad5338e74f857f8a6..3b859c9ae32871593db7b32a39563c19fd3a1f68 100644 (file)
--- a/debian/patches/pve/0004-use-kvm-by-default.patch
+++ b/debian/patches/pve/0004-use-kvm-by-default.patch
@@ -1,27 +1,27 @@
-From 0203288ce982ea135ff82cf4ea6a7868ef053470 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
 Date: Wed, 9 Dec 2015 14:27:05 +0100
-Subject: [PATCH 04/28] use kvm by default
+Subject: [PATCH] use kvm by default
 
 ---
- accel.c | 4 ++--
+ accel/accel.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/accel.c b/accel.c
-index 664bb88422..ddb23a3f1d 100644
---- a/accel.c
-+++ b/accel.c
-@@ -87,8 +87,8 @@ void configure_accelerator(MachineState *ms)
+diff --git a/accel/accel.c b/accel/accel.c
+index 8ae40e1e13..df21981026 100644
+--- a/accel/accel.c
++++ b/accel/accel.c
+@@ -79,8 +79,8 @@ void configure_accelerator(MachineState *ms)
  
-     p = qemu_opt_get(qemu_get_machine_opts(), "accel");
-     if (p == NULL) {
+     accel = qemu_opt_get(qemu_get_machine_opts(), "accel");
+     if (accel == NULL) {
 -        /* Use the default "accelerator", tcg */
--        p = "tcg";
+-        accel = "tcg";
 +        /* Use the default "accelerator", kvm */
-+        p = "kvm";
++        accel = "kvm";
      }
  
-     while (!accel_initialised && *p != '\0') {
+     p = accel;
 -- 
 2.11.0