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

   1 Index: new/hw/pc_piix.c
   2 ===================================================================
   3 --- new.orig/hw/pc_piix.c       2012-11-22 10:10:56.000000000 +0100
   4 +++ new/hw/pc_piix.c    2012-11-22 10:16:29.000000000 +0100
   5 @@ -352,6 +352,8 @@
   6  }
   7  #endif
   8
   9 +#define KVM_MACHINE_OPTIONS "accel=kvm"
  10 +
  11  static QEMUMachine pc_machine_v1_3 = {
  12      .name = "pc-1.3",
  13      .alias = "pc",
  14 @@ -359,6 +361,7 @@
  15      .init = pc_init_pci_1_3,
  16      .max_cpus = 255,
  17      .is_default = 1,
  18 +    .default_machine_opts = KVM_MACHINE_OPTIONS,
  19  };
  20
  21  #define PC_COMPAT_1_2 \
  22 @@ -393,6 +396,7 @@
  23      .desc = "Standard PC",
  24      .init = pc_init_pci,
  25      .max_cpus = 255,
  26 +    .default_machine_opts = KVM_MACHINE_OPTIONS,
  27      .compat_props = (GlobalProperty[]) {
  28          PC_COMPAT_1_2,
  29          { /* end of list */ }
  30 @@ -436,6 +440,7 @@
  31      .desc = "Standard PC",
  32      .init = pc_init_pci,
  33      .max_cpus = 255,
  34 +    .default_machine_opts = KVM_MACHINE_OPTIONS,
  35      .compat_props = (GlobalProperty[]) {
  36          PC_COMPAT_1_1,
  37          { /* end of list */ }
  38 @@ -471,6 +476,7 @@
  39      .desc = "Standard PC",
  40      .init = pc_init_pci,
  41      .max_cpus = 255,
  42 +    .default_machine_opts = KVM_MACHINE_OPTIONS,
  43      .compat_props = (GlobalProperty[]) {
  44          PC_COMPAT_1_0,
  45          { /* end of list */ }
  46 @@ -486,6 +492,7 @@
  47      .desc = "Standard PC",
  48      .init = pc_init_pci,
  49      .max_cpus = 255,
  50 +    .default_machine_opts = KVM_MACHINE_OPTIONS,
  51      .compat_props = (GlobalProperty[]) {
  52          PC_COMPAT_0_15,
  53          { /* end of list */ }
  54 @@ -518,6 +525,7 @@
  55      .desc = "Standard PC",
  56      .init = pc_init_pci,
  57      .max_cpus = 255,
  58 +    .default_machine_opts = KVM_MACHINE_OPTIONS,
  59      .compat_props = (GlobalProperty[]) {
  60          PC_COMPAT_0_14,
  61          {
  62 @@ -551,6 +559,7 @@
  63      .desc = "Standard PC",
  64      .init = pc_init_pci_no_kvmclock,
  65      .max_cpus = 255,
  66 +    .default_machine_opts = KVM_MACHINE_OPTIONS,
  67      .compat_props = (GlobalProperty[]) {
  68          PC_COMPAT_0_13,
  69          {
  70 @@ -588,6 +597,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_12,
  77          {
  78 @@ -621,6 +631,7 @@
  79      .desc = "Standard PC, qemu 0.11",
  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_11,
  85          {
  86 @@ -642,6 +653,7 @@
  87      .desc = "Standard PC, qemu 0.10",
  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 @@ -675,6 +687,7 @@
  95      .desc = "ISA-only PC",
  96      .init = pc_init_isa,
  97      .max_cpus = 1,
  98 +    .default_machine_opts = KVM_MACHINE_OPTIONS,
  99      .compat_props = (GlobalProperty[]) {
 100          {
 101              .driver   = "pc-sysfw",