update enable-kvm-by-default.patch for 1.7

diff --git a/debian/patches/enable-kvm-by-default.patch b/debian/patches/enable-kvm-by-default.patch
index bdae4c3f3e87d8257885b9d2de798a3e166b81f8..805c5f5dcf46bfef26e14402616ffe2632b6fca6 100644 (file)
--- a/debian/patches/enable-kvm-by-default.patch
+++ b/debian/patches/enable-kvm-by-default.patch
@@ -1,109 +1,15 @@
-Index: new/hw/pc_piix.c
+Index: new/vl.c
 ===================================================================
---- new.orig/hw/pc_piix.c      2013-02-11 11:06:09.000000000 +0100
-+++ new/hw/pc_piix.c   2013-02-11 12:18:14.000000000 +0100
-@@ -294,6 +294,8 @@
- }
- #endif
+--- new.orig/vl.c      2013-11-27 11:12:55.000000000 +0100
++++ new/vl.c   2013-11-27 11:26:13.000000000 +0100
+@@ -2638,8 +2638,8 @@
  
-+#define KVM_MACHINE_OPTIONS "accel=kvm"
-+
- static QEMUMachine pc_i440fx_machine_v1_4 = {
-     .name = "pc-i440fx-1.4",
-     .alias = "pc",
-@@ -301,6 +303,7 @@
-     .init = pc_init_pci,
-     .max_cpus = 255,
-     .is_default = 1,
-+    .default_machine_opts = KVM_MACHINE_OPTIONS,
-     DEFAULT_MACHINE_OPTIONS,
- };
+     p = qemu_opt_get(qemu_get_machine_opts(), "accel");
+     if (p == NULL) {
+-        /* Use the default "accelerator", tcg */
+-        p = "tcg";
++        /* Use the default "accelerator", kvm */
++        p = "kvm";
+     }
  
-@@ -328,6 +331,7 @@
-         PC_COMPAT_1_3,
-         { /* end of list */ }
-     },
-+    .default_machine_opts = KVM_MACHINE_OPTIONS,
-     DEFAULT_MACHINE_OPTIONS,
- };
- 
-@@ -364,6 +368,7 @@
-     .desc = "Standard PC",
-     .init = pc_init_pci_1_2,
-     .max_cpus = 255,
-+    .default_machine_opts = KVM_MACHINE_OPTIONS,
-     .compat_props = (GlobalProperty[]) {
-         PC_COMPAT_1_2,
-         { /* end of list */ }
-@@ -408,6 +413,7 @@
-     .desc = "Standard PC",
-     .init = pc_init_pci_1_2,
-     .max_cpus = 255,
-+    .default_machine_opts = KVM_MACHINE_OPTIONS,
-     .compat_props = (GlobalProperty[]) {
-         PC_COMPAT_1_1,
-         { /* end of list */ }
-@@ -444,6 +450,7 @@
-     .desc = "Standard PC",
-     .init = pc_init_pci_1_2,
-     .max_cpus = 255,
-+    .default_machine_opts = KVM_MACHINE_OPTIONS,
-     .compat_props = (GlobalProperty[]) {
-         PC_COMPAT_1_0,
-         { /* end of list */ }
-@@ -460,6 +467,7 @@
-     .desc = "Standard PC",
-     .init = pc_init_pci_1_2,
-     .max_cpus = 255,
-+    .default_machine_opts = KVM_MACHINE_OPTIONS,
-     .compat_props = (GlobalProperty[]) {
-         PC_COMPAT_0_15,
-         { /* end of list */ }
-@@ -493,6 +501,7 @@
-     .desc = "Standard PC",
-     .init = pc_init_pci_1_2,
-     .max_cpus = 255,
-+    .default_machine_opts = KVM_MACHINE_OPTIONS,
-     .compat_props = (GlobalProperty[]) {
-         PC_COMPAT_0_14, 
-         {
-@@ -527,6 +536,7 @@
-     .desc = "Standard PC",
-     .init = pc_init_pci_no_kvmclock,
-     .max_cpus = 255,
-+    .default_machine_opts = KVM_MACHINE_OPTIONS,
-     .compat_props = (GlobalProperty[]) {
-         PC_COMPAT_0_13,
-         {
-@@ -565,6 +575,7 @@
-     .desc = "Standard PC",
-     .init = pc_init_pci_no_kvmclock,
-     .max_cpus = 255,
-+    .default_machine_opts = KVM_MACHINE_OPTIONS,
-     .compat_props = (GlobalProperty[]) {
-         PC_COMPAT_0_12,
-         {
-@@ -599,6 +610,7 @@
-     .desc = "Standard PC, qemu 0.11",
-     .init = pc_init_pci_no_kvmclock,
-     .max_cpus = 255,
-+    .default_machine_opts = KVM_MACHINE_OPTIONS,
-     .compat_props = (GlobalProperty[]) {
-         PC_COMPAT_0_11,
-         {
-@@ -621,6 +633,7 @@
-     .desc = "Standard PC, qemu 0.10",
-     .init = pc_init_pci_no_kvmclock,
-     .max_cpus = 255,
-+    .default_machine_opts = KVM_MACHINE_OPTIONS,
-     .compat_props = (GlobalProperty[]) {
-         PC_COMPAT_0_11,
-         {
-@@ -655,6 +668,7 @@
-     .desc = "ISA-only PC",
-     .init = pc_init_isa,
-     .max_cpus = 1,
-+    .default_machine_opts = KVM_MACHINE_OPTIONS,
-     .compat_props = (GlobalProperty[]) {
-         {
-             .driver   = "pc-sysfw",
+     while (!accel_initialised && *p != '\0') {