debian/patches/enable-kvm-by-default.patch

   1 Index: new/hw/pc_piix.c
   2 ===================================================================
   3 --- new.orig/hw/pc_piix.c       2013-02-11 11:06:09.000000000 +0100
   4 +++ new/hw/pc_piix.c    2013-02-11 12:18:14.000000000 +0100
   5 @@ -294,6 +294,8 @@
   6  }
   7  #endif
   8
   9 +#define KVM_MACHINE_OPTIONS "accel=kvm"
  10 +
  11  static QEMUMachine pc_i440fx_machine_v1_4 = {
  12      .name = "pc-i440fx-1.4",
  13      .alias = "pc",
  14 @@ -301,6 +303,7 @@
  15      .init = pc_init_pci,
  16      .max_cpus = 255,
  17      .is_default = 1,
  18 +    .default_machine_opts = KVM_MACHINE_OPTIONS,
  19      DEFAULT_MACHINE_OPTIONS,
  20  };
  21
  22 @@ -328,6 +331,7 @@
  23          PC_COMPAT_1_3,
  24          { /* end of list */ }
  25      },
  26 +    .default_machine_opts = KVM_MACHINE_OPTIONS,
  27      DEFAULT_MACHINE_OPTIONS,
  28  };
  29
  30 @@ -364,6 +368,7 @@
  31      .desc = "Standard PC",
  32      .init = pc_init_pci_1_2,
  33      .max_cpus = 255,
  34 +    .default_machine_opts = KVM_MACHINE_OPTIONS,
  35      .compat_props = (GlobalProperty[]) {
  36          PC_COMPAT_1_2,
  37          { /* end of list */ }
  38 @@ -408,6 +413,7 @@
  39      .desc = "Standard PC",
  40      .init = pc_init_pci_1_2,
  41      .max_cpus = 255,
  42 +    .default_machine_opts = KVM_MACHINE_OPTIONS,
  43      .compat_props = (GlobalProperty[]) {
  44          PC_COMPAT_1_1,
  45          { /* end of list */ }
  46 @@ -444,6 +450,7 @@
  47      .desc = "Standard PC",
  48      .init = pc_init_pci_1_2,
  49      .max_cpus = 255,
  50 +    .default_machine_opts = KVM_MACHINE_OPTIONS,
  51      .compat_props = (GlobalProperty[]) {
  52          PC_COMPAT_1_0,
  53          { /* end of list */ }
  54 @@ -460,6 +467,7 @@
  55      .desc = "Standard PC",
  56      .init = pc_init_pci_1_2,
  57      .max_cpus = 255,
  58 +    .default_machine_opts = KVM_MACHINE_OPTIONS,
  59      .compat_props = (GlobalProperty[]) {
  60          PC_COMPAT_0_15,
  61          { /* end of list */ }
  62 @@ -493,6 +501,7 @@
  63      .desc = "Standard PC",
  64      .init = pc_init_pci_1_2,
  65      .max_cpus = 255,
  66 +    .default_machine_opts = KVM_MACHINE_OPTIONS,
  67      .compat_props = (GlobalProperty[]) {
  68          PC_COMPAT_0_14,
  69          {
  70 @@ -527,6 +536,7 @@
  71      .desc = "Standard PC",
  72      .init = pc_init_pci_no_kvmclock,
  73      .max_cpus = 255,
  74 +    .default_machine_opts = KVM_MACHINE_OPTIONS,
  75      .compat_props = (GlobalProperty[]) {
  76          PC_COMPAT_0_13,
  77          {
  78 @@ -565,6 +575,7 @@
  79      .desc = "Standard PC",
  80      .init = pc_init_pci_no_kvmclock,
  81      .max_cpus = 255,
  82 +    .default_machine_opts = KVM_MACHINE_OPTIONS,
  83      .compat_props = (GlobalProperty[]) {
  84          PC_COMPAT_0_12,
  85          {
  86 @@ -599,6 +610,7 @@
  87      .desc = "Standard PC, qemu 0.11",
  88      .init = pc_init_pci_no_kvmclock,
  89      .max_cpus = 255,
  90 +    .default_machine_opts = KVM_MACHINE_OPTIONS,
  91      .compat_props = (GlobalProperty[]) {
  92          PC_COMPAT_0_11,
  93          {
  94 @@ -621,6 +633,7 @@
  95      .desc = "Standard PC, qemu 0.10",
  96      .init = pc_init_pci_no_kvmclock,
  97      .max_cpus = 255,
  98 +    .default_machine_opts = KVM_MACHINE_OPTIONS,
  99      .compat_props = (GlobalProperty[]) {
 100          PC_COMPAT_0_11,
 101          {
 102 @@ -655,6 +668,7 @@
 103      .desc = "ISA-only PC",
 104      .init = pc_init_isa,
 105      .max_cpus = 1,
 106 +    .default_machine_opts = KVM_MACHINE_OPTIONS,
 107      .compat_props = (GlobalProperty[]) {
 108          {
 109              .driver   = "pc-sysfw",