xen/xen-config.diff
Charles Arnold a9bb3bc2f5 -Fix bnc#466899 - numa enabled xen fails to start/create vms
adjust_vcpuaffinity_more_cpu.patch 

- Update to changeset 21022 Xen 4.0.0 RC6.

- bnc#586510 - cpupool fixes
  cpu-pools-update.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=35
2010-03-19 17:16:56 +00:00

44 lines
1.7 KiB
Diff

Index: xen-4.0.0-testing/Config.mk
===================================================================
--- xen-4.0.0-testing.orig/Config.mk
+++ xen-4.0.0-testing/Config.mk
@@ -151,7 +151,7 @@ QEMU_REMOTE=http://xenbits.xensource.com
# 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-remote
QEMU_TAG := xen-4.0.0-rc6
#QEMU_TAG ?= e5d14857cd67490bf956d97c8888c0be95ed3f78
@@ -167,9 +167,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.0-testing/tools/libxc/Makefile
===================================================================
--- xen-4.0.0-testing.orig/tools/libxc/Makefile
+++ xen-4.0.0-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)