Group :: Emulators
RPM: xen
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: xen-3.2.1-alt.patch
Download
Download
Config.mk | 4 ++--
tools/blktap/drivers/Makefile | 8 ++++----
tools/blktap/lib/Makefile | 6 +++---
tools/console/Makefile | 2 +-
tools/examples/90-xen-backend.rules | 8 ++++++++
tools/examples/Makefile | 13 +++++++------
tools/examples/init.d/xendomains | 26 --------------------------
tools/examples/xen-backend.rules | 8 --------
tools/examples/xmexample1 | 3 +--
tools/flask/libflask/Makefile | 4 ++--
tools/ioemu/Makefile.target | 2 +-
tools/libaio/harness/Makefile | 2 +-
tools/libfsimage/common/Makefile | 4 ++--
tools/libxc/Makefile | 2 +-
tools/libxen/Makefile | 4 ++--
tools/libxen/Makefile.dist | 2 +-
tools/misc/Makefile | 2 +-
tools/misc/lomount/Makefile | 2 +-
tools/security/Makefile | 2 +-
tools/xcutils/Makefile | 2 +-
tools/xenmon/Makefile | 6 +++---
tools/xenstat/libxenstat/Makefile | 2 +-
tools/xenstat/xentop/Makefile | 2 +-
tools/xenstore/Makefile | 2 +-
tools/xentrace/Makefile | 2 +-
xen/arch/x86/Rules.mk | 2 +-
26 files changed, 48 insertions(+), 74 deletions(-)
diff --git a/Config.mk b/Config.mk
index 01644b1..2f9cb36 100644
--- a/Config.mk
+++ b/Config.mk
@@ -19,7 +19,7 @@ SHELL ?= /bin/sh
# Tools to run on system hosting the build
HOSTCC = gcc
-HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
+HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
HOSTCFLAGS += -fno-strict-aliasing
HOSTCFLAGS_x86_32 = -m32
HOSTCFLAGS_x86_64 = -m64
@@ -88,7 +88,7 @@ ACM_SECURITY ?= n
# Optional components
XENSTAT_XENTOP ?= y
VTPM_TOOLS ?= n
-LIBXENAPI_BINDINGS ?= n
+LIBXENAPI_BINDINGS ?= y
PYTHON_TOOLS ?= y
-include $(XEN_ROOT)/.config
diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile
index fca48b6..d8b316e 100644
--- a/tools/blktap/drivers/Makefile
+++ b/tools/blktap/drivers/Makefile
@@ -8,7 +8,7 @@ QCOW_UTIL = img2qcow qcow2raw qcow-create
INST_DIR = /usr/sbin
LIBAIO_DIR = ../../libaio/src
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += -Wno-unused
CFLAGS += -I $(XEN_LIBXC) -I $(LIBAIO_DIR)
CFLAGS += $(INCLUDES) -I. -I../../xenstore
@@ -39,17 +39,17 @@ BLK-OBJS += tapaio.o
all: $(IBIN) qcow-util
blktapctrl: blktapctrl.c
- $(CC) $(CFLAGS) -o blktapctrl $(LIBS) blktapctrl.c
+ $(CC) $(CFLAGS) -o blktapctrl blktapctrl.c $(LIBS)
tapdisk: $(BLK-OBJS) tapdisk.c
$(CC) $(CFLAGS) -o tapdisk $(BLK-OBJS) tapdisk.c \
- $(AIOLIBS) $(LIBS)
+ $(AIOLIBS) $(LIBS) -lpthread
.PHONY: qcow-util
qcow-util: img2qcow qcow2raw qcow-create
img2qcow qcow2raw qcow-create: %: $(BLK-OBJS)
- $(CC) $(CFLAGS) -o $* $(BLK-OBJS) $*.c $(AIOLIBS) $(LIBS)
+ $(CC) $(CFLAGS) -o $* $(BLK-OBJS) $*.c $(AIOLIBS) $(LIBS) -lpthread
install: all
$(INSTALL_PROG) $(IBIN) $(QCOW_UTIL) $(VHD_UTIL) $(DESTDIR)$(INST_DIR)
diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile
index f5621e1..099023f 100644
--- a/tools/blktap/lib/Makefile
+++ b/tools/blktap/lib/Makefile
@@ -14,7 +14,7 @@ LIBS := -lz
SRCS :=
SRCS += xenbus.c blkif.c xs_api.c
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += -Wno-unused
CFLAGS += -fPIC
# get asprintf():
@@ -52,8 +52,8 @@ clean:
libblktap.a: $(OBJS)
$(CC) $(CFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,$(SONAME) $(SHLIB_CFLAGS) \
- -L$(XEN_XENSTORE) -l xenstore \
- -o libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS)
+ -L$(XEN_XENSTORE) \
+ -o libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS) -l xenstore -ldl
ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR)
ln -sf libblktap.so.$(MAJOR) libblktap.so
$(AR) rc $@ libblktap.so
diff --git a/tools/console/Makefile b/tools/console/Makefile
index 445819e..991b5b6 100644
--- a/tools/console/Makefile
+++ b/tools/console/Makefile
@@ -5,7 +5,7 @@ include $(XEN_ROOT)/tools/Rules.mk
DAEMON_INSTALL_DIR = /usr/sbin
CLIENT_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += -I $(XEN_LIBXC)
CFLAGS += -I $(XEN_XENSTORE)
diff --git a/tools/examples/90-xen-backend.rules b/tools/examples/90-xen-backend.rules
new file mode 100644
index 0000000..33064ac
--- /dev/null
+++ b/tools/examples/90-xen-backend.rules
@@ -0,0 +1,8 @@
+SUBSYSTEM=="xen-backend", KERNEL=="tap*", RUN+="/etc/xen/scripts/blktap $env{ACTION}"
+SUBSYSTEM=="xen-backend", KERNEL=="vbd*", RUN+="/etc/xen/scripts/block $env{ACTION}"
+SUBSYSTEM=="xen-backend", KERNEL=="vtpm*", RUN+="/etc/xen/scripts/vtpm $env{ACTION}"
+SUBSYSTEM=="xen-backend", KERNEL=="vif*", ACTION=="online", RUN+="$env{script} online"
+SUBSYSTEM=="xen-backend", KERNEL=="vif*", ACTION=="offline", RUN+="$env{script} offline"
+SUBSYSTEM=="xen-backend", ACTION=="remove", RUN+="/etc/xen/scripts/xen-hotplug-cleanup"
+KERNEL=="evtchn", NAME="xen/%k"
+KERNEL=="blktap[0-9]*", NAME="xen/%k"
diff --git a/tools/examples/Makefile b/tools/examples/Makefile
index 328b3b2..4d8a6be 100644
--- a/tools/examples/Makefile
+++ b/tools/examples/Makefile
@@ -14,8 +14,10 @@ XEN_CONFIGS += xm-config.xml
XEN_CONFIGS += xm-config-xenapi.xml
XEN_CONFIGS += xmexample1
XEN_CONFIGS += xmexample2
+XEN_CONFIGS += xmexample3
XEN_CONFIGS += xmexample.hvm
XEN_CONFIGS += xmexample.vti
+XEN_CONFIGS += xmexample.nbd
XEN_CONFIGS += xend-pci-quirks.sxp
XEN_CONFIGS += xend-pci-permissive.sxp
@@ -39,7 +41,7 @@ XEN_HOTPLUG_DIR = /etc/hotplug
XEN_HOTPLUG_SCRIPTS = xen-backend.agent
UDEV_RULES_DIR = /etc/udev
-UDEV_RULES = xen-backend.rules
+UDEV_RULES = 90-xen-backend.rules
DI = $(if $(DISTDIR),$(shell readlink -f $(DISTDIR)),)
DE = $(if $(DESTDIR),$(shell readlink -f $(DESTDIR)),)
@@ -64,10 +66,10 @@ install: all install-initd install-configs install-scripts $(HOTPLUGS)
.PHONY: install-initd
install-initd:
- [ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d
+ [ -d $(DESTDIR)/etc/rc.d/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/rc.d/init.d
[ -d $(DESTDIR)/etc/sysconfig ] || $(INSTALL_DIR) $(DESTDIR)/etc/sysconfig
- $(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)/etc/init.d
- $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)/etc/init.d
+ $(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)/etc/rc.d/init.d
+ $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)/etc/rc.d/init.d
$(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)/etc/sysconfig/xendomains
.PHONY: install-configs
@@ -109,8 +111,7 @@ install-udev:
$(INSTALL_DIR) $(DESTDIR)$(UDEV_RULES_DIR)/rules.d
set -e; for i in $(UDEV_RULES); \
do \
- $(INSTALL_DATA) $$i $(DESTDIR)$(UDEV_RULES_DIR); \
- ln -sf ../$$i $(DESTDIR)$(UDEV_RULES_DIR)/rules.d; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(UDEV_RULES_DIR)/rules.d; \
done
.PHONY: clean
diff --git a/tools/examples/init.d/xendomains b/tools/examples/init.d/xendomains
index 987f994..04a2522 100644
--- a/tools/examples/init.d/xendomains
+++ b/tools/examples/init.d/xendomains
@@ -43,12 +43,6 @@ test -r $XENDOM_CONFIG || { echo "$XENDOM_CONFIG not existing";
. $XENDOM_CONFIG
-# Use the SUSE rc_ init script functions;
-# emulate them on LSB, RH and other systems
-if test -e /etc/rc.status; then
- # SUSE rc script library
- . /etc/rc.status
-else
_cmd=$1
declare -a _SMSG
if test "${_cmd}" = "status"; then
@@ -70,24 +64,6 @@ else
failure " [${_SMSG[${_RC_RV}]}] "
fi
}
- elif test -e /lib/lsb/init-functions; then
- # LSB
- . /lib/lsb/init-functions
- if alias log_success_msg >/dev/null 2>/dev/null; then
- echo_rc()
- {
- echo " [${_SMSG[${_RC_RV}]}] "
- }
- else
- echo_rc()
- {
- if test ${_RC_RV} = 0; then
- log_success_msg " [${_SMSG[${_RC_RV}]}] "
- else
- log_failure_msg " [${_SMSG[${_RC_RV}]}] "
- fi
- }
- fi
else
# emulate it
echo_rc()
@@ -126,8 +102,6 @@ else
if test -e /etc/init.d/S[0-9][0-9]${1}; then return 0; fi
return 1
}
-fi
-
if ! which usleep >&/dev/null
then
usleep()
diff --git a/tools/examples/xen-backend.rules b/tools/examples/xen-backend.rules
deleted file mode 100644
index 33064ac..0000000
--- a/tools/examples/xen-backend.rules
+++ /dev/null
@@ -1,8 +0,0 @@
-SUBSYSTEM=="xen-backend", KERNEL=="tap*", RUN+="/etc/xen/scripts/blktap $env{ACTION}"
-SUBSYSTEM=="xen-backend", KERNEL=="vbd*", RUN+="/etc/xen/scripts/block $env{ACTION}"
-SUBSYSTEM=="xen-backend", KERNEL=="vtpm*", RUN+="/etc/xen/scripts/vtpm $env{ACTION}"
-SUBSYSTEM=="xen-backend", KERNEL=="vif*", ACTION=="online", RUN+="$env{script} online"
-SUBSYSTEM=="xen-backend", KERNEL=="vif*", ACTION=="offline", RUN+="$env{script} offline"
-SUBSYSTEM=="xen-backend", ACTION=="remove", RUN+="/etc/xen/scripts/xen-hotplug-cleanup"
-KERNEL=="evtchn", NAME="xen/%k"
-KERNEL=="blktap[0-9]*", NAME="xen/%k"
diff --git a/tools/examples/xmexample1 b/tools/examples/xmexample1
index fc17ca8..2705997 100644
--- a/tools/examples/xmexample1
+++ b/tools/examples/xmexample1
@@ -139,8 +139,7 @@ root = "/dev/hda1 ro"
# Root directory on the nfs server.
#nfs_root = '/full/path/to/root/directory'
-# Sets runlevel 4.
-extra = "4"
+extra = "xencons=tty"
#----------------------------------------------------------------------------
# Configure the behaviour when a domain exits. There are three 'reasons'
diff --git a/tools/flask/libflask/Makefile b/tools/flask/libflask/Makefile
index a29411f..0731773 100644
--- a/tools/flask/libflask/Makefile
+++ b/tools/flask/libflask/Makefile
@@ -15,7 +15,7 @@ CFLAGS += $(INCLUDES) -I./include -I$(XEN_LIBXC)
# Get gcc to generate the dependencies for us.
CFLAGS += -Wp,-MD,.$(@F).d
-LDFLAGS += -L.
+LDFLAGS += -L. -L../../libxc
DEPS = .*.d
LIB_OBJS := $(patsubst %.c,%.o,$(SRCS))
@@ -60,6 +60,6 @@ libflask.so.$(MAJOR): libflask.so.$(MAJOR).$(MINOR)
ln -sf $< $@
libflask.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libflask.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^
+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libflask.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ -lxenctrl
-include $(DEPS)
diff --git a/tools/ioemu/Makefile.target b/tools/ioemu/Makefile.target
index 422aab1..05d3d23 100644
--- a/tools/ioemu/Makefile.target
+++ b/tools/ioemu/Makefile.target
@@ -640,5 +640,5 @@ endif
ifeq (1, 0)
audio.o sdlaudio.o dsoundaudio.o ossaudio.o wavaudio.o noaudio.o \
fmodaudio.o alsaaudio.o mixeng.o sb16.o es1370.o gus.o adlib.o: \
-CFLAGS := $(CFLAGS) -Wall -Werror -W -Wsign-compare
+CFLAGS := $(CFLAGS) -Wall -W -Wsign-compare
endif
diff --git a/tools/libaio/harness/Makefile b/tools/libaio/harness/Makefile
index d2483fd..cde5adc 100644
--- a/tools/libaio/harness/Makefile
+++ b/tools/libaio/harness/Makefile
@@ -4,7 +4,7 @@ PROGS:=$(patsubst %.t,%.p,$(TEST_SRCS))
HARNESS_SRCS:=main.c
# io_queue.c
-CFLAGS=-Wall -Werror -g -O -laio
+CFLAGS=-Wall -g -O -laio
#-lpthread -lrt
all: $(PROGS)
diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
index 5c22fa9..fb989de 100644
--- a/tools/libfsimage/common/Makefile
+++ b/tools/libfsimage/common/Makefile
@@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk
MAJOR = 1.0
MINOR = 0
-CFLAGS += -Werror -Wp,-MD,.$(@F).d
+CFLAGS += -Wp,-MD,.$(@F).d
DEPS = .*.d
LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
@@ -40,7 +40,7 @@ libfsimage.so.$(MAJOR): libfsimage.so.$(MAJOR).$(MINOR)
ln -sf $< $@
libfsimage.so.$(MAJOR).$(MINOR): $(PIC_OBJS)
- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libfsimage.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ -lpthread
+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libfsimage.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ -lpthread -ldl
-include $(DEPS)
diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 618b371..c48ee8f 100644
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -58,7 +58,7 @@ GUEST_SRCS-$(CONFIG_POWERPC) += xc_dom_powerpc.c
-include $(XEN_TARGET_ARCH)/Makefile
-CFLAGS += -Werror -Wmissing-prototypes
+CFLAGS += -Wmissing-prototypes
CFLAGS += $(INCLUDES) -I. -I../xenstore
# Needed for posix_fadvise64() in xc_linux.c
diff --git a/tools/libxen/Makefile b/tools/libxen/Makefile
index db7be23..34bf38b 100644
--- a/tools/libxen/Makefile
+++ b/tools/libxen/Makefile
@@ -24,7 +24,7 @@ MINOR = 0
CFLAGS = -Iinclude \
$(shell xml2-config --cflags) \
$(shell curl-config --cflags) \
- -W -Wall -Wmissing-prototypes -Werror -std=c99 -O2 -fPIC
+ -W -Wall -Wmissing-prototypes -std=c99 -O2 -fPIC
LDFLAGS = $(shell xml2-config --libs) \
$(shell curl-config --libs)
@@ -44,7 +44,7 @@ libxenapi.so.$(MAJOR): libxenapi.so.$(MAJOR).$(MINOR)
ln -sf $< $@
libxenapi.so.$(MAJOR).$(MINOR): $(LIBXENAPI_OBJS)
- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenapi.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^
+ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenapi.so.$(MAJOR) $(SHLIB_CFLAGS) -o $@ $^ -lxml2
libxenapi.a: $(LIBXENAPI_OBJS)
$(AR) rcs libxenapi.a $^
diff --git a/tools/libxen/Makefile.dist b/tools/libxen/Makefile.dist
index 0f4a8db..e6ba4f1 100644
--- a/tools/libxen/Makefile.dist
+++ b/tools/libxen/Makefile.dist
@@ -22,7 +22,7 @@ MINOR = 0
CFLAGS = -Iinclude \
$(shell xml2-config --cflags) \
$(shell curl-config --cflags) \
- -W -Wall -Wmissing-prototypes -Werror -std=c99 -O2 -fPIC
+ -W -Wall -Wmissing-prototypes -std=c99 -O2 -fPIC
LDFLAGS = $(shell xml2-config --libs) \
$(shell curl-config --libs)
diff --git a/tools/misc/Makefile b/tools/misc/Makefile
index ee81fe3..5c707c7 100644
--- a/tools/misc/Makefile
+++ b/tools/misc/Makefile
@@ -1,7 +1,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror
+CFLAGS +=
INCLUDES += -I $(XEN_XC)
INCLUDES += -I $(XEN_LIBXC)
diff --git a/tools/misc/lomount/Makefile b/tools/misc/lomount/Makefile
index 04c928d..8d67c2b 100644
--- a/tools/misc/lomount/Makefile
+++ b/tools/misc/lomount/Makefile
@@ -1,7 +1,7 @@
XEN_ROOT=../../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror
+CFLAGS +=
HDRS = $(wildcard *.h)
OBJS = $(patsubst %.c,%.o,$(wildcard *.c))
diff --git a/tools/security/Makefile b/tools/security/Makefile
index 4ba944b..3bea887 100644
--- a/tools/security/Makefile
+++ b/tools/security/Makefile
@@ -1,7 +1,7 @@
XEN_ROOT = ../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += -fno-strict-aliasing
CFLAGS += -I. -I $(XEN_LIBXC)
diff --git a/tools/xcutils/Makefile b/tools/xcutils/Makefile
index df7ee86..f6c806c 100644
--- a/tools/xcutils/Makefile
+++ b/tools/xcutils/Makefile
@@ -15,7 +15,7 @@ PROGRAMS_INSTALL_DIR = /usr/$(LIBDIR)/xen/bin
INCLUDES += -I $(XEN_LIBXC) -I $(XEN_XENSTORE)
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += $(INCLUDES)
# Make gcc generate dependencies.
diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile
index c1f4cd3..8301b45 100644
--- a/tools/xenmon/Makefile
+++ b/tools/xenmon/Makefile
@@ -15,7 +15,7 @@ include $(XEN_ROOT)/tools/Rules.mk
sbindir=/usr/sbin
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += -I $(XEN_XC)
CFLAGS += -I $(XEN_LIBXC)
LDFLAGS += -L $(XEN_LIBXC)
@@ -42,6 +42,6 @@ clean:
%: %.c Makefile
- $(CC) $(CFLAGS) $(LDFLAGS) -lxenctrl -o $@ $<
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lxenctrl
xentrace_%: %.c Makefile
- $(CC) $(CFLAGS) $(LDFLAGS) -lxenctrl -o $@ $<
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lxenctrl
diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile
index 69cbf2f..91fe326 100644
--- a/tools/xenstat/libxenstat/Makefile
+++ b/tools/xenstat/libxenstat/Makefile
@@ -34,7 +34,7 @@ OBJECTS-$(CONFIG_SunOS) += src/xenstat_solaris.o
OBJECTS-$(CONFIG_NetBSD) += src/xenstat_netbsd.o
SONAME_FLAGS=-Wl,$(SONAME_LDFLAG) -Wl,libxenstat.so.$(MAJOR)
-WARN_FLAGS=-Wall -Werror
+WARN_FLAGS=-Wall
CFLAGS+=-Isrc -I$(XEN_LIBXC) -I$(XEN_XENSTORE)
LDFLAGS+=-Lsrc -L$(XEN_XENSTORE)/ -L$(XEN_LIBXC)/
diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile
index 1f8b2da..5240728 100644
--- a/tools/xenstat/xentop/Makefile
+++ b/tools/xenstat/xentop/Makefile
@@ -23,7 +23,7 @@ mandir=$(prefix)/share/man
man1dir=$(mandir)/man1
sbindir=$(prefix)/sbin
-CFLAGS += -DGCC_PRINTF -Wall -Werror -I$(XEN_LIBXENSTAT)
+CFLAGS += -DGCC_PRINTF -Wall -I$(XEN_LIBXENSTAT)
LDFLAGS += -L$(XEN_LIBXENSTAT)
LDLIBS += -lxenstat $(CURSES_LIBS) $(SOCKET_LIBS)
CFLAGS += -DHOST_$(XEN_OS)
diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index adbe605..4826708 100644
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -6,7 +6,7 @@ MAJOR = 3.0
MINOR = 0
PROFILE=#-pg
-BASECFLAGS=-Werror
+BASECFLAGS=
# Make gcc generate dependencies.
BASECFLAGS += -Wp,-MD,.$(@F).d
PROG_DEP = .*.d
diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile
index ce8e490..dd02024 100644
--- a/tools/xentrace/Makefile
+++ b/tools/xentrace/Makefile
@@ -1,7 +1,7 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
-CFLAGS += -Werror
+CFLAGS +=
CFLAGS += -I $(XEN_XC)
CFLAGS += -I $(XEN_LIBXC)
diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index 1925c2f..9ff2ba5 100644
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -23,7 +23,7 @@ CFLAGS += -nostdinc
endif
CFLAGS += -fno-builtin -fno-common
-CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
+CFLAGS += -iwithprefix include -Wno-pointer-arith -pipe
CFLAGS += -I$(BASEDIR)/include
CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic
CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default