rebase patches onto 2.6.1

[pve-qemu-kvm.git] / debian / patches / pve / 0007-set-the-CPU-model-to-kvm64-32-instead-of-qemu64-32.patch

diff --git a/debian/patches/pve/0007-set-the-CPU-model-to-kvm64-32-instead-of-qemu64-32.patch b/debian/patches/pve/0007-set-the-CPU-model-to-kvm64-32-instead-of-qemu64-32.patch
index 7ade5c23aae1bb0d4304b20b9d2a307ad866307a..368b1baaaa9049d939cf8383182be9d56e9df9cb 100644 (file)
--- a/debian/patches/pve/0007-set-the-CPU-model-to-kvm64-32-instead-of-qemu64-32.patch
+++ b/debian/patches/pve/0007-set-the-CPU-model-to-kvm64-32-instead-of-qemu64-32.patch
@@ -1,17 +1,17 @@
-From c868ddb3ae37b5d8932c491b3b8de46ac83c3189 Mon Sep 17 00:00:00 2001
+From cfeb66f21383c31c70e69165c80e65c1901e7fa1 Mon Sep 17 00:00:00 2001
 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
 Date: Wed, 9 Dec 2015 14:30:21 +0100
-Subject: [PATCH 07/41] set the CPU model to kvm64/32 instead of qemu64/32
+Subject: [PATCH 07/55] set the CPU model to kvm64/32 instead of qemu64/32
 
 ---
  hw/i386/pc.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/hw/i386/pc.c b/hw/i386/pc.c
-index 5e20e07..a20df3c 100644
+index 99437e0..1225a99 100644
 --- a/hw/i386/pc.c
 +++ b/hw/i386/pc.c
-@@ -1128,9 +1128,9 @@ void pc_cpus_init(PCMachineState *pcms)
+@@ -1111,9 +1111,9 @@ void pc_cpus_init(PCMachineState *pcms)
      /* init CPUs */
      if (machine->cpu_model == NULL) {
  #ifdef TARGET_X86_64