Pkg xen devel - Jul 2009 - Bug#536175: Bug#536175: Bug#536176: xen-utils-3.4: trying xen-3.4 once breaks xen-3.2 (?)

Here is a patch to the Debian xen-3 3.4.0-1 package that reenables ioemu.  
I have been using it for the last four weeks.  (I understand there are 
reasons this cannot go into Debian yet, but hopefully it will be useful to 
people that depend on running HVMs today.)

Anders
-------------- next part --------------
--- xen-3/debian/changelog
+++ xen-3/debian/changelog
@@ -1,3 +1,10 @@
+xen-3 (3.4.0-1andersk1) unstable; urgency=low
+
+  * Remove config-ioemu-disable.patch.
+  * Fix qemu-dm rpath.
+
+ -- Anders Kaseorg <andersk at ksplice.com>  Sun, 14 Jun 2009 17:21:45
-0400
+
 xen-3 (3.4.0-1) unstable; urgency=low
 
   [ Bastian Blank ]
--- xen-3/debian/patches/series
+++ xen-3/debian/patches/series
@@ -5,6 +5,7 @@ tools-blktap-prefix.diff
 tools-console-prefix.diff
 tools-firmware-prefix.diff
 tools-flask-prefix.diff
+tools-ioemu-prefix.diff
 tools-libfsimage-prefix.diff
 tools-libxc-prefix.diff
 tools-misc-prefix.diff
@@ -18,6 +19,7 @@ tools-xentrace-prefix.diff
 tools-rpath.diff
 tools-blktap-rpath.diff
 tools-console-rpath.diff
+tools-ioemu-rpath.diff
 tools-libfsimage-rpath.diff
 tools-libxc-rpath.diff
 tools-misc-rpath.diff
@@ -35,8 +37,7 @@ tools-libfsimage-abiname.diff
 tools-libxc-abiname.diff
 
 tools-python-xen-xm-relative-path.diff
+tools-ioemu-config.diff
 tools-misc-xend-startup.diff
 
-config-ioemu-disable.diff
-
 tools-blktap-crypto.patch
--- /dev/null
+++ xen-3/debian/patches/tools-ioemu-config.diff
@@ -0,0 +1,13 @@
+--- tools/ioemu-qemu-xen/xen-config-host.h
++++ tools/ioemu-qemu-xen/xen-config-host.h
+@@ -32,8 +32,8 @@
+ extern int xen_pause_requested;
+ extern int vcpus;
+ 
+-#define DEFAULT_NETWORK_SCRIPT "/etc/xen/qemu-ifup"
+-#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/xen/qemu-ifdown"
++#define DEFAULT_NETWORK_SCRIPT "/etc/xen/scripts/qemu-ifup"
++#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/xen/scripts/qemu-ifdown"
+ 
+ #ifdef CONFIG_STUBDOM
+ #define bdrv_host_device bdrv_raw
--- /dev/null
+++ xen-3/debian/patches/tools-ioemu-prefix.diff
@@ -0,0 +1,26 @@
+--- tools/ioemu-qemu-xen/xen-hooks.mak
++++ tools/ioemu-qemu-xen/xen-hooks.mak
+@@ -74,8 +74,9 @@
+ 
+ EXESUF=-xen
+ 
+-datadir := $(subst qemu,xen/qemu,$(datadir))
+-docdir :=  $(subst qemu,xen/qemu,$(docdir))
+-mandir :=  $(subst share/man,share/xen/man,$(mandir))
++bindir := /usr/lib/xen-3.4/bin
++datadir := $(subst qemu,xen-3.4/qemu,$(datadir))
++docdir :=  $(subst qemu,xen-3.4/qemu,$(docdir))
++mandir :=  $(subst share/man,share/xen-3.4/man,$(mandir))
+ 
+ configdir := /etc/xen
+--- tools/ioemu-qemu-xen/xen-setup-stubdom
++++ tools/ioemu-qemu-xen/xen-setup-stubdom
+@@ -31,7 +31,7 @@
+ 
+ #----------
+ cat <<END >config-host.h.new
+-#define CONFIG_QEMU_SHAREDIR "/usr/share/xen/qemu"
++#define CONFIG_QEMU_SHAREDIR "/usr/share/xen-3.4/qemu"
+ #define HOST_I386 1
+ #define HOST_LONG_BITS 32
+ #define HAVE_BYTESWAP_H 1
--- /dev/null
+++ xen-3/debian/patches/tools-ioemu-rpath.diff
@@ -0,0 +1,11 @@
+--- tools/ioemu-qemu-xen/Makefile.target
++++ tools/ioemu-qemu-xen/Makefile.target
+@@ -720,6 +720,8 @@
+ LDFLAGS+=-Wl,-G0 -Wl,-T,$(SRC_PATH)/ia64.ld
+ endif
+ 
++LDFLAGS+=$(call LDFLAGS_RPATH,../lib)
++
+ ifdef CONFIG_WIN32
+ SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole
+ endif
--- xen-3/debian/rules.real
+++ xen-3/debian/rules.real
@@ -157,6 +157,7 @@ install-utils_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH)
 	install -D -m644 debian/xen-utils.README.Debian
$(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/README.Debian
 	install -D -m644 debian/xen-utils-$(VERSION)$(ABINAME).lintian-overrides
$(PACKAGE_DIR)/usr/share/lintian/overrides/$(PACKAGE_NAME)
 	dh_install --sourcedir=$(DIR) usr/lib/xen-$(VERSION)$(ABINAME)
+	dh_install --sourcedir=$(DIR) usr/share/xen-$(VERSION)$(ABINAME)
 	dh_pycentral usr/lib/xen-$(VERSION)$(ABINAME)
 	dh_strip
 	dh_makeshlibs