0c76f22ef1
- bnc#633573 - System fail to boot after running several warm reboot tests 22749-vtd-workarounds.patch - Upstream patches from Jan 22744-ept-pod-locking.patch 22777-vtd-ats-fixes.patch 22781-pod-hap-logdirty.patch 22782-x86-emul-smsw.patch 22789-i386-no-x2apic.patch 22790-svm-resume-migrate-pirqs.patch 22816-x86-pirq-drop-priv-check.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=94
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
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-rc1
|
|
#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
|
|
@@ -169,10 +169,10 @@ zlib-options = $(shell \
|
|
fi) | grep $(1))
|
|
endif
|
|
|
|
-xc_dom_bzimageloader.o: CFLAGS += $(call zlib-options,D)
|
|
-xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D)
|
|
+#xc_dom_bzimageloader.o: CFLAGS += $(call zlib-options,D)
|
|
+#xc_dom_bzimageloader.opic: CFLAGS += $(call zlib-options,D)
|
|
|
|
-libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(call zlib-options,l)
|
|
+#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)
|
|
|