rebase patches onto 2.6.1

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

diff --git a/debian/patches/pve/0005-use-kvm-by-default.patch b/debian/patches/pve/0005-use-kvm-by-default.patch
index 91e665a2779b64b6c008f669c926a45407b904d5..5c97e2344e593e36a68ab74cc49beb7a67e81cca 100644 (file)
--- a/debian/patches/pve/0005-use-kvm-by-default.patch
+++ b/debian/patches/pve/0005-use-kvm-by-default.patch
@@ -1,17 +1,17 @@
-From d6e2e550fee6c0c3468585c4885237a080468ecf Mon Sep 17 00:00:00 2001
+From c727dd8049e617a814e6b537648e0145190084e2 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 05/41] use kvm by default
+Subject: [PATCH 05/55] use kvm by default
 
 ---
  accel.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/accel.c b/accel.c
-index 74e41da..66e2e58 100644
+index 0510b90..afe9a0d 100644
 --- a/accel.c
 +++ b/accel.c
-@@ -87,8 +87,8 @@ int configure_accelerator(MachineState *ms)
+@@ -88,8 +88,8 @@ int configure_accelerator(MachineState *ms)
  
      p = qemu_opt_get(qemu_get_machine_opts(), "accel");
      if (p == NULL) {