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-07-11 17:19:22.000000000 -0500
+++ qemu-kvm-1.1~rc+dfsg/debian/changelog	2012-07-25 07:32:50.000000000 -0500
@@ -1,3 +1,13 @@
+qemu-kvm (1.1~rc+dfsg-1ubuntu9) quantal; urgency=low
+
+  * enable vde.  Patch configure to allow vde to be detected.  (LP: #253230)
+    NOT FOR PRODUCTION until vde MIR is complete.
+    - debian/control: re-add libvdeplug-dev to build-deps and vde2 to suggests
+    - configure: cast "" passed to vde_open args 1 and to to (char *)
+    - debian/optional-features: uncomment --enable-vde
+
+ -- Serge Hallyn <serge.hallyn@ubuntu.com>  Wed, 25 Jul 2012 07:30:08 -0500
+
 qemu-kvm (1.1~rc+dfsg-1ubuntu8) quantal; urgency=low
 
   * debian/qemu-kvm.upstart: don't fail if the kernel modules are not
diff -Nru qemu-kvm-1.1~rc+dfsg/debian/control qemu-kvm-1.1~rc+dfsg/debian/control
--- qemu-kvm-1.1~rc+dfsg/debian/control	2012-06-27 23:47:38.000000000 -0500
+++ qemu-kvm-1.1~rc+dfsg/debian/control	2012-07-25 07:33:07.000000000 -0500
@@ -22,6 +22,7 @@
  librados-dev, librbd-dev,
  libsasl2-dev,
  libsdl1.2-dev,
+ libvdeplug-dev | libvdeplug2-dev,
  linux-libc-dev (>= 2.6.32),
  uuid-dev,
  xfslibs-dev,
@@ -40,7 +41,7 @@
  seabios (>> 1.7.0~), vgabios (>= 0.6c-3~),
  qemu-utils (>= ${source:Version}), qemu-common (>= ${source:Version})
 Recommends: bridge-utils, iproute
-Suggests: debootstrap, samba
+Suggests: debootstrap, vde2, samba
 Provides: kvm, qemu
 Conflicts: kvm-source (<= 18-1), kvm-data (<= 66+dfsg-1.1), kvm (<< 1:0)
 Breaks: libvirt0 (<< 0.9.8-2~)
diff -Nru qemu-kvm-1.1~rc+dfsg/debian/optional-features qemu-kvm-1.1~rc+dfsg/debian/optional-features
--- qemu-kvm-1.1~rc+dfsg/debian/optional-features	2012-06-20 09:53:48.000000000 -0500
+++ qemu-kvm-1.1~rc+dfsg/debian/optional-features	2012-07-25 07:30:05.000000000 -0500
@@ -40,7 +40,7 @@
 #--enable-usb-redir
 --disable-usb-redir
 # libvde, virtual network switch
-#--enable-vde
+--enable-vde
 # /dev/vhost-net
 --enable-vhost-net
 # VirtFS - XXX description please
diff -Nru qemu-kvm-1.1~rc+dfsg/debian/patches/enable-vde qemu-kvm-1.1~rc+dfsg/debian/patches/enable-vde
--- qemu-kvm-1.1~rc+dfsg/debian/patches/enable-vde	1969-12-31 18:00:00.000000000 -0600
+++ qemu-kvm-1.1~rc+dfsg/debian/patches/enable-vde	2012-07-25 07:35:42.000000000 -0500
@@ -0,0 +1,19 @@
+Description: update configure to cast "" to (char *) when calling vde_open.
+ Otherwise compilation fails because vde_open is getting const char *, and
+ vde support is not detected.
+Author: Serge Hallyn <serge.hallyn@ubuntu.com>
+Forwarded: no
+
+Index: qemu-kvm-1.1~rc+dfsg/configure
+===================================================================
+--- qemu-kvm-1.1~rc+dfsg.orig/configure	2012-07-25 07:34:47.959015687 -0500
++++ qemu-kvm-1.1~rc+dfsg/configure	2012-07-25 07:34:53.615052801 -0500
+@@ -1804,7 +1804,7 @@
+ int main(void)
+ {
+     struct vde_open_args a = {0, 0, 0};
+-    vde_open("", "", &a);
++    vde_open((char *)"", (char *)"", &a);
+     return 0;
+ }
+ EOF
diff -Nru qemu-kvm-1.1~rc+dfsg/debian/patches/series qemu-kvm-1.1~rc+dfsg/debian/patches/series
--- qemu-kvm-1.1~rc+dfsg/debian/patches/series	2012-06-28 20:31:35.000000000 -0500
+++ qemu-kvm-1.1~rc+dfsg/debian/patches/series	2012-07-25 07:29:16.000000000 -0500
@@ -14,3 +14,4 @@
 ubuntu/99-allow-loading-u-boot-initrd-images.patch
 ubuntu/99-increase-u-boot-gunzip-size.patch
 ubuntu/99-ppc-increase-usability-of-ppce500-pci.patch
+enable-vde