Index: xen-4.0.2-testing/Config.mk
===================================================================
--- xen-4.0.2-testing.orig/Config.mk
+++ xen-4.0.2-testing/Config.mk
@@ -165,7 +165,7 @@ endif
 # Specify which qemu-dm to use. This may be `ioemu' to use the old
 # Mercurial in-tree version, or a local directory, or a git URL.
 # CONFIG_QEMU ?= ../qemu-xen.git
-CONFIG_QEMU ?= $(QEMU_REMOTE)
+CONFIG_QEMU ?= ioemu-qemu-xen
 
 QEMU_TAG := xen-4.0.2-rc2
 #QEMU_TAG ?= 6d5b7ee3acfe8cc10681d2583a38398f7470ec2a
@@ -181,9 +181,9 @@ CONFIG_OCAML_XENSTORED ?= n
 # Optional components
 XENSTAT_XENTOP     ?= y
 VTPM_TOOLS         ?= n
-LIBXENAPI_BINDINGS ?= n
+LIBXENAPI_BINDINGS ?= y
 PYTHON_TOOLS       ?= y
 CONFIG_MINITERM    ?= n
 CONFIG_LOMOUNT     ?= n
 
--include $(XEN_ROOT)/.config
+#-include $(XEN_ROOT)/.config
Index: xen-4.0.2-testing/tools/libxc/Makefile
===================================================================
--- xen-4.0.2-testing.orig/tools/libxc/Makefile
+++ xen-4.0.2-testing/tools/libxc/Makefile
@@ -174,7 +174,8 @@ xc_dom_bzimageloader.opic: CFLAGS += $(c
 
 libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(call zlib-options,l)
 libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
-	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $(GUEST_PIC_OBJS) -lz -lxenctrl $(PTHREAD_LIBS) $(call zlib-options,l)
+
 
 -include $(DEPS)