diff -Nru qemu-kvm-1.1~rc+dfsg/debian/changelog qemu-kvm-1.1~rc+dfsg/debian/changelog
--- qemu-kvm-1.1~rc+dfsg/debian/changelog	2012-06-16 02:41:21.000000000 +0000
+++ qemu-kvm-1.1~rc+dfsg/debian/changelog	2012-06-16 13:39:22.000000000 +0000
@@ -1,3 +1,9 @@
+qemu-kvm (1.1~rc+dfsg-1ubuntu1~ppa6) quantal; urgency=low
+
+  * (ppa only) use default_machine_opts in hw/pc_piix.c to make tcg a fallback.
+
+ -- Serge Hallyn <serge.hallyn@ubuntu.com>  Sat, 16 Jun 2012 08:38:58 -0500
+
 qemu-kvm (1.1~rc+dfsg-1ubuntu1~ppa5) quantal; urgency=low
 
   * new build (ppa only) to try and get tcg fallback working.
diff -Nru qemu-kvm-1.1~rc+dfsg/debian/patches/ubuntu/fallback-to-tcg.patch qemu-kvm-1.1~rc+dfsg/debian/patches/ubuntu/fallback-to-tcg.patch
--- qemu-kvm-1.1~rc+dfsg/debian/patches/ubuntu/fallback-to-tcg.patch	2012-06-16 02:41:02.000000000 +0000
+++ qemu-kvm-1.1~rc+dfsg/debian/patches/ubuntu/fallback-to-tcg.patch	2012-06-16 13:38:53.000000000 +0000
@@ -8,19 +8,70 @@
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/qemu-kvm/+bug/892050
 Forwarded: no
 
-Index: qemu-kvm-1.1~rc+dfsg/vl.c
+Index: qemu-kvm-1.1~rc+dfsg/hw/pc_piix.c
 ===================================================================
---- qemu-kvm-1.1~rc+dfsg.orig/vl.c	2012-06-14 10:52:26.000000000 -0500
-+++ qemu-kvm-1.1~rc+dfsg/vl.c	2012-06-15 21:41:00.757987173 -0500
-@@ -2130,7 +2130,11 @@
+--- qemu-kvm-1.1~rc+dfsg.orig/hw/pc_piix.c	2012-05-31 20:19:22.000000000 -0500
++++ qemu-kvm-1.1~rc+dfsg/hw/pc_piix.c	2012-06-16 08:38:52.192519901 -0500
+@@ -362,7 +362,7 @@
+     .init = pc_init_pci,
+     .max_cpus = 255,
+     .is_default = 1,
+-    .default_machine_opts = "accel=kvm,kernel_irqchip=on",
++    .default_machine_opts = "accel=kvm:tcg,kernel_irqchip=on",
+ };
  
-     if (p == NULL) {
-         /* Use the default "accelerator", tcg */
-+#ifdef CONFIG_KVM
-+        p = "kvm:tcg";
-+#else
-         p = "tcg";
-+#endif
-     }
- 
-     while (!accel_initialised && *p != '\0') {
+ #define PC_COMPAT_1_0 \
+@@ -438,7 +438,7 @@
+     .desc = "Standard PC",
+     .init = pc_init_pci,
+     .max_cpus = 255,
+-    .default_machine_opts = "accel=kvm,kernel_irqchip=on",
++    .default_machine_opts = "accel=kvm:tcg,kernel_irqchip=on",
+     .compat_props = (GlobalProperty[]) {
+         PC_COMPAT_0_14, 
+         {
+@@ -471,7 +471,7 @@
+     .desc = "Standard PC",
+     .init = pc_init_pci_no_kvmclock,
+     .max_cpus = 255,
+-    .default_machine_opts = "accel=kvm,kernel_irqchip=on",
++    .default_machine_opts = "accel=kvm:tcg,kernel_irqchip=on",
+     .compat_props = (GlobalProperty[]) {
+         PC_COMPAT_0_13,
+         {
+@@ -508,7 +508,7 @@
+     .desc = "Standard PC",
+     .init = pc_init_pci_no_kvmclock,
+     .max_cpus = 255,
+-    .default_machine_opts = "accel=kvm,kernel_irqchip=on",
++    .default_machine_opts = "accel=kvm:tcg,kernel_irqchip=on",
+     .compat_props = (GlobalProperty[]) {
+         PC_COMPAT_0_12,
+         {
+@@ -541,7 +541,7 @@
+     .desc = "Standard PC, qemu 0.11",
+     .init = pc_init_pci_no_kvmclock,
+     .max_cpus = 255,
+-    .default_machine_opts = "accel=kvm,kernel_irqchip=on",
++    .default_machine_opts = "accel=kvm:tcg,kernel_irqchip=on",
+     .compat_props = (GlobalProperty[]) {
+         PC_COMPAT_0_11,
+         {
+@@ -562,7 +562,7 @@
+     .desc = "Standard PC, qemu 0.10",
+     .init = pc_init_pci_no_kvmclock,
+     .max_cpus = 255,
+-    .default_machine_opts = "accel=kvm,kernel_irqchip=on",
++    .default_machine_opts = "accel=kvm:tcg,kernel_irqchip=on",
+     .compat_props = (GlobalProperty[]) {
+         PC_COMPAT_0_11,
+         {
+@@ -595,7 +595,7 @@
+     .desc = "ISA-only PC",
+     .init = pc_init_isa,
+     .max_cpus = 1,
+-    .default_machine_opts = "accel=kvm,kernel_irqchip=on",
++    .default_machine_opts = "accel=kvm:tcg,kernel_irqchip=on",
+     .compat_props = (GlobalProperty[]) {
+         {
+             .driver   = "pc-sysfw",