Hello community,
here is the log from the commit of package xen
checked in at Wed Jun 14 13:33:31 CEST 2006.
--------
--- arch/i386/xen/xen.changes 2006-06-10 01:11:53.000000000 +0200
+++ xen/xen.changes 2006-06-13 21:14:05.000000000 +0200
@@ -1,0 +2,23 @@
+Tue Jun 13 10:28:36 MDT 2006 - ccoffing@novell.com
+
+- Resync with new tarball from xen-3.0-testing; changeset 9738.
+
+-------------------------------------------------------------------
+Mon Jun 12 10:23:35 MDT 2006 - ccoffing@novell.com
+
+- Drop BUILD_BUG_ON and pirq-shared patches. Last week's pirq
+ sharing patch from upstream (for bug #152892) makes these patches
+ redundant. Dropping these makes our shared_info structure match
+ upstream again, which is needed for compatibility with other
+ paravirtualized guests.
+- Import changeset 9734 from xen-3.0-testing. This fixes a hyper-
+ call (used by the pcifront driver) to work on MP guests. Without
+ this, the pciback driver can hang on MP. (#181467)
+- Import changeset 9733 from xen-3.0-testing. This patch is
+ required to match the Linux kernel, since Linux always calls
+ this operation from VCPU0 during secondary VCPU bringup.
+ Without this, process run-time accounting on secondary CPUs is
+ completely wrong.
+- Updated README: Documented work-around for bug #180058.
+
+-------------------------------------------------------------------
Old:
----
xen-9657-get-mfn-from-gpfn.diff
xen-9658-pirq-mask-into-bitmap.diff
xen-9659-intr-ack-routine.diff
xen-9660-perfc-array-range.diff
xen-9663-svm-init-intercept-handler.diff
xen-9664-svm-reset-host-selectors.diff
xen-9665-sxp-compat.diff
xen-9666-hvm-guest-faults.diff
xen-9667-vmx-gp-fault.diff
xen-9674-ptrace-fpu.diff
xen-9675-ptrace-bounds.diff
xen-9678-hvm-pae-performance.diff
xen-9682-svm-update.diff
xen-9683-svm-build-fix.diff
xen-9685-segment-bases.diff
xen-9686-32-64-vmx-regs.diff
xen-9688-rm-broken-string-func.diff
xen-9693-wait-for-large-ballooning.diff
xen-9695-signed.diff
xen-9696-rm-broken-string-func.diff
xen-9698-no-corrupt-frame-0.diff
xen-9699-hvm-xchg.diff
xen-9702-MMU_NORMAL_PT_UPDATE.diff
xen-9703-ignore-empty-ptes.diff
xen-9704-dealloc-l1.diff
xen-9705-signed.diff
xen-9706-init-list-head.diff
xen-9708-shadow-l4.diff
xen-9709-extended-cr3.diff
xen-9717-disable-interrupts.diff
xen-9721-explicitly-sized-types.diff
xen-9725-hvm-decode.diff
xen-9726-pirq-shared.diff
xen-BUILD_BUG_ON.diff
xen-amd-smp.diff
xen-cirrus-corruption.diff
xen-cpuid-amd.diff
xen-get-page-type.diff
xen-iopl.diff
xen-pirq_shared.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xen.spec ++++++
--- /var/tmp/diff_new_pack.Qz1whH/_old 2006-06-14 13:31:16.000000000 +0200
+++ /var/tmp/diff_new_pack.Qz1whH/_new 2006-06-14 13:31:16.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package xen (Version 3.0.2_09726)
+# spec file for package xen (Version 3.0.2_09738)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -14,11 +14,11 @@
BuildRequires: LibVNCServer SDL-devel autoconf automake bin86 dev86 glibc-devel-32bit latex2html libjpeg-devel libreiserfs-devel python-devel te_ams te_latex tetex transfig
%define xvers 3.0
%define xvermaj 3
-%define changeset 09726
+%define changeset 09738
%define build_xmtest 0
%define with_pygrub 1
%define xen_build_dir xen-3.0-testing
-Version: 3.0.2_09726
+Version: 3.0.2_09738
Release: 1
License: GPL
Group: System/Kernel
@@ -65,59 +65,19 @@
Patch26: xen-hvm-localtime.diff
Patch27: xen-hvm-auto-balloon.diff
Patch28: xen-ioapic-ack-default.diff
-Patch29: xen-BUILD_BUG_ON.diff
-Patch30: xen-pirq_shared.diff
-Patch31: xen-lost-mouse.diff
-Patch32: xen-cirrus-corruption.diff
-Patch33: xen-hvm-memory-check.diff
-Patch34: xen-load-pae-bin-kernel.diff
-Patch35: xen-paths.diff
-Patch36: xen-hvm-rep-movs.diff
-Patch37: xen-lowmem-emergency-pool.diff
-Patch38: xen-console.diff
-Patch39: xen-removable.diff
-Patch40: xen-fatal-trap-halt.diff
-Patch41: xen-amd-smp.diff
-Patch42: xen-cpuid.diff
-Patch43: xen-cpuid-amd.diff
-Patch44: xen-get-page-type.diff
-Patch45: xen-iopl.diff
-Patch46: xen-read-port-0x61.diff
-Patch50: xen-genapic.diff
-Patch100: xen-9657-get-mfn-from-gpfn.diff
-Patch101: xen-9658-pirq-mask-into-bitmap.diff
-Patch102: xen-9659-intr-ack-routine.diff
-Patch103: xen-9660-perfc-array-range.diff
-Patch104: xen-9663-svm-init-intercept-handler.diff
-Patch105: xen-9664-svm-reset-host-selectors.diff
-Patch106: xen-9665-sxp-compat.diff
-Patch107: xen-9666-hvm-guest-faults.diff
-Patch108: xen-9667-vmx-gp-fault.diff
-Patch109: xen-9674-ptrace-fpu.diff
-Patch110: xen-9675-ptrace-bounds.diff
-Patch111: xen-9678-hvm-pae-performance.diff
-Patch112: xen-9682-svm-update.diff
-Patch113: xen-9683-svm-build-fix.diff
-Patch114: xen-9685-segment-bases.diff
-Patch115: xen-9686-32-64-vmx-regs.diff
-Patch116: xen-9688-rm-broken-string-func.diff
-Patch117: xen-9693-wait-for-large-ballooning.diff
-Patch118: xen-9695-signed.diff
-Patch119: xen-9696-rm-broken-string-func.diff
-Patch120: xen-9698-no-corrupt-frame-0.diff
-Patch121: xen-9699-hvm-xchg.diff
+Patch29: xen-lost-mouse.diff
+Patch30: xen-hvm-memory-check.diff
+Patch31: xen-load-pae-bin-kernel.diff
+Patch32: xen-paths.diff
+Patch33: xen-hvm-rep-movs.diff
+Patch34: xen-lowmem-emergency-pool.diff
+Patch35: xen-console.diff
+Patch36: xen-removable.diff
+Patch37: xen-fatal-trap-halt.diff
+Patch38: xen-cpuid.diff
+Patch39: xen-read-port-0x61.diff
+Patch40: xen-genapic.diff
Patch122: xen-unstable-9967-summa.diff
-Patch123: xen-9702-MMU_NORMAL_PT_UPDATE.diff
-Patch124: xen-9703-ignore-empty-ptes.diff
-Patch125: xen-9704-dealloc-l1.diff
-Patch126: xen-9705-signed.diff
-Patch127: xen-9706-init-list-head.diff
-Patch128: xen-9708-shadow-l4.diff
-Patch129: xen-9709-extended-cr3.diff
-Patch130: xen-9717-disable-interrupts.diff
-Patch131: xen-9721-explicitly-sized-types.diff
-Patch132: xen-9725-hvm-decode.diff
-Patch133: xen-9726-pirq-shared.diff
Patch200: xen-enable-hvm-debug.diff
Patch201: xen-enable-debug
Patch202: xen-poweroff.diff
@@ -465,40 +425,7 @@
%prep
%setup -q -n %xen_build_dir
# Apply upstream patches first...
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
-%patch105 -p1
-%patch106 -p1
-%patch107 -p1
-%patch108 -p1
-%patch109 -p1
-%patch110 -p1
-%patch111 -p1
-%patch112 -p1
-%patch113 -p1
-%patch114 -p1
-%patch115 -p1
-%patch116 -p1
-%patch117 -p1
-%patch118 -p1
-%patch119 -p1
-%patch120 -p1
-%patch121 -p1
%patch122 -p1
-%patch123 -p1
-%patch124 -p1
-%patch125 -p1
-%patch126 -p1
-%patch127 -p1
-%patch128 -p1
-%patch129 -p1
-%patch130 -p1
-%patch131 -p1
-%patch132 -p1
-%patch133 -p1
# Now our patches...
%patch1 -p1
%patch2 -p1
@@ -541,17 +468,10 @@
%patch38 -p1
%patch39 -p1
%patch40 -p1
-%patch41 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
-%patch45 -p1
-%patch46 -p1
-%patch50 -p1
#%patch200 -p1
XEN_EXTRAVERSION=%version-%release
XEN_EXTRAVERSION=${XEN_EXTRAVERSION#%{xvers}}
-sed -i "s/XEN_EXTRAVERSION[ ]*=.*\$/XEN_EXTRAVERSION = $XEN_EXTRAVERSION/" xen/Makefile
+sed -i "s/XEN_EXTRAVERSION[ ]*.=.*\$/XEN_EXTRAVERSION = $XEN_EXTRAVERSION/" xen/Makefile
sed -i "s/XEN_CHANGESET[ ]*=.*\$/XEN_CHANGESET = %{changeset}/" xen/Makefile
%patch201 -p1
@@ -854,6 +774,23 @@
%{insserv_cleanup}
%changelog -n xen
+* Tue Jun 13 2006 - ccoffing@novell.com
+- Resync with new tarball from xen-3.0-testing; changeset 9738.
+* Mon Jun 12 2006 - ccoffing@novell.com
+- Drop BUILD_BUG_ON and pirq-shared patches. Last week's pirq
+ sharing patch from upstream (for bug #152892) makes these patches
+ redundant. Dropping these makes our shared_info structure match
+ upstream again, which is needed for compatibility with other
+ paravirtualized guests.
+- Import changeset 9734 from xen-3.0-testing. This fixes a hyper-
+ call (used by the pcifront driver) to work on MP guests. Without
+ this, the pciback driver can hang on MP. (#181467)
+- Import changeset 9733 from xen-3.0-testing. This patch is
+ required to match the Linux kernel, since Linux always calls
+ this operation from VCPU0 during secondary VCPU bringup.
+ Without this, process run-time accounting on secondary CPUs is
+ completely wrong.
+- Updated README: Documented work-around for bug #180058.
* Fri Jun 09 2006 - ccoffing@novell.com
- Include Jan's patch: "IOPL is ignored for VM86 mode port
accesses. Fix Xen emulation to match native behaivour." Fixes
++++++ README.SuSE ++++++
--- arch/i386/xen/README.SuSE 2006-06-09 19:34:15.000000000 +0200
+++ xen/README.SuSE 2006-06-13 21:14:16.000000000 +0200
@@ -569,6 +569,13 @@
Cannot determine dependencies of module edd. Is modules.dep up to date?
This is normal. The edd module is not built for Xen-enable Linux kernels.
+If you use the defaults while installing a fully virtualized SLES 10 VM, the
+install takes a very long time (3 to 4 hours). This occurs when the screen
+resolution is higher than 800 x 600. To force a lower resolution, pass the
+parameter "vga=0x314" to the fully virtualized SLES 10 when it boots. For
+example, instead of typing in "linux" on the text isolinux screen to start the
+install, type "linux vga=0x314".
+
Disclaimer
----------
++++++ xen-3.0-testing-src.tar.bz2 ++++++
++++ 67219 lines of diff (skipped)
++++++ xen-bonding.diff ++++++
--- /var/tmp/diff_new_pack.Qz1whH/_old 2006-06-14 13:31:35.000000000 +0200
+++ /var/tmp/diff_new_pack.Qz1whH/_new 2006-06-14 13:31:35.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- xen-3.0-testing.orig/tools/examples/network-bridge
+++ xen-3.0-testing/tools/examples/network-bridge
-@@ -211,10 +211,11 @@ using loopback.nloopbacks=<N> on the dom
+@@ -210,10 +210,11 @@ using loopback.nloopbacks=<N> on the dom
create_bridge ${bridge}
@@ -16,7 +16,7 @@
transfer_addrs ${netdev} ${vdev}
ifdown ${netdev}
ip link set ${netdev} name ${pdev}
-@@ -232,6 +233,9 @@ using loopback.nloopbacks=<N> on the dom
+@@ -231,6 +232,9 @@ using loopback.nloopbacks=<N> on the dom
ifup ${hwddev}
else
# old style without ${vdev}
@@ -26,7 +26,7 @@
transfer_addrs ${netdev} ${bridge}
transfer_routes ${netdev} ${bridge}
fi
-@@ -268,6 +272,7 @@ op_stop () {
+@@ -267,6 +271,7 @@ op_stop () {
ip link set ${pdev} name ${netdev}
ifup ${netdev}
else
++++++ xen-changeset.diff ++++++
--- /var/tmp/diff_new_pack.Qz1whH/_old 2006-06-14 13:31:35.000000000 +0200
+++ /var/tmp/diff_new_pack.Qz1whH/_new 2006-06-14 13:31:35.000000000 +0200
@@ -2,20 +2,20 @@
===================================================================
--- xen-3.0-testing.orig/xen/Makefile
+++ xen-3.0-testing/xen/Makefile
-@@ -7,6 +7,7 @@ INSTALL_DIR = $(INSTALL) -d -m0755
+@@ -3,6 +3,7 @@
export XEN_VERSION = 3
export XEN_SUBVERSION = 0
- export XEN_EXTRAVERSION = .2-2
+ export XEN_EXTRAVERSION ?= .2-3
+export XEN_CHANGESET = unavailable
export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
+ -include xen-version
- export BASEDIR := $(CURDIR)
-@@ -98,7 +99,7 @@ include/xen/compile.h: include/xen/compi
+@@ -97,7 +98,7 @@ include/xen/compile.h: include/xen/compi
-e 's/@@version@@/$(XEN_VERSION)/g' \
-e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \
-e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \
- -e 's!@@changeset@@!$(shell ((hg parents || head -n 7 ../ChangeLog || echo date: unavailable) | awk '{FS="changeset:[ ]+"}/^changeset/{CS=$$2};{FS="date:[ ]+"}/^date/{D=$$2}; END {print D, CS}') 2>/dev/null)!g' \
-+ -e 's/@@changeset@@/$(XEN_CHANGESET)/g' \
++ -e 's!@@changeset@@!$(XEN_CHANGESET)!g' \
< include/xen/compile.h.in > $@.new
@cat include/xen/banner.h >> $@.new
@mv -f $@.new $@
++++++ xen-destdir.diff ++++++
--- /var/tmp/diff_new_pack.Qz1whH/_old 2006-06-14 13:31:36.000000000 +0200
+++ /var/tmp/diff_new_pack.Qz1whH/_new 2006-06-14 13:31:36.000000000 +0200
@@ -1,23 +1,3 @@
-Index: xen-3.0-testing/Makefile
-===================================================================
---- xen-3.0-testing.orig/Makefile
-+++ xen-3.0-testing/Makefile
-@@ -2,6 +2,15 @@
- # Grand Unified Makefile for Xen.
- #
-
-+DESTDIR ?= /
-+PREFIX ?= $(DESTDIR)/usr
-+MANDIR ?= $(PREFIX)/share/man
-+LIBDIR ?= lib
-+DOCDIR ?= $(PREFIX)/share/doc/packages
-+BOOTDIR ?= $(DESTDIR)/boot
-+
-+export DESTDIR PREFIX MANDIR LIBDIR DOCDIR BOOTDIR
-+
- KERNELS ?= linux-2.6-xen
- # You may use wildcards in the above e.g. KERNELS=*2.6*
-
Index: xen-3.0-testing/docs/Makefile
===================================================================
--- xen-3.0-testing.orig/docs/Makefile
@@ -31,44 +11,11 @@
mandir := /usr/share/man
DOC_MAN5SRC := $(wildcard man/*.pod.5)
-@@ -28,6 +28,13 @@ GFX = $(patsubst %.fig, %.eps, $(wildcar
-
- .PHONY: all build dev-docs python-dev-docs ps pdf html clean install
-
-+DESTDIR ?= /
-+PREFIX ?= $(DESTDIR)/usr
-+MANDIR ?= $(PREFIX)/share/man
-+DOCDIR ?= $(PREFIX)/share/doc/packages
-+
-+export DESTDIR PREFIX MANDIR DOCDIR
-+
- all: build
- build: ps pdf html man-pages
- rm -f *.aux *.dvi *.bbl *.blg *.glo *.idx *.ilg *.log *.ind *.toc
-Index: xen-3.0-testing/tools/Makefile
-===================================================================
---- xen-3.0-testing.orig/tools/Makefile
-+++ xen-3.0-testing/tools/Makefile
-@@ -26,6 +26,14 @@ endif
-
- .PHONY: all install clean check check_clean ioemu eioemuinstall ioemuclean
-
-+DESTDIR ?= /
-+PREFIX ?= $(DESTDIR)/usr
-+MANDIR ?= $(PREFIX)/man
-+DOCDIR ?= $(PREFIX)/share/doc/packages
-+LIBDIR ?= lib
-+
-+export DESTDIR PREFIX MANDIR DOCDIR LIBDIR
-+
- all: check
- @set -e; for subdir in $(SUBDIRS); do \
- $(MAKE) -C $$subdir $@; \
Index: xen-3.0-testing/tools/xentrace/Makefile
===================================================================
--- xen-3.0-testing.orig/tools/xentrace/Makefile
+++ xen-3.0-testing/tools/xentrace/Makefile
-@@ -35,14 +35,14 @@ install: build
+@@ -39,14 +39,14 @@ install: build
[ -d $(DESTDIR)/usr/bin ] || $(INSTALL_DIR) $(DESTDIR)/usr/bin
[ -z "$(LIBBIN)" ] || [ -d $(DESTDIR)/usr/$(LIBDIR)/xen/bin ] || \
$(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)/xen/bin
@@ -87,32 +34,13 @@
+ $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MANDIR)/man1
+ $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MANDIR)/man8
+ .PHONY: clean
clean:
- $(RM) *.a *.so *.o *.rpm $(BIN) $(LIBBIN)
-Index: xen-3.0-testing/xen/Makefile
-===================================================================
---- xen-3.0-testing.orig/xen/Makefile
-+++ xen-3.0-testing/xen/Makefile
-@@ -11,6 +11,14 @@ export XEN_FULLVERSION = $(XEN_VERSION
-
- export BASEDIR := $(CURDIR)
-
-+DESTDIR ?= /
-+PREFIX ?= $(DESTDIR)/usr
-+MANDIR ?= $(PREFIX)/share/man
-+DOCDIR ?= $(PREFIX)/share/doc/packages
-+BOOTDIR ?= $(DESTDIR)/boot
-+
-+export DESTDIR PREFIX MANDIR DOCDIR BOOTDIR
-+
- include Rules.mk
-
- default: build
Index: xen-3.0-testing/tools/examples/Makefile
===================================================================
--- xen-3.0-testing.orig/tools/examples/Makefile
+++ xen-3.0-testing/tools/examples/Makefile
-@@ -38,29 +38,17 @@ XEN_HOTPLUG_SCRIPTS = xen-backend.agent
+@@ -38,18 +38,6 @@ XEN_HOTPLUG_SCRIPTS = xen-backend.agent
UDEV_RULES_DIR = /etc/udev
UDEV_RULES = xen-backend.rules
@@ -128,12 +56,17 @@
-endif
-endif
-
+ .PHONY: all
all:
+
+@@ -57,15 +45,15 @@ all:
build:
+ .PHONY: install
-install: all install-initd install-configs install-scripts $(HOTPLUGS)
+install: all install-initd install-configs install-scripts install-udev
+ .PHONY: install-initd
install-initd:
[ -d $(DESTDIR)/etc/init.d ] || $(INSTALL_DIR) $(DESTDIR)/etc/init.d
- [ -d $(DESTDIR)/etc/sysconfig ] || $(INSTALL_DIR) $(DESTDIR)/etc/sysconfig
@@ -143,9 +76,9 @@
- $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)/etc/sysconfig/xendomains
+ $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)/var/adm/fillup-templates/
+ .PHONY: install-configs
install-configs: $(XEN_CONFIGS)
- [ -d $(DESTDIR)$(XEN_CONFIG_DIR) ] || \
-@@ -97,9 +85,7 @@ install-udev:
+@@ -106,9 +94,7 @@ install-udev:
$(INSTALL_DIR) $(DESTDIR)$(UDEV_RULES_DIR)/rules.d
for i in $(UDEV_RULES); \
do \
@@ -155,7 +88,7 @@
+ $(INSTALL_DATA) $$i $(DESTDIR)$(UDEV_RULES_DIR)/rules.d; \
done
- clean:
+ .PHONY: clean
Index: xen-3.0-testing/tools/xenmon/Makefile
===================================================================
--- xen-3.0-testing.orig/tools/xenmon/Makefile
@@ -171,9 +104,9 @@
XEN_ROOT=../..
include $(XEN_ROOT)/tools/Rules.mk
-@@ -33,10 +35,10 @@ all: build
- build: $(BIN)
+@@ -36,10 +38,10 @@ build: $(BIN)
+ .PHONY: install
install: xenbaked setmask
- [ -d $(DESTDIR)$(sbindir) ] || $(INSTALL_DIR) $(DESTDIR)$(sbindir)
- $(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked
@@ -184,13 +117,13 @@
+ $(INSTALL_PROG) setmask $(SBINDIR)/setmask
+ $(INSTALL_PROG) xenmon.py $(SBINDIR)/xenmon.py
+ .PHONY: clean
clean:
- rm -f $(BIN)
Index: xen-3.0-testing/tools/security/Makefile
===================================================================
--- xen-3.0-testing.orig/tools/security/Makefile
+++ xen-3.0-testing/tools/security/Makefile
-@@ -74,9 +74,9 @@ install: all $(ACM_CONFIG_FILE)
+@@ -76,9 +76,9 @@ install: all $(ACM_CONFIG_FILE)
$(INSTALL_DIR) -p $(DESTDIR)$(ACM_SECGEN_CGIDIR)
$(INSTALL_PROG) -p $(ACM_INST_CGI) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
ifndef XEN_PYTHON_NATIVE_INSTALL
@@ -201,12 +134,12 @@
+ python python/setup.py install --root="$(DESTDIR)" --prefix="/usr"
endif
else
- all:
+ .PHONY: all
Index: xen-3.0-testing/tools/pygrub/Makefile
===================================================================
--- xen-3.0-testing.orig/tools/pygrub/Makefile
+++ xen-3.0-testing/tools/pygrub/Makefile
-@@ -11,7 +11,7 @@ install: all
+@@ -14,7 +14,7 @@ install: all
CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --prefix=""
else
install: all
@@ -214,12 +147,12 @@
+ CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --prefix="/usr"
endif
- clean:
+ .PHONY: clean
Index: xen-3.0-testing/tools/python/Makefile
===================================================================
--- xen-3.0-testing.orig/tools/python/Makefile
+++ xen-3.0-testing/tools/python/Makefile
-@@ -12,7 +12,7 @@ install: all
+@@ -14,7 +14,7 @@ install: all
CFLAGS="$(CFLAGS)" python setup.py install --home="$(DESTDIR)/usr" --prefix="" --force
else
install: all
@@ -227,4 +160,4 @@
+ CFLAGS="$(CFLAGS)" python setup.py install --root="$(DESTDIR)" --prefix="/usr" --force
endif
- test:
+ .PHONY: test
++++++ xen-docs.diff ++++++
--- /var/tmp/diff_new_pack.Qz1whH/_old 2006-06-14 13:31:36.000000000 +0200
+++ /var/tmp/diff_new_pack.Qz1whH/_new 2006-06-14 13:31:36.000000000 +0200
@@ -1,9 +1,9 @@
-Index: xen-unstable/docs/Makefile
+Index: xen-3.0-testing/docs/Makefile
===================================================================
---- xen-unstable.orig/docs/Makefile
-+++ xen-unstable/docs/Makefile
-@@ -81,13 +81,13 @@ clean:
-
+--- xen-3.0-testing.orig/docs/Makefile
++++ xen-3.0-testing/docs/Makefile
+@@ -83,13 +83,13 @@ clean:
+ .PHONY: install
install: all
rm -rf $(DESTDIR)$(pkgdocdir)
- $(INSTALL_DIR) $(DESTDIR)$(pkgdocdir)
@@ -18,7 +18,7 @@
pdf/%.pdf: ps/%.ps
$(INSTALL_DIR) $(@D)
-@@ -111,3 +111,9 @@ html/%/index.html: src/%.tex
+@@ -113,3 +113,9 @@ html/%/index.html: src/%.tex
$(LATEX2HTML) -split 0 -show_section_numbers -toc_depth 3 -nonavigation \
-numbered_footnotes -local_icons -noinfo -math -dir $(@D) \
$< 1>/dev/null 2>/dev/null
++++++ xen-enable-debug ++++++
--- /var/tmp/diff_new_pack.Qz1whH/_old 2006-06-14 13:31:36.000000000 +0200
+++ /var/tmp/diff_new_pack.Qz1whH/_new 2006-06-14 13:31:36.000000000 +0200
@@ -1,7 +1,7 @@
-Index: xen-unstable/xen/Rules.mk
+Index: xen-3.0-testing/xen/Rules.mk
===================================================================
---- xen-unstable.orig/xen/Rules.mk
-+++ xen-unstable/xen/Rules.mk
+--- xen-3.0-testing.orig/xen/Rules.mk
++++ xen-3.0-testing/xen/Rules.mk
@@ -6,7 +6,7 @@
verbose ?= n
perfc ?= n
@@ -11,10 +11,10 @@
# Hardcoded configuration implications and dependencies.
# Do this is a neater way if it becomes unwieldy.
-Index: xen-unstable/Config.mk
+Index: xen-3.0-testing/Config.mk
===================================================================
---- xen-unstable.orig/Config.mk
-+++ xen-unstable/Config.mk
+--- xen-3.0-testing.orig/Config.mk
++++ xen-3.0-testing/Config.mk
@@ -1,7 +1,7 @@
# -*- mode: Makefile; -*-
@@ -24,3 +24,57 @@
# Currently supported architectures: x86_32, x86_64
XEN_COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/)
+Index: xen-3.0-testing/xen/common/page_alloc.c
+===================================================================
+--- xen-3.0-testing.orig/xen/common/page_alloc.c
++++ xen-3.0-testing/xen/common/page_alloc.c
+@@ -34,6 +34,7 @@
+ #include
+ #include
+ #include
++#include
+
+ /*
+ * Comma-separated list of hexadecimal page numbers containing bad bytes.
+@@ -537,6 +538,19 @@ struct page_info *alloc_domheap_pages(
+ struct page_info *pg = NULL;
+ cpumask_t mask;
+ int i;
++ extern void show_trace(struct cpu_user_regs *regs);
++
++ if ((jiffies & 0xfff) == 0)
++ {
++ struct cpu_user_regs regs;
++ unsigned long esp;
++ regs.eip = (unsigned long)&alloc_domheap_pages;
++ __asm__ __volatile__("movl %%esp,%0" : "=r" (esp));
++ regs.esp = esp;
++ printk("Artificially failing alloc_domheap_pages\n");
++ show_trace(®s);
++ return NULL;
++ }
+
+ ASSERT(!in_irq());
+
+Index: xen-3.0-testing/xen/arch/x86/traps.c
+===================================================================
+--- xen-3.0-testing.orig/xen/arch/x86/traps.c
++++ xen-3.0-testing/xen/arch/x86/traps.c
+@@ -173,7 +173,7 @@ static void show_guest_stack(struct cpu_
+
+ #ifdef NDEBUG
+
+-static void show_trace(struct cpu_user_regs *regs)
++void show_trace(struct cpu_user_regs *regs)
+ {
+ unsigned long *stack = ESP_BEFORE_EXCEPTION(regs), addr;
+
+@@ -197,7 +197,7 @@ static void show_trace(struct cpu_user_r
+
+ #else
+
+-static void show_trace(struct cpu_user_regs *regs)
++void show_trace(struct cpu_user_regs *regs)
+ {
+ unsigned long *frame, next, addr, low, high;
+
++++++ xen-genapic.diff ++++++
--- /var/tmp/diff_new_pack.Qz1whH/_old 2006-06-14 13:31:36.000000000 +0200
+++ /var/tmp/diff_new_pack.Qz1whH/_new 2006-06-14 13:31:36.000000000 +0200
@@ -55,8 +55,7 @@
===================================================================
--- xen-3.0-testing.orig/xen/arch/x86/genapic/Makefile
+++ xen-3.0-testing/xen/arch/x86/genapic/Makefile
-@@ -2,6 +2,7 @@ include $(BASEDIR)/Rules.mk
-
+@@ -1,5 +1,6 @@
obj-y += bigsmp.o
obj-y += default.o
+obj-y += delivery.o
@@ -604,7 +603,7 @@
===================================================================
--- xen-3.0-testing.orig/xen/arch/x86/x86_32/entry.S
+++ xen-3.0-testing/xen/arch/x86/x86_32/entry.S
-@@ -561,7 +561,7 @@ defer_nmi:
+@@ -566,7 +566,7 @@ defer_nmi:
testl $APIC_ICR_BUSY,%ebx
jnz 1b
# __send_IPI_shortcut(APIC_DEST_SELF, TRAP_deferred_nmi)
++++++ xen-hvm-memory-check.diff ++++++
--- /var/tmp/diff_new_pack.Qz1whH/_old 2006-06-14 13:31:36.000000000 +0200
+++ /var/tmp/diff_new_pack.Qz1whH/_new 2006-06-14 13:31:36.000000000 +0200
@@ -1,79 +1,3 @@
-Index: xen-3.0-testing/xen/arch/x86/hvm/hvm.c
-===================================================================
---- xen-3.0-testing.orig/xen/arch/x86/hvm/hvm.c
-+++ xen-3.0-testing/xen/arch/x86/hvm/hvm.c
-@@ -189,7 +189,11 @@ void hvm_setup_platform(struct domain* d
- if ( !hvm_guest(current) || (current->vcpu_id != 0) )
- return;
-
-- shadow_direct_map_init(d);
-+ if ( shadow_direct_map_init(d) == 0 )
-+ {
-+ printk("Can not allocate shadow direct map for HVM domain.\n");
-+ domain_crash_synchronous();
-+ }
-
- hvm_map_io_shared_page(d);
- hvm_get_info(d);
-Index: xen-3.0-testing/xen/arch/x86/hvm/svm/svm.c
-===================================================================
---- xen-3.0-testing.orig/xen/arch/x86/hvm/svm/svm.c
-+++ xen-3.0-testing/xen/arch/x86/hvm/svm/svm.c
-@@ -467,13 +467,20 @@ int start_svm(void)
-
- /* Initialize the HSA for this core */
- svm_globals[cpu].hsa = alloc_host_save_area();
-+ if (! svm_globals[cpu].hsa)
-+ return 0;
- phys_hsa = (u64) virt_to_maddr( svm_globals[cpu].hsa );
- phys_hsa_lo = (u32) phys_hsa;
- phys_hsa_hi = (u32) (phys_hsa >> 32);
- wrmsr(MSR_K8_VM_HSAVE_PA, phys_hsa_lo, phys_hsa_hi);
- svm_globals[cpu].hsa_pa = phys_hsa;
-
-- svm_globals[cpu].scratch_hsa = alloc_host_save_area();
-+ svm_globals[cpu].scratch_hsa = alloc_host_save_area();
-+ if (! svm_globals[cpu].scratch_hsa)
-+ {
-+ free_host_save_area(svm_globals[cpu].hsa);
-+ return 0;
-+ }
- svm_globals[cpu].scratch_hsa_pa = (u64)virt_to_maddr( svm_globals[cpu].scratch_hsa );
-
- /* Setup HVM interfaces */
-Index: xen-3.0-testing/xen/arch/x86/hvm/svm/vmcb.c
-===================================================================
---- xen-3.0-testing.orig/xen/arch/x86/hvm/svm/vmcb.c
-+++ xen-3.0-testing/xen/arch/x86/hvm/svm/vmcb.c
-@@ -139,18 +139,21 @@ static int construct_vmcb_controls(struc
-
- /* The following is for I/O and MSR permision map */
- iopm = alloc_xenheap_pages(get_order_from_bytes(IOPM_SIZE));
--
-- ASSERT(iopm);
-- memset(iopm, 0xff, IOPM_SIZE);
-- clear_bit(PC_DEBUG_PORT, iopm);
-+ if (iopm)
-+ {
-+ memset(iopm, 0xff, IOPM_SIZE);
-+ clear_bit(PC_DEBUG_PORT, iopm);
-+ }
- msrpm = alloc_xenheap_pages(get_order_from_bytes(MSRPM_SIZE));
--
-- ASSERT(msrpm);
-- memset(msrpm, 0xff, MSRPM_SIZE);
-+ if (msrpm)
-+ memset(msrpm, 0xff, MSRPM_SIZE);
-
- arch_svm->iopm = iopm;
- arch_svm->msrpm = msrpm;
-
-+ if (! iopm || ! msrpm)
-+ return 1;
-+
- vmcb->iopm_base_pa = (u64) virt_to_maddr(iopm);
- vmcb->msrpm_base_pa = (u64) virt_to_maddr(msrpm);
-
Index: xen-3.0-testing/xen/arch/x86/shadow.c
===================================================================
--- xen-3.0-testing.orig/xen/arch/x86/shadow.c
@@ -88,7 +12,7 @@
return 0;
}
-@@ -3018,7 +3019,8 @@ static inline unsigned long init_bl2(
+@@ -3019,7 +3020,8 @@ static inline unsigned long init_bl2(
if ( unlikely(!(smfn = alloc_shadow_page(d, gpfn, gmfn, PGT_l4_shadow))) )
{
printk("Couldn't alloc an L4 shadow for pfn=%lx mfn=%lx\n", gpfn, gmfn);
++++++ xen-hvm-rep-movs.diff ++++++
--- /var/tmp/diff_new_pack.Qz1whH/_old 2006-06-14 13:31:36.000000000 +0200
+++ /var/tmp/diff_new_pack.Qz1whH/_new 2006-06-14 13:31:36.000000000 +0200
@@ -2,7 +2,7 @@
===================================================================
--- xen-3.0-testing.orig/xen/arch/x86/hvm/platform.c
+++ xen-3.0-testing/xen/arch/x86/hvm/platform.c
-@@ -830,7 +830,7 @@ void handle_mmio(unsigned long va, unsig
+@@ -869,7 +869,7 @@ void handle_mmio(unsigned long va, unsig
unsigned long count = GET_REPEAT_COUNT();
unsigned long size = mmio_inst.op_size;
int sign = regs->eflags & EF_DF ? -1 : 1;
@@ -11,7 +11,7 @@
int dir;
/* determine non-MMIO address */
-@@ -851,6 +851,13 @@ void handle_mmio(unsigned long va, unsig
+@@ -890,6 +890,13 @@ void handle_mmio(unsigned long va, unsig
addr = regs->edi;
}
}
@@ -25,21 +25,12 @@
mmio_opp->flags = mmio_inst.flags;
mmio_opp->instr = mmio_inst.instr;
-@@ -866,6 +873,7 @@ void handle_mmio(unsigned long va, unsig
- * again.
- */
- if ((addr & PAGE_MASK) != ((addr + size - 1) & PAGE_MASK)) {
-+ /* one movs crosses page border */
- unsigned long value = 0;
-
- mmio_opp->flags |= OVERLAP;
-@@ -876,13 +884,14 @@ void handle_mmio(unsigned long va, unsig
+@@ -915,13 +922,13 @@ void handle_mmio(unsigned long va, unsig
hvm_copy(&value, addr, size, HVM_COPY_IN);
send_mmio_req(IOREQ_TYPE_COPY, gpa, 1, size, value, dir, 0);
} else {
-- if ((addr & PAGE_MASK) != ((addr + count * size - 1) & PAGE_MASK)) {
+- if ((addr & PAGE_MASK) != ((addr + sign * (count * size - 1)) & PAGE_MASK)) {
+ if ((high_addr & PAGE_MASK) != (low_addr & PAGE_MASK)) {
-+ /* $count movs will cross page border */
regs->eip -= inst_len; /* do not advance %eip */
if (sign > 0)
++++++ xen-load-pae-bin-kernel.diff ++++++
--- /var/tmp/diff_new_pack.Qz1whH/_old 2006-06-14 13:31:36.000000000 +0200
+++ /var/tmp/diff_new_pack.Qz1whH/_new 2006-06-14 13:31:36.000000000 +0200
@@ -114,9 +114,9 @@
ERROR("PAE-kernel on non-PAE host.");
return 0;
}
-@@ -728,11 +739,12 @@ static int setup_guest(int xc_handle,
- if ( (v_end - vstack_end) < (512UL << 10) )
- v_end += 1UL << 22; /* Add extra 4MB to get >= 512kB padding. */
+@@ -767,11 +778,12 @@ static int setup_guest(int xc_handle,
+ }
+
#if defined(__i386__)
- if ( dsi.pae_kernel )
+ if ( dsi.kernel_pae_mode == PAE_KERNEL32 )
@@ -130,7 +130,7 @@
break;
}
else
-@@ -804,7 +816,7 @@ static int setup_guest(int xc_handle,
+@@ -843,7 +855,7 @@ static int setup_guest(int xc_handle,
/* setup page tables */
#if defined(__i386__)
@@ -139,7 +139,7 @@
rc = setup_pg_tables_pae(xc_handle, dom, ctxt,
dsi.v_start, v_end,
page_array, vpt_start, vpt_end,
-@@ -831,7 +843,7 @@ static int setup_guest(int xc_handle,
+@@ -870,7 +882,7 @@ static int setup_guest(int xc_handle,
*/
if ( !shadow_mode_enabled )
{
@@ -148,7 +148,7 @@
{
if ( pin_table(xc_handle, MMUEXT_PIN_L3_TABLE,
ctxt->ctrlreg[3] >> PAGE_SHIFT, dom) )
-@@ -965,7 +977,7 @@ static int setup_guest(int xc_handle,
+@@ -1004,7 +1016,7 @@ static int setup_guest(int xc_handle,
rc = xc_version(xc_handle, XENVER_version, NULL);
sprintf(start_info->magic, "xen-%i.%i-x86_%d%s",
rc >> 16, rc & (0xFFFF), (unsigned int)sizeof(long)*8,
++++++ xen-max-free-mem.diff ++++++
--- /var/tmp/diff_new_pack.Qz1whH/_old 2006-06-14 13:31:36.000000000 +0200
+++ /var/tmp/diff_new_pack.Qz1whH/_new 2006-06-14 13:31:36.000000000 +0200
@@ -31,7 +31,7 @@
===================================================================
--- xen-3.0-testing.orig/tools/python/xen/xend/balloon.py
+++ xen-3.0-testing/tools/python/xen/xend/balloon.py
-@@ -44,6 +44,7 @@ SLEEP_TIME_GROWTH = 0.1
+@@ -45,6 +45,7 @@ SLEEP_TIME_GROWTH = 0.1
# label actually shown in the PROC_XEN_BALLOON file.
labels = { 'current' : 'Current allocation',
'target' : 'Requested target',
@@ -39,7 +39,7 @@
'low-balloon' : 'Low-mem balloon',
'high-balloon' : 'High-mem balloon',
'limit' : 'Xen hard limit' }
-@@ -82,6 +83,15 @@ def get_dom0_target_alloc():
+@@ -83,6 +84,15 @@ def get_dom0_target_alloc():
raise VmError('Failed to query target memory allocation of dom0.')
return kb / 1024
++++++ xen-messages.diff ++++++
--- /var/tmp/diff_new_pack.Qz1whH/_old 2006-06-14 13:31:36.000000000 +0200
+++ /var/tmp/diff_new_pack.Qz1whH/_new 2006-06-14 13:31:36.000000000 +0200
@@ -18,116 +18,3 @@
def check_user():
"""Check that the effective user id is 0 (root).
-Index: xen-3.0-testing/docs/man/xend-config.sxp.pod.5
-===================================================================
---- xen-3.0-testing.orig/docs/man/xend-config.sxp.pod.5
-+++ xen-3.0-testing/docs/man/xend-config.sxp.pod.5
-@@ -107,7 +107,7 @@ If the value is 0, all available CPUs wi
- =item I<enable-dump>
-
- A boolean value that tells xend whether or not core dumps of guest
--domains should be saved when a crash occurrs. Defaults to I<no>.
-+domains should be saved when a crash occurs. Defaults to I<no>.
-
- =back
-
-Index: xen-3.0-testing/docs/man/xm.pod.1
-===================================================================
---- xen-3.0-testing.orig/docs/man/xm.pod.1
-+++ xen-3.0-testing/docs/man/xm.pod.1
-@@ -27,12 +27,12 @@ each of those sub commands.
-
- =head1 NOTES
-
--All B<xm> opperations rely upon the Xen control daemon, aka B<xend>.
-+All B<xm> operations rely upon the Xen control daemon, aka B<xend>.
- For any xm commands to run xend must also be running. For this reason
- you should start xend as a service when your system first boots using
- xen.
-
--Most B<xm> commands require root privledges to run due to the
-+Most B<xm> commands require root privileges to run due to the
- communications channels used to talk to the hypervisor. Running as
- non root will return an error.
-
-@@ -169,7 +169,7 @@ The domain is currently running on a CPU
-
- =item B
-
--The domain is blocked, and not running or runable. This can be caused
-+The domain is blocked, and not running or runnable. This can be caused
- because the domain is waiting on IO (a traditional wait state) or has
- gone to sleep because there was nothing else for it to do.
-
-@@ -248,7 +248,7 @@ careful when using this command on runni
-
- Migrate a domain to another Host machine. B<Xend> must be running on
- other host machine, it must be running the same version of xen, it
--must have the migration tcp port open and accepting connections from
-+must have the migration TCP port open and accepting connections from
- the source host, and there must be sufficient resources for the domain
- to run (memory, disk, etc).
-
-@@ -325,7 +325,7 @@ severed upon restore, as TCP timeouts ma
- =item B<shutdown> I<[options]> I<domain-id>
-
- Gracefully shuts down a domain. This coordinates with the domain OS
--to perform graceful shutdown, so there is no guaruntee that it will
-+to perform graceful shutdown, so there is no guarantee that it will
- succeed, and may take a variable length of time depending on what
- services must be shutdown in the domain. The command returns
- immediately after signally the domain unless that I<-w> flag is used.
-@@ -561,11 +561,11 @@ B<PARAMETERS>
-
- =item I<period>
-
--The normal EDF scheduling usage in nanosecs
-+The normal EDF scheduling usage in nanoseconds
-
- =item I<slice>
-
--The normal EDF scheduling usage in nanosecs
-+The normal EDF scheduling usage in nanoseconds
-
- FIXME: these are lame, should explain more.
-
-@@ -714,7 +714,7 @@ circumstances this should actually work.
-
- =item I
-
--The MAC address that the domain will see on its ethernet device. If
-+The MAC address that the domain will see on its Ethernet device. If
- the device is not specified it will be randomly generated with the
- 00:16:3e vendor id prefix.
-
-@@ -756,7 +756,7 @@ formatted as a list or as an S-Expressio
-
- The Virtual Network interfaces for Xen.
-
--FIXME: This needs a lot more explaination, or it needs to be ripped
-+FIXME: This needs a lot more explanation, or it needs to be ripped
- out entirely.
-
- =over 4
-Index: xen-3.0-testing/docs/man/xmdomain.cfg.pod.5
-===================================================================
---- xen-3.0-testing.orig/docs/man/xmdomain.cfg.pod.5
-+++ xen-3.0-testing/docs/man/xmdomain.cfg.pod.5
-@@ -80,7 +80,7 @@ An array of block device stanzas, in the
-
- disk = [ "stanza1", "stanza2", ... ]
-
--Each stanza has 3 terms, seperated by commas,
-+Each stanza has 3 terms, separated by commas,
- "backend-dev,frontend-dev,mode".
-
- =over 4
-@@ -112,7 +112,7 @@ I<r> (read-only), I<w> (read/write).
-
- =item B<vif>
-
--An arrray of virtual interface stanzas in the form:
-+An array of virtual interface stanzas in the form:
-
- vif = [ "stanza1", "stanza2", ... ]
-
++++++ xen-network-bridge.diff ++++++
--- /var/tmp/diff_new_pack.Qz1whH/_old 2006-06-14 13:31:36.000000000 +0200
+++ /var/tmp/diff_new_pack.Qz1whH/_new 2006-06-14 13:31:36.000000000 +0200
@@ -1,7 +1,7 @@
-Index: xen-unstable/tools/examples/network-bridge
+Index: xen-3.0-testing/tools/examples/network-bridge
===================================================================
---- xen-unstable.orig/tools/examples/network-bridge
-+++ xen-unstable/tools/examples/network-bridge
+--- xen-3.0-testing.orig/tools/examples/network-bridge
++++ xen-3.0-testing/tools/examples/network-bridge
@@ -24,7 +24,9 @@
# require the netback driver to have nloopbacks set to a
# higher value than its default of 8.
@@ -13,7 +13,7 @@
# antispoof Whether to use iptables to prevent spoofing (default no).
#
# Internal Vars:
-@@ -69,23 +71,6 @@ pdev="p${netdev}"
+@@ -68,23 +70,6 @@ pdev="p${netdev}"
vdev="veth${vifnum}"
vif0="vif0.${vifnum}"
@@ -37,7 +37,7 @@
# Usage: transfer_addrs src dst
# Copy all IP addresses (including aliases) from device $src to device $dst.
transfer_addrs () {
-@@ -157,7 +142,7 @@ create_bridge () {
+@@ -156,7 +141,7 @@ create_bridge () {
local bridge=$1
# Don't create the bridge if it already exists.
@@ -46,7 +46,7 @@
brctl addbr ${bridge}
brctl stp ${bridge} off
brctl setfd ${bridge} 0
-@@ -170,7 +155,7 @@ add_to_bridge () {
+@@ -169,7 +154,7 @@ add_to_bridge () {
local bridge=$1
local dev=$2
# Don't add $dev to $bridge if it's already on a bridge.
@@ -55,7 +55,7 @@
brctl addif ${bridge} ${dev}
fi
}
-@@ -228,14 +213,10 @@ using loopback.nloopbacks=<N> on the dom
+@@ -227,14 +212,10 @@ using loopback.nloopbacks=<N> on the dom
if link_exists "$vdev"; then
mac=`ip link show ${netdev} | grep 'link\/ether' | sed -e 's/.*ether \(..:..:..:..:..:..\).*/\1/'`
@@ -73,7 +73,7 @@
ip link set ${netdev} name ${pdev}
ip link set ${vdev} name ${netdev}
ip link set ${pdev} down arp off
-@@ -247,7 +228,8 @@ using loopback.nloopbacks=<N> on the dom
+@@ -246,7 +227,8 @@ using loopback.nloopbacks=<N> on the dom
ip link set ${vif0} up
ip link set ${pdev} up
add_to_bridge2 ${bridge} ${pdev}
@@ -83,7 +83,7 @@
else
# old style without ${vdev}
transfer_addrs ${netdev} ${bridge}
-@@ -271,9 +253,7 @@ op_stop () {
+@@ -270,9 +252,7 @@ op_stop () {
ip link set dev ${vif0} down
mac=`ip link show ${netdev} | grep 'link\/ether' | sed -e 's/.*ether \(..:..:..:..:..:..\).*/\1/'`
transfer_addrs ${netdev} ${pdev}
@@ -94,7 +94,7 @@
ip link set ${netdev} down arp off
ip link set ${netdev} addr fe:ff:ff:ff:ff:ff
ip link set ${pdev} down
-@@ -286,7 +266,7 @@ op_stop () {
+@@ -285,7 +265,7 @@ op_stop () {
ip link set ${netdev} name ${vdev}
ip link set ${pdev} name ${netdev}
@@ -103,10 +103,10 @@
else
transfer_routes ${bridge} ${netdev}
ip link set ${bridge} down
-Index: xen-unstable/tools/examples/xen-network-common.sh
+Index: xen-3.0-testing/tools/examples/xen-network-common.sh
===================================================================
---- xen-unstable.orig/tools/examples/xen-network-common.sh
-+++ xen-unstable/tools/examples/xen-network-common.sh
+--- xen-3.0-testing.orig/tools/examples/xen-network-common.sh
++++ xen-3.0-testing/tools/examples/xen-network-common.sh
@@ -16,73 +16,36 @@
#
++++++ xen-pae-makefile.diff ++++++
--- /var/tmp/diff_new_pack.Qz1whH/_old 2006-06-14 13:31:36.000000000 +0200
+++ /var/tmp/diff_new_pack.Qz1whH/_new 2006-06-14 13:31:36.000000000 +0200
@@ -1,8 +1,8 @@
-Index: xen-unstable/xen/arch/x86/Makefile
+Index: xen-3.0-testing/xen/arch/x86/Makefile
===================================================================
---- xen-unstable.orig/xen/arch/x86/Makefile
-+++ xen-unstable/xen/arch/x86/Makefile
-@@ -39,7 +39,7 @@ obj-y += traps.o
+--- xen-3.0-testing.orig/xen/arch/x86/Makefile
++++ xen-3.0-testing/xen/arch/x86/Makefile
+@@ -37,7 +37,7 @@ obj-y += traps.o
obj-y += usercopy.o
obj-y += x86_emulate.o
@@ -11,10 +11,10 @@
obj-$(x86_32) += shadow.o shadow_public.o shadow_guest32.o
else
obj-$(x86_32) += shadow32.o
-Index: xen-unstable/xen/arch/x86/Rules.mk
+Index: xen-3.0-testing/xen/arch/x86/Rules.mk
===================================================================
---- xen-unstable.orig/xen/arch/x86/Rules.mk
-+++ xen-unstable/xen/arch/x86/Rules.mk
+--- xen-3.0-testing.orig/xen/arch/x86/Rules.mk
++++ xen-3.0-testing/xen/arch/x86/Rules.mk
@@ -7,7 +7,6 @@ HAS_ACPI := y
# If you change any of these configuration options then you must
# 'make clean' before rebuilding.
++++++ xen-read-port-0x61.diff ++++++
--- /var/tmp/diff_new_pack.Qz1whH/_old 2006-06-14 13:31:36.000000000 +0200
+++ /var/tmp/diff_new_pack.Qz1whH/_new 2006-06-14 13:31:36.000000000 +0200
@@ -1,7 +1,8 @@
-diff -r 68c22a722e6f xen/arch/x86/traps.c
---- a/xen/arch/x86/traps.c Fri Jun 9 07:15:58 2006
-+++ b/xen/arch/x86/traps.c Fri Jun 9 12:10:43 2006
-@@ -772,7 +772,14 @@
+Index: xen-3.0-testing/xen/arch/x86/traps.c
+===================================================================
+--- xen-3.0-testing.orig/xen/arch/x86/traps.c
++++ xen-3.0-testing/xen/arch/x86/traps.c
+@@ -771,7 +771,14 @@ static inline int admin_io_okay(
}
/* Check admin limits. Silently fail the access if it is disallowed. */
++++++ xen-reboot.diff ++++++
--- /var/tmp/diff_new_pack.Qz1whH/_old 2006-06-14 13:31:36.000000000 +0200
+++ /var/tmp/diff_new_pack.Qz1whH/_new 2006-06-14 13:31:36.000000000 +0200
@@ -6,10 +6,10 @@
Charles - thanks for adding, Jan
-Index: xen-unstable/xen/arch/x86/domain.c
+Index: xen-3.0-testing/xen/arch/x86/domain.c
===================================================================
---- xen-unstable.orig/xen/arch/x86/domain.c
-+++ xen-unstable/xen/arch/x86/domain.c
+--- xen-3.0-testing.orig/xen/arch/x86/domain.c
++++ xen-3.0-testing/xen/arch/x86/domain.c
@@ -21,6 +21,7 @@
#include
#include
@@ -177,7 +177,7 @@
void machine_restart(char * __unused)
{
int i;
-@@ -159,22 +305,117 @@ void machine_restart(char * __unused)
+@@ -161,22 +307,117 @@ void machine_restart(char * __unused)
/* Rebooting needs to touch the page at absolute address 0. */
*((unsigned short *)__va(0x472)) = reboot_mode;
++++++ xen-rpmoptflags.diff ++++++
--- /var/tmp/diff_new_pack.Qz1whH/_old 2006-06-14 13:31:36.000000000 +0200
+++ /var/tmp/diff_new_pack.Qz1whH/_new 2006-06-14 13:31:36.000000000 +0200
@@ -1,7 +1,7 @@
-Index: xen-unstable/Config.mk
+Index: xen-3.0-testing/Config.mk
===================================================================
---- xen-unstable.orig/Config.mk
-+++ xen-unstable/Config.mk
+--- xen-3.0-testing.orig/Config.mk
++++ xen-3.0-testing/Config.mk
@@ -10,7 +10,7 @@ XEN_TARGET_X86_PAE ?= n
# Tools to run on system hosting the build
@@ -11,10 +11,10 @@
AS = $(CROSS_COMPILE)as
LD = $(CROSS_COMPILE)ld
-Index: xen-unstable/xen/tools/figlet/Makefile
+Index: xen-3.0-testing/xen/tools/figlet/Makefile
===================================================================
---- xen-unstable.orig/xen/tools/figlet/Makefile
-+++ xen-unstable/xen/tools/figlet/Makefile
+--- xen-3.0-testing.orig/xen/tools/figlet/Makefile
++++ xen-3.0-testing/xen/tools/figlet/Makefile
@@ -2,7 +2,7 @@
include $(BASEDIR)/../Config.mk
@@ -22,12 +22,12 @@
- $(HOSTCC) -o $@ $<
+ $(HOSTCC) $(HOSTCFLAGS) -o $@ $<
+ .PHONY: clean
clean:
- rm -f *.o figlet
-Index: xen-unstable/tools/firmware/hvmloader/Makefile
+Index: xen-3.0-testing/tools/firmware/hvmloader/Makefile
===================================================================
---- xen-unstable.orig/tools/firmware/hvmloader/Makefile
-+++ xen-unstable/tools/firmware/hvmloader/Makefile
+--- xen-3.0-testing.orig/tools/firmware/hvmloader/Makefile
++++ xen-3.0-testing/tools/firmware/hvmloader/Makefile
@@ -39,7 +39,8 @@ CFLAGS += $(call test-gcc-flag,$(CC),-f
CFLAGS += $(call test-gcc-flag,$(CC),-fno-stack-protector-all)
@@ -37,4 +37,4 @@
+CFLAGS += $(DEFINES) -I. $(XENINC) -fno-builtin -O0 -msoft-float
LDFLAGS = -m32 -nostdlib -Wl,-N -Wl,-Ttext -Wl,$(LOADADDR)
- all: hvmloader
+ .PHONY: all
++++++ xen-unstable-9967-summa.diff ++++++
--- /var/tmp/diff_new_pack.Qz1whH/_old 2006-06-14 13:31:36.000000000 +0200
+++ /var/tmp/diff_new_pack.Qz1whH/_new 2006-06-14 13:31:36.000000000 +0200
@@ -16,9 +16,11 @@
Signed-off-by: donald.d.dugger@intel.com
---- a/tools/ioemu/hw/pc.c Wed May 10 16:05:24 2006 +0100
-+++ b/tools/ioemu/hw/pc.c Wed May 10 16:06:55 2006 +0100
-@@ -381,6 +381,7 @@ void pc_init(uint64_t ram_size, int vga_
+Index: xen-3.0-testing/tools/ioemu/hw/pc.c
+===================================================================
+--- xen-3.0-testing.orig/tools/ioemu/hw/pc.c
++++ xen-3.0-testing/tools/ioemu/hw/pc.c
+@@ -380,6 +380,7 @@ void pc_init(uint64_t ram_size, int vga_
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename)
{
@@ -37,9 +39,11 @@
}
}
---- a/tools/ioemu/hw/pckbd.c Wed May 10 16:05:24 2006 +0100
-+++ b/tools/ioemu/hw/pckbd.c Wed May 10 16:06:55 2006 +0100
-@@ -156,10 +156,23 @@ typedef struct KBDState {
+Index: xen-3.0-testing/tools/ioemu/hw/pckbd.c
+===================================================================
+--- xen-3.0-testing.orig/tools/ioemu/hw/pckbd.c
++++ xen-3.0-testing/tools/ioemu/hw/pckbd.c
+@@ -156,11 +156,24 @@ typedef struct KBDState {
int mouse_dz;
uint8_t mouse_buttons;
CharDriverState *chr;
@@ -48,7 +52,7 @@
} KBDState;
KBDState kbd_state;
-+
+
+#define MODE_STREAM_SWITCH 0
+#define MODE_STREAM 1
+#define MODE_REMOTE 2
@@ -61,9 +65,10 @@
+ int report_mode;
+ int origin;
+} SummaState;
-
++
int summa_ok; /* Allow Summagraphics emulation if true */
+ /* update irq and KBD_STAT_[MOUSE_]OBF */
@@ -420,15 +433,19 @@ static int kbd_mouse_send_packet(KBDStat
switch(s->mouse_type) {
@@ -98,14 +103,12 @@
}
-static void summa(KBDState *s, int val)
--{
-- static int summa = 0;
--
-- if (s->mouse_type == TABLET) {
+static void summa(KBDState *s, uint8_t val)
-+{
+ {
+- static int summa = 0;
+ static int zflg = 0;
-+
+
+- if (s->mouse_type == TABLET) {
+ if (zflg) {
+ zflg = 0;
switch (val) {
@@ -157,8 +160,6 @@
+ case '\0': /* reset */
s->mouse_type = TABLET;
- return;
-- }
-- summa = 0;
+ s->mouse_status |= MOUSE_STATUS_ENABLED;
+ SummaState.origin = ORIGIN_LOWER_LEFT;
+ SummaState.report_mode = (val == 'B') ? MODE_POINT : MODE_STREAM_SWITCH;
@@ -217,7 +218,8 @@
+ default: /* ignore all others */
+ break;
+
-+ }
+ }
+- summa = 0;
+
return;
}
@@ -238,8 +240,10 @@
chr->chr_write = summa_write;
chr->opaque = (void *)&kbd_state;
return;
---- a/tools/ioemu/hw/serial.c Wed May 10 16:05:24 2006 +0100
-+++ b/tools/ioemu/hw/serial.c Wed May 10 16:06:55 2006 +0100
+Index: xen-3.0-testing/tools/ioemu/hw/serial.c
+===================================================================
+--- xen-3.0-testing.orig/tools/ioemu/hw/serial.c
++++ xen-3.0-testing/tools/ioemu/hw/serial.c
@@ -310,7 +310,6 @@ SerialState *serial_init(int base, int i
register_ioport_write(base, 8, 1, serial_ioport_write, s);
register_ioport_read(base, 8, 1, serial_ioport_read, s);
@@ -248,9 +252,11 @@
qemu_chr_add_read_handler(chr, serial_can_receive1, serial_receive1, s);
qemu_chr_add_event_handler(chr, serial_event);
return s;
---- a/tools/ioemu/vl.c Wed May 10 16:05:24 2006 +0100
-+++ b/tools/ioemu/vl.c Wed May 10 16:06:55 2006 +0100
-@@ -2707,7 +2707,8 @@ int main(int argc, char **argv)
+Index: xen-3.0-testing/tools/ioemu/vl.c
+===================================================================
+--- xen-3.0-testing.orig/tools/ioemu/vl.c
++++ xen-3.0-testing/tools/ioemu/vl.c
+@@ -2705,7 +2705,8 @@ int main(int argc, char **argv)
pstrcpy(monitor_device, sizeof(monitor_device), "vc");
pstrcpy(serial_devices[0], sizeof(serial_devices[0]), "vc");
@@ -260,8 +266,10 @@
serial_devices[i][0] = '\0';
serial_device_index = 0;
---- a/tools/ioemu/vl.h Wed May 10 16:05:24 2006 +0100
-+++ b/tools/ioemu/vl.h Wed May 10 16:06:55 2006 +0100
+Index: xen-3.0-testing/tools/ioemu/vl.h
+===================================================================
+--- xen-3.0-testing.orig/tools/ioemu/vl.h
++++ xen-3.0-testing/tools/ioemu/vl.h
@@ -223,6 +223,7 @@ void console_select(unsigned int index);
/* serial ports */
@@ -270,7 +278,7 @@
extern CharDriverState *serial_hds[MAX_SERIAL_PORTS];
-@@ -618,12 +619,6 @@ extern const char* keyboard_layout;
+@@ -618,12 +619,6 @@ void kbd_init(void);
extern const char* keyboard_layout;
extern int repeat_key;
@@ -283,17 +291,16 @@
/* mc146818rtc.c */
typedef struct RTCState RTCState;
-@@ -637,6 +632,12 @@ typedef struct SerialState SerialState;
- typedef struct SerialState SerialState;
+@@ -638,6 +633,12 @@ typedef struct SerialState SerialState;
SerialState *serial_init(int base, int irq, CharDriverState *chr);
void ser_queue(SerialState *s, unsigned char c);
-+
+
+/* Mice */
+
+void summa_init(SerialState *serial, CharDriverState *chr);
+
+extern int summa_ok;
-
++
/* i8259.c */
-
+ void pic_set_irq(int irq, int level);
++++++ xen-warnings.diff ++++++
--- /var/tmp/diff_new_pack.Qz1whH/_old 2006-06-14 13:31:36.000000000 +0200
+++ /var/tmp/diff_new_pack.Qz1whH/_new 2006-06-14 13:31:36.000000000 +0200
@@ -16,7 +16,7 @@
===================================================================
--- xen-3.0-testing.orig/xen/arch/x86/shadow.c
+++ xen-3.0-testing/xen/arch/x86/shadow.c
-@@ -578,7 +578,7 @@ static void shadow_map_l1_into_current_l
+@@ -585,7 +585,7 @@ static void shadow_map_l1_into_current_l
unsigned long gl1pfn, gl1mfn, sl1mfn;
int i, init_table = 0;
@@ -25,7 +25,7 @@
ASSERT(guest_l2e_get_flags(gl2e) & _PAGE_PRESENT);
gl1pfn = l2e_get_pfn(gl2e);
-@@ -630,7 +630,7 @@ static void shadow_map_l1_into_current_l
+@@ -637,7 +637,7 @@ static void shadow_map_l1_into_current_l
if ( !get_shadow_ref(sl1mfn))
BUG();
l2pde_general(d, &gl2e, &sl2e, sl1mfn);
@@ -34,7 +34,7 @@
__shadow_set_l2e(v, va & ~((1<