Hello community,
here is the log from the commit of package xen for openSUSE:Factory
checked in at Thu Mar 24 10:40:56 CET 2011.
--------
--- xen/xen.changes 2011-02-24 19:24:37.000000000 +0100
+++ /mounts/work_src_done/STABLE/xen/xen.changes 2011-03-22 22:15:08.000000000 +0100
@@ -2 +2 @@
-Thu Feb 24 10:17:03 CET 2011 - ohering@suse.de
+Tue Mar 22 15:13:08 MDT 2011 - carnold@novell.com
@@ -4,3 +4 @@
-- bnc#674063 - drop xenpaging.autostart_delay.patch
- avoid python excpetions due to intermediate xenstore and .sxp
- state caused by change of xenpaging variable from int to str
+- Update to c/s 23010 Xen 4.1 rc8
@@ -9 +7 @@
-Fri Feb 11 16:25:51 MST 2011 - carnold@novell.com
+Tue Mar 22 10:53:00 CET 2011 - ohering@suse.de
@@ -11 +9,26 @@
-- Update to Xen 4.0.2 rc2, changeset 21452
+- use _smp_mflags instead of jobs, jobs is not expanded everywhere
+
+-------------------------------------------------------------------
+Mon Mar 21 10:09:50 MDT 2011 - carnold@novell.com
+
+- bnc#681302 - xm create -x <guest> returns "ImportError: No module
+ named ext"
+ xm-create-xflag.patch
+
+-------------------------------------------------------------------
+Mon Mar 14 22:20:39 MDT 2011 - jfehlig@novell.com
+
+- Fix xen-utils to cope with xen-unstable c/s 21483
+
+-------------------------------------------------------------------
+Fri Mar 11 22:28:37 CET 2011 - ohering@suse.de
+
+- xz-devel is available since 11.2, make it optional for SLES11SP1
+
+-------------------------------------------------------------------
+Fri Feb 18 09:46:56 CST 2011 - lidongyang@novell.com
+
+- bnc#665610 - xm console > 1 to same VM messes up both consoles
+ Upstream rejected due to portability concern, see
+ http://lists.xensource.com/archives/html/xen-devel/2011-02/msg00942.html
+ xenconsole-no-multiple-connections.patch
@@ -18,0 +42,5 @@
+
+-------------------------------------------------------------------
+Wed Feb 9 16:38:12 MST 2011 - carnold@novell.com
+
+- Update to Xen 4.1.0 c/s 22861
calling whatdependson for head-i586
Old:
----
20158-revert.patch
21089-x86-startup-irq-from-setup-gsi.patch
21235-crashkernel-advanced.patch
21271-x86-cache-flush-global.patch
21301-svm-lmsl.patch
21304-keyhandler-alternative.patch
21406-x86-microcode-quiet.patch
21421-vtd-ats-enabling.patch
21526-x86-nehalem-cpuid-mask.patch
21542-amd-erratum-411.patch
21615-dont-save-xen-heap-pages.patch
21627-cpuidle-wrap.patch
21653-xend-mac-addr.patch
21678-xend-mac-fix.patch
21683-vtd-kill-timer-conditional.patch
21723-get-domu-state.patch
21810-x2apic-acpi.patch
21847-pscsi.patch
21866-xenapi.patch
21894-intel-unmask-cpuid.patch
22019-x86-cpuidle-online-check.patch
22214-x86-msr-misc-enable.patch
22231-x86-pv-ucode-msr-intel.patch
22235-lxml-validator.patch
22326-cpu-pools-numa-placement.patch
22332-vtd-workarounds.patch
22369-xend-pci-passthru-fix.patch
22388-x2apic-panic.patch
22408-vpmu-nehalem.patch
22431-p2m-remove-bug-check.patch
22475-x2apic-cleanup.patch
22484-vlapic-tmcct-periodic.patch
22504-iommu-dom0-holes.patch
22533-x86-32bit-apicid.patch
22534-x86-max-local-apic.patch
22535-x2apic-preenabled.patch
22645-amd-flush-filter.patch
22693-fam10-mmio-conf-base-protect.patch
22694-x86_64-no-weak.patch
22707-x2apic-preenabled-check.patch
22708-xenctx-misc.patch
22744-ept-pod-locking.patch
22749-vtd-workarounds.patch
22777-vtd-ats-fixes.patch
22781-pod-hap-logdirty.patch
22789-i386-no-x2apic.patch
22790-svm-resume-migrate-pirqs.patch
7410-qemu-alt-gr.patch
7426-xenfb-depth.patch
7433-qemu-altgr.patch
7434-qemu-rlimit-as.patch
blktap2.patch
cpu-pools-docs.patch
cpu-pools-libxc.patch
cpu-pools-libxen.patch
cpu-pools-python.patch
cpu-pools-xmtest.patch
cpupools-core-fixup.patch
cpupools-core.patch
dump-exec-state.patch
enable_more_nic_pxe.patch
hotplug-block-losetup-a.patch
network-route.patch
popen2-argument-fix.patch
xen-4.0.2-testing-src.tar.bz2
xen-extra-fixes.patch
New:
----
xen-4.1.0-testing-src.tar.bz2
xenconsole-no-multiple-connections.patch
xenpaging.autostart_delay.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xen.spec ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:21.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:21.000000000 +0100
@@ -20,12 +20,12 @@
Name: xen
ExclusiveArch: %ix86 x86_64
-%define xvers 4.0
+%define xvers 4.1
%define xvermaj 4
-%define changeset 21452
-%define xen_build_dir xen-4.0.2-testing
+%define changeset 23010
+%define xen_build_dir xen-4.1.0-testing
%define with_kmp 1
-%define with_stubdom 1
+%define with_stubdom 0
BuildRequires: LibVNCServer-devel
BuildRequires: SDL-devel
BuildRequires: automake
@@ -44,7 +44,9 @@
BuildRequires: texinfo
BuildRequires: transfig
BuildRequires: libbz2-devel
+%if %suse_version >= 1120
BuildRequires: xz-devel
+%endif
%if %suse_version <= 1110
BuildRequires: pmtools
%else
@@ -72,14 +74,14 @@
%if %{?with_kmp}0
BuildRequires: kernel-source kernel-syms module-init-tools xorg-x11
%endif
-Version: 4.0.2_02
-Release: 6
+Version: 4.1.0_01
+Release: 1
License: GPLv2+
Group: System/Kernel
AutoReqProv: on
PreReq: %insserv_prereq %fillup_prereq
Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel)
-Source0: xen-4.0.2-testing-src.tar.bz2
+Source0: xen-4.1.0-testing-src.tar.bz2
Source1: stubdom.tar.bz2
Source2: xen-utils-0.1.tar.bz2
Source3: README.SuSE
@@ -112,56 +114,7 @@
# http://xenbits.xensource.com/ext/xenalyze.hg
Source20000: xenalyze.hg.tar.bz2
# Upstream patches
-Patch0: 21089-x86-startup-irq-from-setup-gsi.patch
-Patch1: 21235-crashkernel-advanced.patch
-Patch2: 21271-x86-cache-flush-global.patch
-Patch3: 21301-svm-lmsl.patch
-Patch4: 21304-keyhandler-alternative.patch
-Patch5: 21406-x86-microcode-quiet.patch
-Patch6: 21421-vtd-ats-enabling.patch
-Patch7: 21526-x86-nehalem-cpuid-mask.patch
-Patch8: 21542-amd-erratum-411.patch
-Patch9: 21615-dont-save-xen-heap-pages.patch
-Patch10: 21627-cpuidle-wrap.patch
-Patch11: 21653-xend-mac-addr.patch
-Patch12: 21678-xend-mac-fix.patch
-Patch13: 21683-vtd-kill-timer-conditional.patch
-Patch14: 21723-get-domu-state.patch
-Patch15: 21810-x2apic-acpi.patch
-Patch16: 21847-pscsi.patch
-Patch17: 21866-xenapi.patch
-Patch18: 21894-intel-unmask-cpuid.patch
-Patch19: 22019-x86-cpuidle-online-check.patch
-Patch20: 22214-x86-msr-misc-enable.patch
-Patch21: 22332-vtd-workarounds.patch
-Patch22: 22231-x86-pv-ucode-msr-intel.patch
-Patch23: 22235-lxml-validator.patch
-Patch24: 22369-xend-pci-passthru-fix.patch
-Patch25: 22388-x2apic-panic.patch
-Patch26: 22408-vpmu-nehalem.patch
-Patch27: 22431-p2m-remove-bug-check.patch
-Patch28: 22475-x2apic-cleanup.patch
-Patch29: 22484-vlapic-tmcct-periodic.patch
-Patch30: 22504-iommu-dom0-holes.patch
-Patch31: 22533-x86-32bit-apicid.patch
-Patch32: 22534-x86-max-local-apic.patch
-Patch33: 22535-x2apic-preenabled.patch
-Patch34: 22645-amd-flush-filter.patch
-Patch35: 22693-fam10-mmio-conf-base-protect.patch
-Patch36: 22694-x86_64-no-weak.patch
-Patch37: 22707-x2apic-preenabled-check.patch
-Patch38: 22708-xenctx-misc.patch
-Patch39: 22744-ept-pod-locking.patch
-Patch40: 22749-vtd-workarounds.patch
-Patch41: 22777-vtd-ats-fixes.patch
-Patch42: 22781-pod-hap-logdirty.patch
-Patch43: 22789-i386-no-x2apic.patch
-Patch44: 22790-svm-resume-migrate-pirqs.patch
# Upstream qemu patches
-Patch200: 7410-qemu-alt-gr.patch
-Patch201: 7426-xenfb-depth.patch
-Patch202: 7433-qemu-altgr.patch
-Patch203: 7434-qemu-rlimit-as.patch
# Our patches
Patch300: xen-config.diff
Patch301: xend-config.diff
@@ -178,16 +131,14 @@
Patch312: serial-split.patch
Patch313: xen-xm-top-needs-root.diff
Patch314: xen-max-free-mem.diff
-Patch317: xen-extra-fixes.patch
Patch322: bridge-opensuse.patch
Patch323: bridge-vlan.diff
Patch324: bridge-bonding.diff
Patch325: bridge-record-creation.patch
Patch326: network-nat.patch
Patch327: udev-rules.patch
-Patch328: network-route.patch
-Patch329: vif-route-ifup.patch
-Patch330: network-nat-open-SuSEfirewall2-FORWARD.patch
+Patch328: vif-route-ifup.patch
+Patch329: network-nat-open-SuSEfirewall2-FORWARD.patch
Patch340: xen-hvm-default-bridge.diff
Patch341: xen-hvm-default-pae.diff
Patch342: xm-test-cleanup.diff
@@ -206,25 +157,16 @@
Patch356: ioemu-vnc-resize.patch
Patch357: ioemu-debuginfo.patch
Patch358: vif-bridge-no-iptables.patch
+Patch359: xenconsole-no-multiple-connections.patch
# Needs to go upstream
Patch360: checkpoint-rename.patch
Patch361: xm-save-check-file.patch
Patch362: xm-create-xflag.patch
-Patch363: cpupools-core.patch
-Patch364: cpupools-core-fixup.patch
-Patch365: cpu-pools-libxc.patch
-Patch366: cpu-pools-python.patch
-Patch367: cpu-pools-libxen.patch
-Patch368: cpu-pools-xmtest.patch
-Patch369: cpu-pools-docs.patch
Patch370: xend-sysconfig.patch
Patch371: domu-usb-controller.patch
-Patch372: popen2-argument-fix.patch
-Patch373: usb-list.patch
-Patch374: xend-devid-or-name.patch
-Patch375: 22326-cpu-pools-numa-placement.patch
-Patch376: 20158-revert.patch
-Patch377: suspend_evtchn_lock.patch
+Patch372: usb-list.patch
+Patch373: xend-devid-or-name.patch
+Patch374: suspend_evtchn_lock.patch
# Patches for snapshot support
Patch400: snapshot-ioemu-save.patch
Patch401: snapshot-ioemu-restore.patch
@@ -250,7 +192,6 @@
Patch429: hibernate.patch
Patch430: del_usb_xend_entry.patch
Patch431: capslock_enable.patch
-Patch432: enable_more_nic_pxe.patch
Patch433: multi-xvdp.patch
Patch434: check_device_status.patch
Patch435: change_home_server.patch
@@ -258,7 +199,6 @@
Patch438: stdvga-cache.patch
Patch439: minios-fixups.patch
Patch440: bdrv_default_rwflag.patch
-Patch441: blktap2.patch
Patch442: xen-minimum-restart-time.patch
Patch443: vif-bridge.mtu.patch
Patch444: xentrace.dynamic_sized_tbuf.patch
@@ -268,7 +208,6 @@
Patch500: 32on64-extra-mem.patch
Patch501: x86-ioapic-ack-default.patch
Patch502: x86-cpufreq-report.patch
-Patch503: dump-exec-state.patch
Patch504: dom-print.patch
Patch505: pvdrv-import-shared-info.patch
Patch506: x86-show-page-walk-early.patch
@@ -285,7 +224,6 @@
# Build patch
Patch999: tmp_build.patch
# FATE 310510
-Patch902: hotplug-block-losetup-a.patch
Patch10001: xenpaging.tools_xenpaging_cleanup.patch
Patch10002: xenpaging.pageout_policy.patch
Patch10003: xenpaging.get_paged_frame.patch
@@ -302,6 +240,7 @@
Patch10020: xenpaging.guest_remove_page.patch
Patch10021: xenpaging.mem_event_check_ring-free_requests.patch
Patch10022: xenpaging.blacklist.patch
+Patch10023: xenpaging.autostart_delay.patch
Patch10024: xenpaging.page_already_populated.patch
Patch10025: xenpaging.notify_policy_only_once.patch
Patch10026: xenpaging.num_pages_equal_max_pages.patch
@@ -646,55 +585,6 @@
%prep
%setup -q -n %xen_build_dir -a 1 -a 20000
tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
-%patch41 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
-%patch200 -p1
-%patch201 -p1
-%patch202 -p1
-%patch203 -p1
%patch300 -p1
%patch301 -p1
%patch302 -p1
@@ -710,7 +600,6 @@
%patch312 -p1
%patch313 -p1
%patch314 -p1
-%patch317 -p1
%patch322 -p1
%patch323 -p1
%patch324 -p1
@@ -719,11 +608,10 @@
%patch327 -p1
%patch328 -p1
%patch329 -p1
-%patch330 -p1
%patch340 -p1
%patch341 -p1
%patch342 -p1
-%patch343 -p1
+#%patch343 -p1 kexec
%patch344 -p1
%patch345 -p1
%patch346 -p1
@@ -734,28 +622,19 @@
%patch352 -p1
%patch353 -p1
%patch354 -p1
-%patch355 -p1
+###%patch355 -p1 gdbserver
%patch356 -p1
%patch357 -p1
%patch358 -p1
+%patch359 -p1
%patch360 -p1
%patch361 -p1
%patch362 -p1
-%patch363 -p1
-%patch364 -p1
-%patch365 -p1
-%patch366 -p1
-%patch367 -p1
-%patch368 -p1
-%patch369 -p1
%patch370 -p1
%patch371 -p1
%patch372 -p1
%patch373 -p1
-%patch374 -p1
-%patch375 -p1
-%patch376 -p1
-#%patch377 -p1
+#%patch374 -p1 suspend_evtchn_lock, buildservice build problem
%patch400 -p1
%patch401 -p1
%patch402 -p1
@@ -778,7 +657,6 @@
%patch429 -p1
%patch430 -p1
%patch431 -p1
-%patch432 -p1
%patch433 -p1
%patch434 -p1
%patch435 -p1
@@ -786,7 +664,6 @@
%patch438 -p1
%patch439 -p1
%patch440 -p1
-%patch441 -p1
%patch442 -p1
%patch443 -p1
%patch444 -p1
@@ -794,7 +671,6 @@
%patch500 -p1
%patch501 -p1
%patch502 -p1
-%patch503 -p1
%patch504 -p1
%patch505 -p1
%patch506 -p1
@@ -809,34 +685,34 @@
%patch652 -p1
%patch700 -p1
%patch999 -p1
-%patch902 -p1
-%patch10001 -p1
-%patch10002 -p1
-%patch10003 -p1
-%patch10004 -p1
-%patch10010 -p1
-%patch10011 -p1
-%patch10012 -p1
-%patch10013 -p1
-%patch10014 -p1
-%patch10015 -p1
-%patch10017 -p1
-%patch10018 -p1
-%patch10019 -p1
-%patch10020 -p1
-%patch10021 -p1
-%patch10022 -p1
-%patch10024 -p1
-%patch10025 -p1
-%patch10026 -p1
-%patch10027 -p1
-%patch10028 -p1
-%patch10029 -p1
-%patch10030 -p1
-%patch10031 -p1
-%patch10032 -p1
-%patch10033 -p1
-%patch10040 -p1
+#%patch10001 -p1
+#%patch10002 -p1
+#%patch10003 -p1
+#%patch10004 -p1
+#%patch10010 -p1
+#%patch10011 -p1
+#%patch10012 -p1
+#%patch10013 -p1
+#%patch10014 -p1
+#%patch10015 -p1
+#%patch10017 -p1
+#%patch10018 -p1
+#%patch10019 -p1
+#%patch10020 -p1
+#%patch10021 -p1
+#%patch10022 -p1
+#%patch10023 -p1
+#%patch10024 -p1
+#%patch10025 -p1
+#%patch10026 -p1
+#%patch10027 -p1
+#%patch10028 -p1
+#%patch10029 -p1
+#%patch10030 -p1
+#%patch10031 -p1
+#%patch10032 -p1
+#%patch10033 -p1
+#%patch10040 -p1
%build
XEN_EXTRAVERSION=%version-%release
@@ -846,13 +722,13 @@
RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/}
export CFLAGS="${RPM_OPT_FLAGS}"
export RPM_OPT_FLAGS
-make -C xenalyze.hg CC="gcc -I../xen/include" %{?jobs:-j%{jobs}}
-make -C tools/include/xen-foreign %{?jobs:-j%{jobs}}
-make tools docs %{?jobs:-j%{jobs}}
-cd tools/debugger/gdb
-# there are code problems that don't pass the 02-check-gcc-output, hence bitbucket
-env MAKE="make %{?jobs:-j%{jobs}}" ./gdbbuild 1>/dev/null 2>/dev/null
-cd ../../..
+make -C xenalyze.hg CC="gcc -I../xen/include" %{?_smp_mflags}
+make -C tools/include/xen-foreign %{?_smp_mflags}
+make tools docs %{?_smp_mflags}
+make -C tools/debugger/gdbsx
+#### there are code problems that don't pass the 02-check-gcc-output, hence bitbucket
+###env MAKE="make %{?_smp_mflags}" ./gdbbuild 1>/dev/null 2>/dev/null
+###cd ../../..
%if %{?with_kmp}0
# pv driver modules
export XL=/usr/src/linux
@@ -864,7 +740,7 @@
cd obj/$flavor
./mkbuildtree
make -C /usr/src/linux-obj/%_target_cpu/$flavor modules \
- %{?jobs:-j%{jobs}} \
+ %{?_smp_mflags} \
M=$PWD
cd ../..
done
@@ -894,23 +770,23 @@
ln -s xen${ext}-%{version}-%{release}.gz $RPM_BUILD_ROOT/boot/xen${ext}.gz
ln -sf xen-syms${ext}-%{version}-%{release} $RPM_BUILD_ROOT/boot/xen-syms${ext}
}
-make -C xen install max_phys_cpus=%{max_cpus} pae=%{pae_enabled} debug=y crash_debug=y DESTDIR=$RPM_BUILD_ROOT %{?jobs:-j%{jobs}}
+make -C xen install max_phys_cpus=%{max_cpus} pae=%{pae_enabled} debug=y crash_debug=y DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags}
install_xen dbg
make -C xen clean
-make -C xen install max_phys_cpus=%{max_cpus} pae=%{pae_enabled} debug=n crash_debug=n DESTDIR=$RPM_BUILD_ROOT %{?jobs:-j%{jobs}}
+make -C xen install max_phys_cpus=%{max_cpus} pae=%{pae_enabled} debug=n crash_debug=n DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags}
install_xen
make -C xen clean
export CFLAGS="$RPM_OPT_FLAGS"
export RPM_OPT_FLAGS
-make -C tools/include/xen-foreign %{?jobs:-j%{jobs}}
+make -C tools/include/xen-foreign %{?_smp_mflags}
# tools
export XEN_PYTHON_NATIVE_INSTALL=1
make -C tools install \
- DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} %{?jobs:-j%{jobs}}
-cp tools/debugger/gdb/gdb-6.2.1-linux-i386-xen/gdb/gdbserver/gdbserver-xen $RPM_BUILD_ROOT/usr/bin/gdbserver-xen
+ DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} %{?_smp_mflags}
+###cp tools/debugger/gdb/gdb-6.2.1-linux-i386-xen/gdb/gdbserver/gdbserver-xen $RPM_BUILD_ROOT/usr/bin/gdbserver-xen
rm -f $RPM_BUILD_ROOT/usr/sbin/{qcow-create,img2qcow,qcow2raw}
make -C tools/misc/serial-split install \
- DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} %{?jobs:-j%{jobs}}
+ DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} %{?_smp_mflags}
%ifarch x86_64
mkdir -p $RPM_BUILD_ROOT/${_libdir}/xen/bin/
ln -s /usr/lib/xen/bin/qemu-dm $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-dm
@@ -930,7 +806,7 @@
%endif
%if %{?with_stubdom}0
# stubdom
-make stubdom %{?jobs:-j%{jobs}}
+make stubdom %{?_smp_mflags}
make -C stubdom install \
DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} \
DOCDIR=%{_defaultdocdir}/xen INCDIR=%{_includedir}
@@ -1052,6 +928,7 @@
%{_libdir}/libxen*.so.*
%{_libdir}/libvhd.so.*
%{_libdir}/libxlutil.so.*
+%{_libdir}/libblktapctl.so.*
%files tools
%defattr(-,root,root)
@@ -1065,7 +942,7 @@
#/usr/bin/qemu-img-xen
#/usr/bin/qemu-nbd-xen
/usr/bin/tapdisk-ioemu
-/usr/bin/gdbserver-xen
+#/usr/bin/gdbserver-xen
#/usr/bin/remus
/usr/sbin/blktapctrl
/usr/sbin/flask-loadpolicy
@@ -1077,7 +954,7 @@
/usr/sbin/xen*
/usr/sbin/xm
/usr/sbin/xsview
-/usr/sbin/fs-backend
+#/usr/sbin/fs-backend
/usr/sbin/gtracestat
/usr/sbin/gtraceview
/usr/sbin/lock-util
@@ -1091,6 +968,8 @@
/usr/sbin/xen-list
/usr/sbin/gdbsx
/usr/sbin/xl
+/usr/sbin/kdd
+/usr/sbin/tap-ctl
%dir %{_libdir}/xen
%dir %{_libdir}/xen/bin
%ifarch x86_64
@@ -1104,7 +983,7 @@
%{_libdir}/xen/bin/xenconsole
%{_libdir}/xen/bin/xenctx
%{_libdir}/xen/bin/lsevtchn
-%{_libdir}/xen/bin/imqebt
+#%{_libdir}/xen/bin/imqebt
%{_mandir}/man1/*.1.gz
%{_mandir}/man5/*.5.gz
%{_mandir}/man8/*.8.gz
@@ -1122,18 +1001,22 @@
%dir /var/log/xen
/etc/init.d/xend
/etc/init.d/xendomains
+/etc/init.d/xencommons
+/etc/init.d/xen-watchdog
%config /etc/logrotate.d/xen
%dir %attr(700,root,root) /etc/xen
/etc/xen/auto
%config /etc/xen/examples
/etc/xen/images
/etc/xen/scripts
+/etc/xen/cpupool
#/etc/xen/scripts/qemu-ifup
/etc/xen/README*
%config /etc/xen/vm
%config(noreplace) /etc/xen/*.sxp
%config(noreplace) /etc/xen/*.xml
%config(noreplace) /etc/xen/xenapiusers
+%config(noreplace) /etc/xen/xl.conf
%config /etc/pam.d/xen-api
%config /etc/modprobe.d/xen_loop.conf
%dir /etc/modprobe.d
@@ -1177,9 +1060,11 @@
%{_libdir}/xen/bin/qemu-dm
%ifarch x86_64
/usr/lib/xen/bin/qemu-dm
-/usr/lib64/xen/bin/xc_kexec
+# NEEDS FIXING
+##/usr/lib64/xen/bin/xc_kexec
%else
-/usr/lib/xen/bin/xc_kexec
+# NEEDS FIXING
+#/usr/lib/xen/bin/xc_kexec
%endif
/usr/lib/xen/boot/hvmloader
#%pysite/xen/*
@@ -1216,6 +1101,8 @@
%{_libdir}/libvhd.so
%{_libdir}/libxlutil.a
%{_libdir}/libxlutil.so
+%{_libdir}/libblktapctl.a
+%{_libdir}/libblktapctl.so
/usr/bin/serial-split
/usr/include/blktaplib.h
/usr/include/fsimage*
@@ -1224,6 +1111,8 @@
/usr/include/xs.h
/usr/include/xs_lib.h
/usr/include/libxl.h
+/usr/include/_libxl_types.h
+/usr/include/libxl_uuid.h
%files doc-html
%defattr(-,root,root)
++++++ 32on64-extra-mem.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:21.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:21.000000000 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
-@@ -2919,7 +2919,7 @@ class XendDomainInfo:
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
+@@ -2912,7 +2912,7 @@ class XendDomainInfo:
self.guest_bitsize = self.image.getBitSize()
# Make sure there's enough RAM available for the domain
++++++ altgr_2.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:21.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:21.000000000 +0100
@@ -29,10 +29,10 @@
Signed-off by Chunyan Liu (cyliu@novell.com)
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/vnc.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/vnc.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/vnc.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/vnc.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/vnc.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/vnc.c
@@ -1308,6 +1308,9 @@ static void do_key_event(VncState *vs, i
shift_keys = vs->modifiers_state[0x2a] | vs->modifiers_state[0x36];
altgr_keys = vs->modifiers_state[0xb8];
++++++ bdrv_default_rwflag.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:21.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:21.000000000 +0100
@@ -1,11 +1,11 @@
Subject: modify default read/write flag in bdrv_init.
Signed-off by Chunyan Liu
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/vl.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/vl.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/vl.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/vl.c
-@@ -2612,6 +2612,8 @@ int drive_init(struct drive_opt *arg, in
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/vl.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/vl.c
+@@ -2617,6 +2617,8 @@ int drive_init(struct drive_opt *arg, in
strncpy(drives_table[nb_drives].serial, serial, sizeof(serial));
nb_drives++;
@@ -13,8 +13,8 @@
+
switch(type) {
case IF_IDE:
- case IF_SCSI:
-@@ -2624,6 +2626,7 @@ int drive_init(struct drive_opt *arg, in
+ case IF_XEN:
+@@ -2630,6 +2632,7 @@ int drive_init(struct drive_opt *arg, in
break;
case MEDIA_CDROM:
bdrv_set_type_hint(bdrv, BDRV_TYPE_CDROM);
@@ -22,7 +22,7 @@
break;
}
break;
-@@ -2644,7 +2647,6 @@ int drive_init(struct drive_opt *arg, in
+@@ -2650,7 +2653,6 @@ int drive_init(struct drive_opt *arg, in
}
if (!file[0])
return -2;
++++++ bdrv_open2_fix_flags.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:21.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:21.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/block.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/block.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/block.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/block.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/block.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/block.c
@@ -350,7 +350,7 @@ int bdrv_file_open(BlockDriverState **pb
int bdrv_open(BlockDriverState *bs, const char *filename, int flags)
@@ -28,10 +28,10 @@
ret = drv->bdrv_open(bs, filename, open_flags);
if ((ret == -EACCES || ret == -EPERM) && !(flags & BDRV_O_FILE)) {
ret = drv->bdrv_open(bs, filename, open_flags & ~BDRV_O_RDWR);
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/usb-msd.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/usb-msd.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/usb-msd.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/usb-msd.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/usb-msd.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/usb-msd.c
@@ -551,7 +551,7 @@ USBDevice *usb_msd_init(const char *file
s = qemu_mallocz(sizeof(MSDState));
@@ -41,10 +41,10 @@
goto fail;
s->bs = bdrv;
*pbs = bdrv;
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-img.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/qemu-img.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/qemu-img.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-img.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/qemu-img.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/qemu-img.c
@@ -32,7 +32,7 @@
#endif
++++++ bdrv_open2_flags_2.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:21.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:21.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
@@ -237,6 +237,7 @@ static int open_disk(struct td_state *s,
BlockDriver* drv;
char* devname;
@@ -19,10 +19,10 @@
fprintf(stderr, "Could not open image file %s\n", path);
return -ENOMEM;
}
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/xenstore.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/xenstore.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c
@@ -136,7 +136,8 @@ static void insert_media(void *opaque)
else
format = &bdrv_raw;
@@ -33,7 +33,7 @@
#ifdef CONFIG_STUBDOM
{
char *buf, *backend, *params_path, *params;
-@@ -469,7 +470,8 @@ void xenstore_parse_domain_config(int hv
+@@ -511,7 +512,8 @@ void xenstore_parse_domain_config(int hv
}
for (i = 0; i < num; i++) {
@@ -43,7 +43,7 @@
/* read the backend path */
xenstore_get_backend_path(&bpath, "vbd", danger_path, hvm_domid, e_danger[i]);
if (bpath == NULL)
-@@ -555,6 +557,17 @@ void xenstore_parse_domain_config(int hv
+@@ -597,6 +599,17 @@ void xenstore_parse_domain_config(int hv
format = &bdrv_raw;
}
@@ -61,7 +61,7 @@
#if 0
/* Phantom VBDs are disabled because the use of paths
* from guest-controlled areas in xenstore is unsafe.
-@@ -622,7 +635,7 @@ void xenstore_parse_domain_config(int hv
+@@ -664,7 +677,7 @@ void xenstore_parse_domain_config(int hv
#ifdef CONFIG_STUBDOM
if (pasprintf(&danger_buf, "%s/device/vbd/%s", danger_path, e_danger[i]) == -1)
continue;
@@ -70,7 +70,7 @@
pstrcpy(bs->filename, sizeof(bs->filename), params);
}
#else
-@@ -668,7 +681,7 @@ void xenstore_parse_domain_config(int hv
+@@ -710,7 +723,7 @@ void xenstore_parse_domain_config(int hv
fprintf(stderr, "Using file %s in read-%s mode\n", bs->filename, is_readonly ? "only" : "write");
++++++ blktap-pv-cdrom.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:21.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:21.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/blktap/drivers/block-cdrom.c
+Index: xen-4.1.0-testing/tools/blktap/drivers/block-cdrom.c
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/blktap/drivers/block-cdrom.c
++++ xen-4.1.0-testing/tools/blktap/drivers/block-cdrom.c
@@ -0,0 +1,535 @@
+/* block-cdrom.c
+ *
@@ -538,10 +538,10 @@
+ .td_get_parent_id = tdcdrom_get_parent_id,
+ .td_validate_parent = tdcdrom_validate_parent
+};
-Index: xen-4.0.2-testing/xen/include/public/io/cdromif.h
+Index: xen-4.1.0-testing/xen/include/public/io/cdromif.h
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/xen/include/public/io/cdromif.h
++++ xen-4.1.0-testing/xen/include/public/io/cdromif.h
@@ -0,0 +1,122 @@
+/******************************************************************************
+ * cdromif.h
@@ -665,19 +665,19 @@
+ sizeof(struct vcd_generic_command) - sizeof(struct request_sense))
+
+#endif
-Index: xen-4.0.2-testing/tools/blktap/drivers/Makefile
+Index: xen-4.1.0-testing/tools/blktap/drivers/Makefile
===================================================================
---- xen-4.0.2-testing.orig/tools/blktap/drivers/Makefile
-+++ xen-4.0.2-testing/tools/blktap/drivers/Makefile
+--- xen-4.1.0-testing.orig/tools/blktap/drivers/Makefile
++++ xen-4.1.0-testing/tools/blktap/drivers/Makefile
@@ -28,8 +28,9 @@ CFLAGS += -DMEMSHR
MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a
endif
--LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) $(MEMSHRLIBS) -L../lib -lblktap -lrt -lm -lpthread
--LDFLAGS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz
-+LDFLAGS_xen := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore)
-+LDFLAGS_blktapctrl := $(LDFLAGS_xen) $(MEMSHRLIBS) -L../lib -lblktap -lrt -lm -lpthread $(LDFLAGS_xen)
-+LDFLAGS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz $(LDFLAGS_xen)
+-LDLIBS_blktapctrl := $(MEMSHRLIBS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) -L../lib -lblktap -lrt -lm -lpthread
+-LDLIBS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz
++LDLIBS_xen := $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore)
++LDLIBS_blktapctrl := $(MEMSHRLIBS) $(LDLIBS_xen) -L../lib -lblktap -lrt -lm -lpthread
++LDLIBS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz $(LDLIBS_xen)
BLK-OBJS-y := block-aio.o
BLK-OBJS-y += block-sync.o
@@ -689,10 +689,10 @@
BLK-OBJS-y += aes.o
BLK-OBJS-y += tapaio.o
BLK-OBJS-$(CONFIG_Linux) += blk_linux.o
-Index: xen-4.0.2-testing/tools/blktap/drivers/tapdisk.h
+Index: xen-4.1.0-testing/tools/blktap/drivers/tapdisk.h
===================================================================
---- xen-4.0.2-testing.orig/tools/blktap/drivers/tapdisk.h
-+++ xen-4.0.2-testing/tools/blktap/drivers/tapdisk.h
+--- xen-4.1.0-testing.orig/tools/blktap/drivers/tapdisk.h
++++ xen-4.1.0-testing/tools/blktap/drivers/tapdisk.h
@@ -137,6 +137,9 @@ struct tap_disk {
int (*td_get_parent_id) (struct disk_driver *dd, struct disk_id *id);
int (*td_validate_parent)(struct disk_driver *dd,
@@ -737,10 +737,10 @@
};
typedef struct driver_list_entry {
-Index: xen-4.0.2-testing/tools/blktap/lib/blktaplib.h
+Index: xen-4.1.0-testing/tools/blktap/lib/blktaplib.h
===================================================================
---- xen-4.0.2-testing.orig/tools/blktap/lib/blktaplib.h
-+++ xen-4.0.2-testing/tools/blktap/lib/blktaplib.h
+--- xen-4.1.0-testing.orig/tools/blktap/lib/blktaplib.h
++++ xen-4.1.0-testing/tools/blktap/lib/blktaplib.h
@@ -225,6 +225,7 @@ typedef struct msg_pid {
#define DISK_TYPE_RAM 3
#define DISK_TYPE_QCOW 4
@@ -749,25 +749,23 @@
/* xenstore/xenbus: */
#define DOMNAME "Domain-0"
-Index: xen-4.0.2-testing/xen/include/public/io/blkif.h
+Index: xen-4.1.0-testing/xen/include/public/io/blkif.h
===================================================================
---- xen-4.0.2-testing.orig/xen/include/public/io/blkif.h
-+++ xen-4.0.2-testing/xen/include/public/io/blkif.h
-@@ -76,6 +76,10 @@
- * "feature-flush-cache" node!
+--- xen-4.1.0-testing.orig/xen/include/public/io/blkif.h
++++ xen-4.1.0-testing/xen/include/public/io/blkif.h
+@@ -80,7 +80,7 @@
+ * Used in SLES sources for device specific command packet
+ * contained within the request. Reserved for that purpose.
*/
- #define BLKIF_OP_FLUSH_DISKCACHE 3
-+/*
-+ * Device specific command packet contained within the request
-+ */
-+#define BLKIF_OP_PACKET 4
-
+-#define BLKIF_OP_RESERVED_1 4
++#define BLKIF_OP_PACKET 4
/*
- * Maximum scatter/gather segments per request.
-Index: xen-4.0.2-testing/tools/blktap/drivers/tapdisk.c
+ * Recognised only if "feature-trim" is present in backend xenbus info.
+ * The "feature-trim" node contains a boolean indicating whether trim
+Index: xen-4.1.0-testing/tools/blktap/drivers/tapdisk.c
===================================================================
---- xen-4.0.2-testing.orig/tools/blktap/drivers/tapdisk.c
-+++ xen-4.0.2-testing/tools/blktap/drivers/tapdisk.c
+--- xen-4.1.0-testing.orig/tools/blktap/drivers/tapdisk.c
++++ xen-4.1.0-testing/tools/blktap/drivers/tapdisk.c
@@ -735,6 +735,22 @@ static void get_io_request(struct td_sta
goto out;
}
@@ -791,11 +789,11 @@
default:
DPRINTF("Unknown block operation\n");
break;
-Index: xen-4.0.2-testing/tools/python/xen/xend/server/BlktapController.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/server/BlktapController.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/server/BlktapController.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/server/BlktapController.py
-@@ -21,6 +21,7 @@ blktap1_disk_types = [
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/server/BlktapController.py
++++ xen-4.1.0-testing/tools/python/xen/xend/server/BlktapController.py
+@@ -15,6 +15,7 @@ blktap1_disk_types = [
'ram',
'qcow',
'qcow2',
++++++ blktap.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:21.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:21.000000000 +0100
@@ -1,11 +1,11 @@
bug #239173
bug #242953
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
-@@ -3291,7 +3291,7 @@ class XendDomainInfo:
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
+@@ -3295,7 +3295,7 @@ class XendDomainInfo:
(fn, BOOTLOADER_LOOPBACK_DEVICE))
vbd = {
@@ -14,11 +14,11 @@
'device': BOOTLOADER_LOOPBACK_DEVICE,
}
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/xenstore.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
-@@ -397,9 +397,9 @@ void xenstore_parse_domain_config(int hv
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/xenstore.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c
+@@ -447,9 +447,9 @@ void xenstore_parse_domain_config(int hv
{
char **e_danger = NULL;
char *buf = NULL;
@@ -30,7 +30,7 @@
unsigned int len, num, hd_index, pci_devid = 0;
BlockDriverState *bs;
BlockDriver *format;
-@@ -444,6 +444,14 @@ void xenstore_parse_domain_config(int hv
+@@ -486,6 +486,14 @@ void xenstore_parse_domain_config(int hv
e_danger[i]);
if (bpath == NULL)
continue;
@@ -45,7 +45,7 @@
/* read the name of the device */
if (pasprintf(&buf, "%s/dev", bpath) == -1)
continue;
-@@ -738,6 +746,7 @@ void xenstore_parse_domain_config(int hv
+@@ -775,6 +783,7 @@ void xenstore_parse_domain_config(int hv
free(mode);
free(params);
free(dev);
++++++ blktapctrl-default-to-ioemu.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:21.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:21.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/blktap/drivers/tapdisk.h
+Index: xen-4.1.0-testing/tools/blktap/drivers/tapdisk.h
===================================================================
---- xen-4.0.2-testing.orig/tools/blktap/drivers/tapdisk.h
-+++ xen-4.0.2-testing/tools/blktap/drivers/tapdisk.h
+--- xen-4.1.0-testing.orig/tools/blktap/drivers/tapdisk.h
++++ xen-4.1.0-testing/tools/blktap/drivers/tapdisk.h
@@ -168,7 +168,7 @@ static disk_info_t aio_disk = {
"raw image (aio)",
"aio",
++++++ bridge-bonding.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.0.2-testing/tools/hotplug/Linux/network-bridge
+Index: xen-4.1.0-testing/tools/hotplug/Linux/network-bridge
===================================================================
---- xen-4.0.2-testing.orig/tools/hotplug/Linux/network-bridge
-+++ xen-4.0.2-testing/tools/hotplug/Linux/network-bridge
-@@ -245,6 +245,9 @@ op_start () {
+--- xen-4.1.0-testing.orig/tools/hotplug/Linux/network-bridge
++++ xen-4.1.0-testing/tools/hotplug/Linux/network-bridge
+@@ -249,6 +249,9 @@ op_start () {
claim_lock "network-bridge"
@@ -12,14 +12,14 @@
vlans=$(find_active_vlans "${netdev}")
for vlan in $vlans ; do ifdown $vlan ; done
-@@ -262,18 +265,32 @@ op_start () {
+@@ -266,18 +269,32 @@ op_start () {
ip link set ${netdev} down
ip addr flush ${netdev}
fi
- ip link set ${netdev} name ${pdev}
- ip link set ${tdev} name ${bridge}
-
-- setup_bridge_port ${pdev}
+- setup_physical_bridge_port ${pdev}
- # Restore slaves
- if [ -n "${slaves}" ]; then
++++++ bridge-opensuse.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.0.2-testing/tools/hotplug/Linux/network-bridge
+Index: xen-4.1.0-testing/tools/hotplug/Linux/network-bridge
===================================================================
---- xen-4.0.2-testing.orig/tools/hotplug/Linux/network-bridge
-+++ xen-4.0.2-testing/tools/hotplug/Linux/network-bridge
-@@ -270,19 +270,19 @@ op_stop () {
+--- xen-4.1.0-testing.orig/tools/hotplug/Linux/network-bridge
++++ xen-4.1.0-testing/tools/hotplug/Linux/network-bridge
+@@ -278,19 +278,19 @@ op_stop () {
transfer_addrs ${bridge} ${pdev}
if ! ifdown ${bridge}; then
get_ip_info ${bridge}
++++++ bridge-record-creation.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.0.2-testing/tools/hotplug/Linux/network-bridge
+Index: xen-4.1.0-testing/tools/hotplug/Linux/network-bridge
===================================================================
---- xen-4.0.2-testing.orig/tools/hotplug/Linux/network-bridge
-+++ xen-4.0.2-testing/tools/hotplug/Linux/network-bridge
-@@ -253,6 +253,11 @@ op_start () {
+--- xen-4.1.0-testing.orig/tools/hotplug/Linux/network-bridge
++++ xen-4.1.0-testing/tools/hotplug/Linux/network-bridge
+@@ -257,6 +257,11 @@ op_start () {
create_bridge ${tdev}
@@ -14,7 +14,7 @@
preiftransfer ${netdev}
transfer_addrs ${netdev} ${tdev}
# Remember slaves for bonding interface.
-@@ -330,6 +335,13 @@ op_stop () {
+@@ -338,6 +343,13 @@ op_stop () {
ip link set ${pdev} name ${netdev}
do_ifup ${netdev}
++++++ bridge-vlan.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/hotplug/Linux/network-bridge
+Index: xen-4.1.0-testing/tools/hotplug/Linux/network-bridge
===================================================================
---- xen-4.0.2-testing.orig/tools/hotplug/Linux/network-bridge
-+++ xen-4.0.2-testing/tools/hotplug/Linux/network-bridge
+--- xen-4.1.0-testing.orig/tools/hotplug/Linux/network-bridge
++++ xen-4.1.0-testing/tools/hotplug/Linux/network-bridge
@@ -193,6 +193,28 @@ antispoofing () {
iptables -A FORWARD -m physdev --physdev-in ${pdev} -j ACCEPT
}
@@ -31,7 +31,7 @@
# Usage: show_status dev bridge
# Print ifconfig and routes.
show_status () {
-@@ -223,6 +245,9 @@ op_start () {
+@@ -227,6 +249,9 @@ op_start () {
claim_lock "network-bridge"
@@ -41,7 +41,7 @@
create_bridge ${tdev}
preiftransfer ${netdev}
-@@ -250,6 +275,8 @@ op_start () {
+@@ -254,6 +279,8 @@ op_start () {
add_to_bridge2 ${bridge} ${pdev}
do_ifup ${bridge}
@@ -50,7 +50,7 @@
if [ ${antispoof} = 'yes' ] ; then
antispoofing
fi
-@@ -267,6 +294,9 @@ op_stop () {
+@@ -275,6 +302,9 @@ op_stop () {
claim_lock "network-bridge"
@@ -60,7 +60,7 @@
transfer_addrs ${bridge} ${pdev}
if ! ifdown ${bridge}; then
get_ip_info ${bridge}
-@@ -283,6 +313,8 @@ op_stop () {
+@@ -291,6 +321,8 @@ op_stop () {
ip link set ${pdev} name ${netdev}
do_ifup ${netdev}
++++++ build-tapdisk-ioemu.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -15,10 +15,10 @@
tapdisk-ioemu.c | 17 -----------------
4 files changed, 17 insertions(+), 26 deletions(-)
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/Makefile
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/Makefile
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/Makefile
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/Makefile
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/Makefile
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/Makefile
@@ -46,14 +46,6 @@ $(filter %-user,$(SUBDIR_RULES)): libqem
recurse-all: $(SUBDIR_RULES)
@@ -56,10 +56,10 @@
######################################################################
# libqemu_common.a: Target independent part of system emulation. The
# long term path is to suppress *all* target specific code in case of
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/configure
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/configure
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/configure
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/configure
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/configure
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/configure
@@ -1511,7 +1511,7 @@ bsd)
;;
esac
@@ -69,10 +69,10 @@
if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
tools="qemu-img\$(EXESUF) $tools"
if [ "$linux" = "yes" ] ; then
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-tool.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/qemu-tool.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/qemu-tool.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-tool.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/qemu-tool.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/qemu-tool.c
@@ -68,7 +68,7 @@ void qemu_bh_delete(QEMUBH *bh)
qemu_free(bh);
}
@@ -82,10 +82,10 @@
IOCanRWHandler *fd_read_poll,
IOHandler *fd_read,
IOHandler *fd_write,
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/tapdisk-ioemu.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/tapdisk-ioemu.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c
@@ -12,34 +12,12 @@
extern void qemu_aio_init(void);
++++++ capslock_enable.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/vnc.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/vnc.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/vnc.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/vnc.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/vnc.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/vnc.c
@@ -1342,6 +1342,11 @@ static void do_key_event(VncState *vs, i
}
break;
++++++ cdrom-removable.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/python/xen/xend/server/HalDaemon.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/server/HalDaemon.py
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/python/xen/xend/server/HalDaemon.py
++++ xen-4.1.0-testing/tools/python/xen/xend/server/HalDaemon.py
@@ -0,0 +1,243 @@
+#!/usr/bin/env python
+# -*- mode: python; -*-
@@ -246,10 +246,10 @@
+ print 'Falling off end'
+
+
-Index: xen-4.0.2-testing/tools/python/xen/xend/server/Hald.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/server/Hald.py
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/python/xen/xend/server/Hald.py
++++ xen-4.1.0-testing/tools/python/xen/xend/server/Hald.py
@@ -0,0 +1,125 @@
+#============================================================================
+# This library is free software; you can redistribute it and/or
@@ -376,11 +376,11 @@
+ watcher.run()
+ time.sleep(10)
+ watcher.shutdown()
-Index: xen-4.0.2-testing/tools/python/xen/xend/server/SrvServer.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/server/SrvServer.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/server/SrvServer.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/server/SrvServer.py
-@@ -56,6 +56,7 @@ from xen.web.SrvDir import SrvDir
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/server/SrvServer.py
++++ xen-4.1.0-testing/tools/python/xen/xend/server/SrvServer.py
+@@ -57,6 +57,7 @@ from xen.web.SrvDir import SrvDir
from SrvRoot import SrvRoot
from XMLRPCServer import XMLRPCServer
@@ -388,7 +388,7 @@
xoptions = XendOptions.instance()
-@@ -245,6 +246,8 @@ def _loadConfig(servers, root, reload):
+@@ -252,6 +253,8 @@ def _loadConfig(servers, root, reload):
if xoptions.get_xend_unix_xmlrpc_server():
servers.add(XMLRPCServer(XendAPI.AUTH_PAM, False))
@@ -397,10 +397,10 @@
def create():
root = SrvDir()
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/xenstore.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/xenstore.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c
@@ -18,6 +18,7 @@
#include "exec-all.h"
#include "sysemu.h"
@@ -409,7 +409,7 @@
#include "hw.h"
#include "pci.h"
#include "qemu-timer.h"
-@@ -553,6 +554,21 @@ void xenstore_parse_domain_config(int hv
+@@ -595,6 +596,21 @@ void xenstore_parse_domain_config(int hv
#endif
bs = bdrv_new(dev);
@@ -431,8 +431,8 @@
/* check if it is a cdrom */
if (danger_type && !strcmp(danger_type, "cdrom")) {
bdrv_set_type_hint(bs, BDRV_TYPE_CDROM);
-@@ -961,6 +977,50 @@ void xenstore_record_dm_state(const char
- xenstore_record_dm("state", state);
+@@ -1028,6 +1044,50 @@ static void xenstore_process_vcpu_set_ev
+ return;
}
+static void xenstore_process_media_change_event(char **vec)
@@ -482,7 +482,7 @@
void xenstore_process_event(void *opaque)
{
char **vec, *offset, *bpath = NULL, *buf = NULL, *drv = NULL, *image = NULL;
-@@ -991,6 +1051,11 @@ void xenstore_process_event(void *opaque
+@@ -1063,6 +1123,11 @@ void xenstore_process_event(void *opaque
xenstore_watch_callbacks[i].cb(vec[XS_WATCH_TOKEN],
xenstore_watch_callbacks[i].opaque);
++++++ change_home_server.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
-@@ -3135,6 +3135,11 @@ class XendDomainInfo:
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
+@@ -3130,6 +3130,11 @@ class XendDomainInfo:
self._cleanup_phantom_devs(paths)
self._cleanupVm()
++++++ check_device_status.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -5,10 +5,11 @@
returned. To fix this problem, we do not depend on ev.wait() result, but read
xenstore directly to get correct device status.
-diff -r ce65e0e03a57 tools/python/xen/xend/server/DevController.py
---- a/tools/python/xen/xend/server/DevController.py Fri Aug 27 16:53:00 2010 +0800
-+++ b/tools/python/xen/xend/server/DevController.py Fri Aug 27 17:13:32 2010 +0800
-@@ -149,7 +149,10 @@
+Index: xen-4.1.0-testing/tools/python/xen/xend/server/DevController.py
+===================================================================
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/server/DevController.py
++++ xen-4.1.0-testing/tools/python/xen/xend/server/DevController.py
+@@ -149,7 +149,10 @@ class DevController:
(status, err) = self.waitForBackend(devid)
if status == Timeout:
@@ -20,7 +21,7 @@
raise VmError("Device %s (%s) could not be connected. "
"Hotplug scripts not working." %
(devid, self.deviceClass))
-@@ -554,7 +557,17 @@
+@@ -554,7 +557,17 @@ class DevController:
xswatch(statusPath, hotplugStatusCallback, ev, result)
@@ -39,7 +40,7 @@
err = xstransact.Read(backpath, HOTPLUG_ERROR_NODE)
-@@ -571,7 +584,12 @@
+@@ -571,7 +584,12 @@ class DevController:
xswatch(statusPath, deviceDestroyCallback, ev, result)
++++++ checkpoint-rename.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendCheckpoint.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendCheckpoint.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendCheckpoint.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendCheckpoint.py
-@@ -165,7 +165,7 @@ def save(fd, dominfo, network, live, dst
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendCheckpoint.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendCheckpoint.py
+@@ -172,7 +172,7 @@ def save(fd, dominfo, network, live, dst
dominfo.destroy()
dominfo.testDeviceComplete()
try:
++++++ del_usb_xend_entry.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
-@@ -1312,8 +1312,15 @@ class XendDomainInfo:
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
+@@ -1297,8 +1297,15 @@ class XendDomainInfo:
frontpath = self.getDeviceController(deviceClass).frontendPath(dev)
backpath = xstransact.Read(frontpath, "backend")
thread.start_new_thread(self.getDeviceController(deviceClass).finishDeviceCleanup, (backpath, path))
++++++ disable_emulated_device.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
+Index: xen-4.1.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
===================================================================
---- xen-4.0.2-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
-+++ xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
-@@ -396,6 +396,11 @@ static int __devinit platform_pci_init(s
+--- xen-4.1.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
++++ xen-4.1.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
+@@ -398,6 +398,11 @@ static int __devinit platform_pci_init(s
platform_mmio = mmio_addr;
platform_mmiolen = mmio_len;
++++++ dom-print.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.0.2-testing/xen/arch/x86/domain.c
+Index: xen-4.1.0-testing/xen/arch/x86/domain.c
===================================================================
---- xen-4.0.2-testing.orig/xen/arch/x86/domain.c
-+++ xen-4.0.2-testing/xen/arch/x86/domain.c
-@@ -144,15 +144,30 @@ void dump_pageframe_info(struct domain *
+--- xen-4.1.0-testing.orig/xen/arch/x86/domain.c
++++ xen-4.1.0-testing/xen/arch/x86/domain.c
+@@ -150,15 +150,30 @@ void dump_pageframe_info(struct domain *
printk("Memory pages belonging to domain %u:\n", d->domain_id);
++++++ domu-usb-controller.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendConfig.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendConfig.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendConfig.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendConfig.py
-@@ -1861,7 +1861,14 @@ class XendConfig(dict):
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendConfig.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendConfig.py
+@@ -1874,7 +1874,14 @@ class XendConfig(dict):
ports = sxp.child(dev_sxp, 'port')
for port in ports[1:]:
try:
++++++ hibernate.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/firmware/hvmloader/acpi/dsdt.asl
+Index: xen-4.1.0-testing/tools/firmware/hvmloader/acpi/dsdt.asl
===================================================================
---- xen-4.0.2-testing.orig/tools/firmware/hvmloader/acpi/dsdt.asl
-+++ xen-4.0.2-testing/tools/firmware/hvmloader/acpi/dsdt.asl
+--- xen-4.1.0-testing.orig/tools/firmware/hvmloader/acpi/dsdt.asl
++++ xen-4.1.0-testing/tools/firmware/hvmloader/acpi/dsdt.asl
@@ -30,21 +30,9 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2,
/*
* S3 (suspend-to-ram), S4 (suspend-to-disc) and S5 (power-off) type codes:
@@ -11,18 +11,18 @@
*/
- Name (\_S3, Package (0x04)
- {
-- 0x05, /* PM1a_CNT.SLP_TYP */
-- 0x05, /* PM1b_CNT.SLP_TYP */
+- 0x01, /* PM1a_CNT.SLP_TYP */
+- 0x01, /* PM1b_CNT.SLP_TYP */
- 0x0, /* reserved */
- 0x0 /* reserved */
- })
- Name (\_S4, Package (0x04)
- {
-- 0x06, /* PM1a_CNT.SLP_TYP */
-- 0x06, /* PM1b_CNT.SLP_TYP */
+- 0x00, /* PM1a_CNT.SLP_TYP */
+- 0x00, /* PM1b_CNT.SLP_TYP */
- 0x00, /* reserved */
- 0x00 /* reserved */
- })
Name (\_S5, Package (0x04)
{
- 0x07, /* PM1a_CNT.SLP_TYP */
+ 0x00, /* PM1a_CNT.SLP_TYP */
++++++ hv_extid_compatibility.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendConfig.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendConfig.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendConfig.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendConfig.py
-@@ -157,6 +157,7 @@ XENAPI_PLATFORM_CFG_TYPES = {
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendConfig.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendConfig.py
+@@ -159,6 +159,7 @@ XENAPI_PLATFORM_CFG_TYPES = {
'nographic': int,
'nomigrate': int,
'pae' : int,
@@ -10,7 +10,7 @@
'rtc_timeoffset': int,
'parallel': str,
'serial': str,
-@@ -509,6 +510,8 @@ class XendConfig(dict):
+@@ -515,6 +516,8 @@ class XendConfig(dict):
if self.is_hvm():
if 'timer_mode' not in self['platform']:
self['platform']['timer_mode'] = 1
@@ -19,10 +19,10 @@
if 'viridian' not in self['platform']:
self['platform']['viridian'] = 0
if 'rtc_timeoffset' not in self['platform']:
-Index: xen-4.0.2-testing/tools/python/xen/xend/image.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/image.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/image.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/image.py
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/image.py
++++ xen-4.1.0-testing/tools/python/xen/xend/image.py
@@ -839,6 +839,7 @@ class HVMImageHandler(ImageHandler):
self.apic = int(vmConfig['platform'].get('apic', 0))
@@ -31,10 +31,10 @@
self.guest_os_type = vmConfig['platform'].get('guest_os_type')
self.memory_sharing = int(vmConfig['memory_sharing'])
try:
-Index: xen-4.0.2-testing/tools/python/xen/xm/create.py
+Index: xen-4.1.0-testing/tools/python/xen/xm/create.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xm/create.py
-+++ xen-4.0.2-testing/tools/python/xen/xm/create.py
+--- xen-4.1.0-testing.orig/tools/python/xen/xm/create.py
++++ xen-4.1.0-testing/tools/python/xen/xm/create.py
@@ -242,6 +242,10 @@ gopts.var('viridian', val='VIRIDIAN',
use="""Expose Viridian interface to x86 HVM guest?
(Default is 0).""")
++++++ ioemu-7615-qcow2-fix-alloc_cluster_link_l2.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -17,10 +17,10 @@
Signed-off-by: Kevin Wolf
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/block-qcow2.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/block-qcow2.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/block-qcow2.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/block-qcow2.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/block-qcow2.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/block-qcow2.c
@@ -916,7 +916,7 @@ static int alloc_cluster_link_l2(BlockDr
goto err;
++++++ ioemu-bdrv-open-CACHE_WB.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
@@ -259,8 +259,11 @@ static int open_disk(struct td_state *s,
drv = blktap_drivers[i].drv;
DPRINTF("%s driver specified\n", drv ? drv->format_name : "No");
++++++ ioemu-blktap-barriers.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
@@ -360,6 +360,15 @@ static void qemu_send_responses(void* op
}
++++++ ioemu-blktap-fv-init.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_machine_fv.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_machine_fv.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_machine_fv.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_machine_fv.c
-@@ -268,6 +268,7 @@ void qemu_invalidate_entry(uint8_t *buff
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_machine_fv.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_machine_fv.c
+@@ -269,6 +269,7 @@ void qemu_invalidate_entry(uint8_t *buff
#endif /* defined(MAPCACHE) */
@@ -10,7 +10,7 @@
static void xen_init_fv(ram_addr_t ram_size, int vga_ram_size,
const char *boot_device,
-@@ -293,6 +294,11 @@ static void xen_init_fv(ram_addr_t ram_s
+@@ -294,6 +295,11 @@ static void xen_init_fv(ram_addr_t ram_s
}
#endif
++++++ ioemu-blktap-image-format.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -15,10 +15,10 @@
hw/xen_blktap.h | 14 ++++++++++++++
2 files changed, 33 insertions(+), 3 deletions(-)
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
@@ -230,9 +230,10 @@ static int map_new_dev(struct td_state *
return -1;
}
@@ -64,10 +64,10 @@
msglen = sizeof(msg_hdr_t);
msg->type = CTLMSG_IMG_FAIL;
msg->len = msglen;
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.h
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.h
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.h
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.h
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.h
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.h
@@ -53,4 +53,18 @@ typedef struct fd_list_entry {
int init_blktap(void);
++++++ ioemu-blktap-zero-size.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -12,10 +12,10 @@
hw/xen_blktap.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
@@ -268,6 +268,12 @@ static int open_disk(struct td_state *s,
s->size = bs->total_sectors;
s->sector_size = 512;
@@ -29,10 +29,10 @@
s->info = ((s->flags & TD_RDONLY) ? VDISK_READONLY : 0);
return 0;
-Index: xen-4.0.2-testing/tools/python/xen/xend/server/DevController.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/server/DevController.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/server/DevController.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/server/DevController.py
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/server/DevController.py
++++ xen-4.1.0-testing/tools/python/xen/xend/server/DevController.py
@@ -155,7 +155,7 @@ class DevController:
(devid, self.deviceClass))
++++++ ioemu-debuginfo.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/Makefile
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/Makefile
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/Makefile
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/Makefile
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/Makefile
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/Makefile
@@ -243,7 +243,7 @@ endif
install: all $(if $(BUILD_DOCS),install-doc)
mkdir -p "$(DESTDIR)$(bindir)"
@@ -11,11 +11,11 @@
endif
ifneq ($(BLOBS),)
mkdir -p "$(DESTDIR)$(datadir)"
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/Makefile.target
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/Makefile.target
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/Makefile.target
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/Makefile.target
-@@ -754,7 +754,7 @@ clean:
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/Makefile.target
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/Makefile.target
+@@ -755,7 +755,7 @@ clean:
install: all install-hook
ifneq ($(PROGS),)
++++++ ioemu-disable-emulated-ide-if-pv.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-xen.h
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/qemu-xen.h
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-xen.h
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/qemu-xen.h
@@ -1,6 +1,8 @@
#ifndef QEMU_XEN_H
#define QEMU_XEN_H
@@ -11,46 +11,45 @@
/* vl.c */
extern int restore;
extern int vga_ram_size;
-@@ -73,7 +75,7 @@ void handle_buffered_pio(void);
- #endif
-
+@@ -75,7 +77,7 @@ void handle_buffered_pio(void);
/* xenstore.c */
+ void xenstore_init(void);
+ uint32_t xenstore_read_target(void);
-void xenstore_parse_domain_config(int domid);
+void xenstore_parse_domain_config(int domid, QEMUMachine *machine);
int xenstore_parse_disable_pf_config(void);
int xenstore_fd(void);
void xenstore_process_event(void *opaque);
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/vl.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/vl.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/vl.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/vl.c
-@@ -5827,10 +5827,10 @@ int main(int argc, char **argv, char **e
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/vl.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/vl.c
+@@ -5830,9 +5830,9 @@ int main(int argc, char **argv, char **e
if ((msg = xenbus_read(XBT_NIL, "domid", &domid_s)))
fprintf(stderr,"Can not read our own domid: %s\n", msg);
else
- xenstore_parse_domain_config(atoi(domid_s));
+ xenstore_parse_domain_config(atoi(domid_s), machine);
- }
#else
-- xenstore_parse_domain_config(domid);
-+ xenstore_parse_domain_config(domid, machine);
+- xenstore_parse_domain_config(domid);
++ xenstore_parse_domain_config(domid, machine);
#endif /* CONFIG_STUBDOM */
+ }
- /* we always create the cdrom drive, even if no disk is there */
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/xenstore.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
-@@ -397,7 +397,7 @@ static const char *xenstore_get_guest_uu
- #define PT_PCI_POWER_MANAGEMENT_DEFAULT 0
- int direct_pci_msitranslate;
- int direct_pci_power_mgmt;
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/xenstore.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c
+@@ -447,7 +447,7 @@ void xenstore_init(void)
+ }
+ }
+
-void xenstore_parse_domain_config(int hvm_domid)
+void xenstore_parse_domain_config(int hvm_domid, QEMUMachine *machine)
{
char **e_danger = NULL;
char *buf = NULL;
-@@ -712,15 +712,19 @@ void xenstore_parse_domain_config(int hv
+@@ -754,15 +754,19 @@ void xenstore_parse_domain_config(int hv
#endif
++++++ ioemu-disable-scsi.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_platform.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_platform.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_platform.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_platform.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_platform.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_platform.c
@@ -359,6 +359,8 @@ static void platform_ioport_write(void *
case 4:
fprintf(logfile, "Disconnect IDE hard disk...\n");
@@ -11,10 +11,10 @@
fprintf(logfile, "Disconnect netifs...\n");
pci_unplug_netifs();
fprintf(logfile, "Shutdown taps...\n");
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-xen.h
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/qemu-xen.h
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-xen.h
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/qemu-xen.h
@@ -57,6 +57,7 @@ void unset_vram_mapping(void *opaque);
#endif
@@ -23,11 +23,11 @@
void destroy_hvm_domain(void);
void unregister_iomem(target_phys_addr_t start);
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/pci.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/pci.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/pci.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/pci.c
-@@ -892,6 +892,50 @@ void pci_unplug_netifs(void)
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/pci.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/pci.c
+@@ -871,6 +871,50 @@ void pci_unplug_netifs(void)
}
}
@@ -45,7 +45,7 @@
+ dev = bus->devices[x];
+ if (dev &&
+ dev->config[0xa] == 0 &&
-+ dev->config[0xb] == 1
++ dev->config[0xb] == 1
+#ifdef CONFIG_PASSTHROUGH
+ && test_pci_devfn(x) != 1
+#endif
++++++ ioemu-vnc-resize.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/vnc.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/vnc.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/vnc.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/vnc.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/vnc.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/vnc.c
@@ -1734,6 +1734,25 @@ static int protocol_client_msg(VncState
}
++++++ libxen_permissive.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/libxen/src/xen_common.c
+Index: xen-4.1.0-testing/tools/libxen/src/xen_common.c
===================================================================
---- xen-4.0.2-testing.orig/tools/libxen/src/xen_common.c
-+++ xen-4.0.2-testing/tools/libxen/src/xen_common.c
+--- xen-4.1.0-testing.orig/tools/libxen/src/xen_common.c
++++ xen-4.1.0-testing/tools/libxen/src/xen_common.c
@@ -904,8 +904,15 @@ static void parse_into(xen_session *s, x
0 != strcmp((char *)value_node->children->name, "struct") ||
value_node->children->children == NULL)
++++++ magic_ioport_compat.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -2,11 +2,11 @@
Signed-off-by: K. Y. Srinivasan
-Index: xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
+Index: xen-4.1.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
===================================================================
---- xen-4.0.2-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
-+++ xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
-@@ -320,7 +320,10 @@ static int check_platform_magic(struct d
+--- xen-4.1.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
++++ xen-4.1.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
+@@ -322,7 +322,10 @@ static int check_platform_magic(struct d
if (magic != XEN_IOPORT_MAGIC_VAL) {
err = "unrecognised magic value";
++++++ minios-fixups.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,23 +1,8 @@
-Index: xen-4.0.2-testing/extras/mini-os/netfront.c
+Index: xen-4.1.0-testing/extras/mini-os/lib/math.c
===================================================================
---- xen-4.0.2-testing.orig/extras/mini-os/netfront.c
-+++ xen-4.0.2-testing/extras/mini-os/netfront.c
-@@ -25,8 +25,8 @@ DECLARE_WAIT_QUEUE_HEAD(netfront_queue);
-
-
-
--#define NET_TX_RING_SIZE __RING_SIZE((struct netif_tx_sring *)0, PAGE_SIZE)
--#define NET_RX_RING_SIZE __RING_SIZE((struct netif_rx_sring *)0, PAGE_SIZE)
-+#define NET_TX_RING_SIZE __CONST_RING_SIZE(netif_tx, PAGE_SIZE)
-+#define NET_RX_RING_SIZE __CONST_RING_SIZE(netif_rx, PAGE_SIZE)
- #define GRANT_INVALID_REF 0
-
-
-Index: xen-4.0.2-testing/extras/mini-os/lib/math.c
-===================================================================
---- xen-4.0.2-testing.orig/extras/mini-os/lib/math.c
-+++ xen-4.0.2-testing/extras/mini-os/lib/math.c
-@@ -191,6 +191,7 @@ __qdivrem(uint64_t uq, uint64_t vq, uint
+--- xen-4.1.0-testing.orig/extras/mini-os/lib/math.c
++++ xen-4.1.0-testing/extras/mini-os/lib/math.c
+@@ -187,6 +187,7 @@ __qdivrem(uint64_t uq, uint64_t vq, uint
* and thus
* m = 4 - n <= 2
*/
@@ -25,16 +10,3 @@
tmp.uq = uq;
u[0] = 0;
u[1] = HHALF(tmp.ul[H]);
-Index: xen-4.0.2-testing/extras/mini-os/arch/x86/mm.c
-===================================================================
---- xen-4.0.2-testing.orig/extras/mini-os/arch/x86/mm.c
-+++ xen-4.0.2-testing/extras/mini-os/arch/x86/mm.c
-@@ -281,7 +281,7 @@ static void build_pagetable(unsigned lon
- /*
- * Mark portion of the address space read only.
- */
--extern void shared_info;
-+extern char shared_info[PAGE_SIZE];
- static void set_readonly(void *text, void *etext)
- {
- unsigned long start_address =
++++++ multi-xvdp.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -5,27 +5,11 @@
loopback devices so more than one instance of bootloader can be run
concurrently.
-Index: xen-4.0.2-testing/tools/python/xen/util/blkif.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/util/blkif.py
-+++ xen-4.0.2-testing/tools/python/xen/util/blkif.py
-@@ -19,11 +19,6 @@ def blkdev_name_to_number(name):
- devname = 'virtual-device'
- devnum = None
-
-- try:
-- return (devname, os.stat(n).st_rdev)
-- except Exception, ex:
-- pass
--
- scsi_major = [ 8, 65, 66, 67, 68, 69, 70, 71, 128, 129, 130, 131, 132, 133, 134, 135 ]
- if re.match( '/dev/sd[a-z]([1-9]|1[0-5])?$', n):
- major = scsi_major[(ord(n[7:8]) - ord('a')) / 16]
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
-===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
-@@ -73,7 +73,7 @@ from xen.xend.XendPSCSI import XendPSCSI
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
+@@ -74,7 +74,7 @@ from xen.xend.XendPSCSI import XendPSCSI
from xen.xend.XendDSCSI import XendDSCSI, XendDSCSI_HBA
MIGRATE_TIMEOUT = 30.0
@@ -34,7 +18,7 @@
xc = xen.lowlevel.xc.xc()
xoptions = XendOptions.instance()
-@@ -3305,33 +3305,38 @@ class XendDomainInfo:
+@@ -3299,33 +3299,38 @@ class XendDomainInfo:
# This is a file, not a device. pygrub can cope with a
# file if it's raw, but if it's QCOW or other such formats
# used through blktap, then we need to mount it first.
++++++ network-nat-open-SuSEfirewall2-FORWARD.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,9 +1,9 @@
Open SuSEfirewall2 FORWARD rule when use xen nat
-Index: xen-4.0.2-testing/tools/hotplug/Linux/network-nat
+Index: xen-4.1.0-testing/tools/hotplug/Linux/network-nat
===================================================================
---- xen-4.0.2-testing.orig/tools/hotplug/Linux/network-nat
-+++ xen-4.0.2-testing/tools/hotplug/Linux/network-nat
+--- xen-4.1.0-testing.orig/tools/hotplug/Linux/network-nat
++++ xen-4.1.0-testing/tools/hotplug/Linux/network-nat
@@ -83,6 +83,7 @@ function dhcp_stop()
op_start() {
echo 1 >/proc/sys/net/ipv4/ip_forward
++++++ network-nat.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/hotplug/Linux/network-nat
+Index: xen-4.1.0-testing/tools/hotplug/Linux/network-nat
===================================================================
---- xen-4.0.2-testing.orig/tools/hotplug/Linux/network-nat
-+++ xen-4.0.2-testing/tools/hotplug/Linux/network-nat
+--- xen-4.1.0-testing.orig/tools/hotplug/Linux/network-nat
++++ xen-4.1.0-testing/tools/hotplug/Linux/network-nat
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
++++++ pv-driver-build.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,9 +1,25 @@
-Index: xen-4.0.2-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild
-===================================================================
---- xen-4.0.2-testing.orig/unmodified_drivers/linux-2.6/blkfront/Kbuild
-+++ xen-4.0.2-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild
+--- a/unmodified_drivers/linux-2.6/blkfront/Kbuild
++++ b/unmodified_drivers/linux-2.6/blkfront/Kbuild
@@ -3,3 +3,4 @@ include $(M)/overrides.mk
obj-m += xen-vbd.o
xen-vbd-objs := blkfront.o vbd.o
+xen-vbd-objs += $(patsubst %.c,%.o,$(notdir $(wildcard $(src)/vcd.c)))
+--- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
++++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
+@@ -123,6 +123,7 @@ unsigned long alloc_xen_mmio(unsigned lo
+
+ #ifndef __ia64__
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,38)
+ static uint32_t xen_cpuid_base(void)
+ {
+ uint32_t base, eax, ebx, ecx, edx;
+@@ -141,6 +142,7 @@ static uint32_t xen_cpuid_base(void)
+
+ return 0;
+ }
++#endif
+
+ static int init_hypercall_stubs(void)
+ {
++++++ pvdrv-import-shared-info.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
+Index: xen-4.1.0-testing/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
===================================================================
---- xen-4.0.2-testing.orig/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
-+++ xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
+--- xen-4.1.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
++++ xen-4.1.0-testing/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
@@ -40,7 +40,9 @@
#include
#endif
@@ -12,10 +12,10 @@
#define is_valid_evtchn(x) ((x) != 0)
#define evtchn_from_irq(x) (irq_evtchn[irq].evtchn)
-Index: xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
+Index: xen-4.1.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
===================================================================
---- xen-4.0.2-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
-+++ xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
+--- xen-4.1.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
++++ xen-4.1.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
@@ -77,7 +77,6 @@ static uint64_t callback_via;
static int __devinit init_xen_info(void)
{
@@ -44,10 +44,10 @@
return 0;
}
-Index: xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h
+Index: xen-4.1.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h
===================================================================
---- xen-4.0.2-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h
-+++ xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h
+--- xen-4.1.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h
++++ xen-4.1.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h
@@ -27,6 +27,11 @@
unsigned long alloc_xen_mmio(unsigned long len);
void platform_pci_resume(void);
++++++ pvdrv_emulation_control.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_platform.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_platform.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_platform.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_platform.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_platform.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_platform.c
@@ -365,6 +365,19 @@ static void platform_ioport_write(void *
net_tap_shutdown_all();
fprintf(logfile, "Done.\n");
++++++ qemu-dm-segfault.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/ide.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/ide.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/ide.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/ide.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/ide.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/ide.c
@@ -935,8 +935,9 @@ static inline void ide_dma_submit_check(
static inline void ide_set_irq(IDEState *s)
++++++ qemu-security-etch1.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/ne2000.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/ne2000.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/ne2000.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/ne2000.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/ne2000.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/ne2000.c
@@ -218,7 +218,7 @@ static int ne2000_can_receive(void *opaq
NE2000State *s = opaque;
@@ -11,11 +11,11 @@
return !ne2000_buffer_full(s);
}
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/pc.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/pc.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/pc.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/pc.c
-@@ -409,7 +409,8 @@ static void bochs_bios_write(void *opaqu
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/pc.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/pc.c
+@@ -413,7 +413,8 @@ static void bochs_bios_write(void *opaqu
case 0x400:
case 0x401:
fprintf(stderr, "BIOS panic at rombios.c, line %d\n", val);
@@ -25,7 +25,7 @@
case 0x402:
case 0x403:
#ifdef DEBUG_BIOS
-@@ -432,8 +433,9 @@ static void bochs_bios_write(void *opaqu
+@@ -436,8 +437,9 @@ static void bochs_bios_write(void *opaqu
/* LGPL'ed VGA BIOS messages */
case 0x501:
case 0x502:
++++++ serial-split.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/misc/serial-split/Makefile
+Index: xen-4.1.0-testing/tools/misc/serial-split/Makefile
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/misc/serial-split/Makefile
++++ xen-4.1.0-testing/tools/misc/serial-split/Makefile
@@ -0,0 +1,20 @@
+CC ?= gcc
+CFLAGS ?= -Wall -Os
@@ -23,10 +23,10 @@
+
+%.o: %.c Makefile
+ $(CC) $(CFLAGS) -c -o $@ $<
-Index: xen-4.0.2-testing/tools/misc/serial-split/serial-split.c
+Index: xen-4.1.0-testing/tools/misc/serial-split/serial-split.c
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/misc/serial-split/serial-split.c
++++ xen-4.1.0-testing/tools/misc/serial-split/serial-split.c
@@ -0,0 +1,422 @@
+/*
+ * serial-split.c
++++++ snapshot-ioemu-delete.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/xenstore.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
-@@ -935,6 +935,18 @@ static void xenstore_process_dm_command_
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/xenstore.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c
+@@ -972,6 +972,18 @@ static void xenstore_process_dm_command_
}
snapshot_name = xs_read(xsh, XBT_NULL, path, &len);
@@ -21,11 +21,11 @@
} else if (!strncmp(command, "continue", len)) {
fprintf(logfile, "dm-command: continue after state save\n");
xen_pause_requested = 0;
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/savevm.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/savevm.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/savevm.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/savevm.c
-@@ -1096,6 +1096,35 @@ the_end:
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/savevm.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/savevm.c
+@@ -1106,6 +1106,35 @@ the_end:
return ret;
}
@@ -61,10 +61,10 @@
#ifndef CONFIG_DM
void do_savevm(const char *name)
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-xen.h
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/qemu-xen.h
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-xen.h
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/qemu-xen.h
@@ -42,6 +42,7 @@ enum {
/* xen-vl-extra.c */
++++++ snapshot-ioemu-restore.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/xenstore.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/xenstore.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c
@@ -103,6 +103,8 @@ int xenstore_watch_new_callback(const ch
}
@@ -11,7 +11,7 @@
static int pasprintf(char **buf, const char *fmt, ...)
{
va_list ap;
-@@ -666,8 +668,33 @@ void xenstore_parse_domain_config(int hv
+@@ -708,8 +710,33 @@ void xenstore_parse_domain_config(int hv
fprintf(stderr, "Using file %s in read-%s mode\n", bs->filename, is_readonly ? "only" : "write");
@@ -46,7 +46,7 @@
}
#endif
-@@ -802,6 +829,23 @@ int xenstore_parse_disable_pf_config ()
+@@ -839,6 +866,23 @@ int xenstore_parse_disable_pf_config ()
return disable_pf;
}
++++++ snapshot-ioemu-save.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/savevm.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/savevm.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/savevm.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/savevm.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/savevm.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/savevm.c
@@ -28,6 +28,7 @@
#include "sysemu.h"
#include "qemu-timer.h"
@@ -10,7 +10,7 @@
#include "block.h"
#include "audio/audio.h"
#include "migration.h"
-@@ -1015,6 +1016,86 @@ static int bdrv_snapshot_find(BlockDrive
+@@ -1025,6 +1026,86 @@ static int bdrv_snapshot_find(BlockDrive
return ret;
}
@@ -97,10 +97,10 @@
#ifndef CONFIG_DM
void do_savevm(const char *name)
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/i386-dm/helper2.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/i386-dm/helper2.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/i386-dm/helper2.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/i386-dm/helper2.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/i386-dm/helper2.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/i386-dm/helper2.c
@@ -112,6 +112,9 @@ int send_vcpu = 0;
//the evtchn port for polling the notification,
evtchn_port_t *ioreq_local_port;
@@ -112,14 +112,14 @@
{
CPUX86State *env;
@@ -556,6 +559,7 @@ int main_loop(void)
- int evtchn_fd = xce_handle == -1 ? -1 : xc_evtchn_fd(xce_handle);
+ int evtchn_fd = xce_handle == NULL ? -1 : xc_evtchn_fd(xce_handle);
char *qemu_file;
fd_set fds;
+ int ret;
main_loop_prepare();
-@@ -583,11 +587,43 @@ int main_loop(void)
+@@ -588,11 +592,43 @@ int main_loop(void)
main_loop_wait(1); /* For the select() on events */
/* Save the device state */
@@ -167,10 +167,10 @@
/* Wait to be allowed to continue */
while (xen_pause_requested) {
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-xen.h
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/qemu-xen.h
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-xen.h
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/qemu-xen.h
@@ -34,6 +34,15 @@ void qemu_invalidate_map_cache(void)
#define mapcache_lock() ((void)0)
#define mapcache_unlock() ((void)0)
@@ -187,18 +187,18 @@
/* helper2.c */
extern long time_offset;
void timeoffset_get(void);
-@@ -68,6 +77,7 @@ int xenstore_fd(void);
+@@ -70,6 +79,7 @@ int xenstore_fd(void);
void xenstore_process_event(void *opaque);
void xenstore_record_dm(const char *subpath, const char *state);
void xenstore_record_dm_state(const char *state);
+void xenstore_record_dm_error(const char *errmsg);
void xenstore_check_new_media_present(int timeout);
- void xenstore_write_vncport(int vnc_display);
void xenstore_read_vncpasswd(int domid, char *pwbuf, size_t pwbuflen);
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
+ void xenstore_write_vslots(char *vslots);
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/xenstore.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/xenstore.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c
@@ -17,6 +17,7 @@
#include "exec-all.h"
@@ -207,7 +207,7 @@
#include "console.h"
#include "hw.h"
-@@ -862,6 +863,7 @@ static void xenstore_process_dm_command_
+@@ -899,6 +900,7 @@ static void xenstore_process_dm_command_
{
char *path = NULL, *command = NULL, *par = NULL;
unsigned int len;
@@ -215,7 +215,7 @@
if (pasprintf(&path,
"/local/domain/0/device-model/%u/command", domid) == -1) {
-@@ -877,7 +879,18 @@ static void xenstore_process_dm_command_
+@@ -914,7 +916,18 @@ static void xenstore_process_dm_command_
if (!strncmp(command, "save", len)) {
fprintf(logfile, "dm-command: pause and save state\n");
@@ -235,8 +235,8 @@
} else if (!strncmp(command, "continue", len)) {
fprintf(logfile, "dm-command: continue after state save\n");
xen_pause_requested = 0;
-@@ -1010,6 +1023,13 @@ void xenstore_record_dm_state(const char
- xenstore_record_dm("state", state);
+@@ -1077,6 +1090,13 @@ static void xenstore_process_vcpu_set_ev
+ return;
}
+void xenstore_record_dm_error(const char *errmsg)
++++++ snapshot-without-pv-fix.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -8,10 +8,10 @@
drives_table[], otherwise the disk in qemu will just stay opened,not
showing up in drives_table[].
-Index: xen-4.0.2-testing/tools/blktap/drivers/blktapctrl.c
+Index: xen-4.1.0-testing/tools/blktap/drivers/blktapctrl.c
===================================================================
---- xen-4.0.2-testing.orig/tools/blktap/drivers/blktapctrl.c
-+++ xen-4.0.2-testing/tools/blktap/drivers/blktapctrl.c
+--- xen-4.1.0-testing.orig/tools/blktap/drivers/blktapctrl.c
++++ xen-4.1.0-testing/tools/blktap/drivers/blktapctrl.c
@@ -380,7 +380,22 @@ static int write_msg(int fd, int msgtype
msg->cookie = blkif->cookie;
@@ -121,10 +121,10 @@
ctlfd = blktap_interface_open();
if (ctlfd < 0) {
-Index: xen-4.0.2-testing/tools/blktap/lib/blkif.c
+Index: xen-4.1.0-testing/tools/blktap/lib/blkif.c
===================================================================
---- xen-4.0.2-testing.orig/tools/blktap/lib/blkif.c
-+++ xen-4.0.2-testing/tools/blktap/lib/blkif.c
+--- xen-4.1.0-testing.orig/tools/blktap/lib/blkif.c
++++ xen-4.1.0-testing/tools/blktap/lib/blkif.c
@@ -89,6 +89,11 @@ void register_new_blkif_hook(int (*fn)(b
{
new_blkif_hook = fn;
@@ -162,10 +162,10 @@
void __init_blkif(void)
{
memset(blkif_hash, 0, sizeof(blkif_hash));
-Index: xen-4.0.2-testing/tools/blktap/lib/blktaplib.h
+Index: xen-4.1.0-testing/tools/blktap/lib/blktaplib.h
===================================================================
---- xen-4.0.2-testing.orig/tools/blktap/lib/blktaplib.h
-+++ xen-4.0.2-testing/tools/blktap/lib/blktaplib.h
+--- xen-4.1.0-testing.orig/tools/blktap/lib/blktaplib.h
++++ xen-4.1.0-testing/tools/blktap/lib/blktaplib.h
@@ -38,6 +38,7 @@
#include
#include
@@ -197,10 +197,10 @@
/* disk driver types */
#define MAX_DISK_TYPES 20
-Index: xen-4.0.2-testing/tools/blktap/lib/xenbus.c
+Index: xen-4.1.0-testing/tools/blktap/lib/xenbus.c
===================================================================
---- xen-4.0.2-testing.orig/tools/blktap/lib/xenbus.c
-+++ xen-4.0.2-testing/tools/blktap/lib/xenbus.c
+--- xen-4.1.0-testing.orig/tools/blktap/lib/xenbus.c
++++ xen-4.1.0-testing/tools/blktap/lib/xenbus.c
@@ -318,6 +318,72 @@ static int check_image(struct xs_handle
return 0;
}
@@ -284,10 +284,10 @@
list_add(&be->list, &belist);
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
@@ -35,6 +35,8 @@
#ifndef QEMU_TOOL
#include "qemu-common.h"
@@ -378,10 +378,10 @@
default:
break;
}
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.h
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.h
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.h
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.h
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.h
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.h
@@ -40,7 +40,8 @@ struct td_state {
void *fd_entry;
uint64_t sector_size;
++++++ snapshot-xend.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/python/xen/xend/image.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/image.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/image.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/image.py
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/image.py
++++ xen-4.1.0-testing/tools/python/xen/xend/image.py
@@ -490,7 +490,7 @@ class ImageHandler:
domains.domains_lock.acquire()
@@ -43,10 +43,10 @@
def recreate(self):
if self.device_model is None:
return
-Index: xen-4.0.2-testing/tools/python/xen/xend/server/blkif.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/server/blkif.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/server/blkif.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/server/blkif.py
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/server/blkif.py
++++ xen-4.1.0-testing/tools/python/xen/xend/server/blkif.py
@@ -88,6 +88,10 @@ class BlkifController(DevController):
if bootable != None:
back['bootable'] = str(bootable)
@@ -58,10 +58,10 @@
if security.on() == xsconstants.XS_POLICY_USE:
self.do_access_control(config, uname)
-Index: xen-4.0.2-testing/tools/python/xen/xend/server/SrvDomain.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/server/SrvDomain.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/server/SrvDomain.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/server/SrvDomain.py
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/server/SrvDomain.py
++++ xen-4.1.0-testing/tools/python/xen/xend/server/SrvDomain.py
@@ -95,6 +95,31 @@ class SrvDomain(SrvDir):
def do_save(self, _, req):
return self.xd.domain_save(self.dom.domid, req.args['file'][0])
@@ -94,7 +94,7 @@
def op_dump(self, op, req):
self.acceptCommand(req)
return req.threadRequest(self.do_dump, op, req)
-@@ -259,7 +284,7 @@ class SrvDomain(SrvDir):
+@@ -273,7 +298,7 @@ class SrvDomain(SrvDir):
def render_GET(self, req):
op = req.args.get('op')
@@ -103,16 +103,16 @@
return self.perform(req)
#
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendCheckpoint.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendCheckpoint.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendCheckpoint.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendCheckpoint.py
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendCheckpoint.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendCheckpoint.py
@@ -65,7 +65,7 @@ def insert_after(list, pred, value):
return
--def save(fd, dominfo, network, live, dst, checkpoint=False, node=-1):
-+def save(fd, dominfo, network, live, dst, checkpoint=False, node=-1, name=None, diskonly=False):
+-def save(fd, dominfo, network, live, dst, checkpoint=False, node=-1,sock=None):
++def save(fd, dominfo, network, live, dst, checkpoint=False, node=-1, sock=None, name=None, diskonly=False):
from xen.xend import XendDomain
try:
@@ -233,7 +233,7 @@
if checkpoint:
dominfo.resumeDomain()
-@@ -221,6 +232,71 @@ def restore(xd, fd, dominfo = None, paus
+@@ -228,6 +239,71 @@ def restore(xd, fd, dominfo = None, paus
if othervm is not None and othervm.domid is not None:
raise VmError("Domain '%s' already exists with ID '%d'" % (domconfig["name_label"], othervm.domid))
@@ -331,22 +331,22 @@
if not paused:
dominfo.unpause()
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendConfig.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendConfig.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendConfig.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendConfig.py
-@@ -242,6 +242,7 @@ XENAPI_CFG_TYPES = {
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendConfig.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendConfig.py
+@@ -244,6 +244,7 @@ XENAPI_CFG_TYPES = {
'memory_sharing': int,
- 'Description': str,
'pool_name' : str,
+ 'Description': str,
+ 'snapshotname': str,
}
# List of legacy configuration keys that have no equivalent in the
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomain.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomain.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomain.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomain.py
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomain.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomain.py
@@ -53,6 +53,7 @@ from xen.xend.xenstore.xstransact import
from xen.xend.xenstore.xswatch import xswatch
from xen.util import mkdir, rwlock
@@ -373,7 +373,7 @@
try:
shutil.move(fn, self._managed_config_path(dom_uuid))
except:
-@@ -1576,6 +1582,187 @@ class XendDomain:
+@@ -1585,6 +1591,187 @@ class XendDomain:
else:
log.debug("error: Domain is not running!")
@@ -440,7 +440,7 @@
+ fd = os.open(snap_file, oflags)
+ try:
+ XendCheckpoint.save(fd, dominfo, False, False, snap_file,
-+ True, name=name, diskonly=diskonly)
++ True, sock=None, name=name, diskonly=diskonly)
+ except Exception, e:
+ os.close(fd)
+ os.unlink(snap_file)
@@ -561,10 +561,10 @@
def domain_pincpu(self, domid, vcpu, cpumap):
"""Set which cpus vcpu can use
-Index: xen-4.0.2-testing/tools/python/xen/xm/main.py
+Index: xen-4.1.0-testing/tools/python/xen/xm/main.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xm/main.py
-+++ xen-4.0.2-testing/tools/python/xen/xm/main.py
+--- xen-4.1.0-testing.orig/tools/python/xen/xm/main.py
++++ xen-4.1.0-testing/tools/python/xen/xm/main.py
@@ -123,6 +123,14 @@ SUBCOMMAND_HELP = {
'Restore a domain from a saved state.'),
'save' : ('[-c|-f] <Domain> <CheckpointFile>',
@@ -580,7 +580,7 @@
'shutdown' : ('<Domain> [-waRH]', 'Shutdown a domain.'),
'top' : ('', 'Monitor a host and the domains in real time.'),
'unpause' : ('<Domain>', 'Unpause a paused domain.'),
-@@ -337,6 +345,9 @@ SUBCOMMAND_OPTIONS = {
+@@ -344,6 +352,9 @@ SUBCOMMAND_OPTIONS = {
('-c', '--checkpoint', 'Leave domain running after creating snapshot'),
('-f', '--force', 'Force to overwrite exist file'),
),
@@ -590,7 +590,7 @@
'restore': (
('-p', '--paused', 'Do not unpause domain after restoring it'),
),
-@@ -387,6 +398,10 @@ common_commands = [
+@@ -395,6 +406,10 @@ common_commands = [
"restore",
"resume",
"save",
@@ -601,7 +601,7 @@
"shell",
"shutdown",
"start",
-@@ -421,6 +436,10 @@ domain_commands = [
+@@ -429,6 +444,10 @@ domain_commands = [
"restore",
"resume",
"save",
@@ -612,7 +612,7 @@
"shutdown",
"start",
"suspend",
-@@ -854,6 +873,62 @@ def xm_event_monitor(args):
+@@ -863,6 +882,62 @@ def xm_event_monitor(args):
#
#########################################################################
@@ -675,7 +675,7 @@
def xm_save(args):
arg_check(args, "save", 2, 4)
-@@ -3743,6 +3818,10 @@ commands = {
+@@ -3827,6 +3902,10 @@ commands = {
"restore": xm_restore,
"resume": xm_resume,
"save": xm_save,
@@ -686,11 +686,11 @@
"shutdown": xm_shutdown,
"start": xm_start,
"sysrq": xm_sysrq,
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
-@@ -507,7 +507,6 @@ class XendDomainInfo:
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
+@@ -508,7 +508,6 @@ class XendDomainInfo:
self._setSchedParams()
self._storeVmDetails()
self._createChannels()
@@ -698,7 +698,7 @@
self._storeDomDetails()
self._endRestore()
except:
-@@ -2383,7 +2382,7 @@ class XendDomainInfo:
+@@ -2368,7 +2367,7 @@ class XendDomainInfo:
return self.getDeviceController(deviceClass).reconfigureDevice(
devid, devconfig)
@@ -707,7 +707,7 @@
"""Create the devices for a vm.
@raise: VmError for invalid devices
-@@ -2432,7 +2431,7 @@ class XendDomainInfo:
+@@ -2417,7 +2416,7 @@ class XendDomainInfo:
if self.image:
@@ -716,7 +716,7 @@
#if have pass-through devs, need the virtual pci slots info from qemu
self.pci_device_configure_boot()
-@@ -3048,7 +3047,7 @@ class XendDomainInfo:
+@@ -3043,7 +3042,7 @@ class XendDomainInfo:
self._introduceDomain()
self.image = image.create(self, self.info)
if self.image:
++++++ stdvga-cache.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:22.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/xen/arch/x86/hvm/stdvga.c
+Index: xen-4.1.0-testing/xen/arch/x86/hvm/stdvga.c
===================================================================
---- xen-4.0.2-testing.orig/xen/arch/x86/hvm/stdvga.c
-+++ xen-4.0.2-testing/xen/arch/x86/hvm/stdvga.c
+--- xen-4.1.0-testing.orig/xen/arch/x86/hvm/stdvga.c
++++ xen-4.1.0-testing/xen/arch/x86/hvm/stdvga.c
@@ -135,7 +135,10 @@ static int stdvga_outb(uint64_t addr, ui
/* When in standard vga mode, emulate here all writes to the vram buffer
++++++ supported_module.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -2,10 +2,10 @@
Signed-off-by: K. Y. Srinivasan
-Index: xen-4.0.2-testing/unmodified_drivers/linux-2.6/Module.supported
+Index: xen-4.1.0-testing/unmodified_drivers/linux-2.6/Module.supported
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/unmodified_drivers/linux-2.6/Module.supported
++++ xen-4.1.0-testing/unmodified_drivers/linux-2.6/Module.supported
@@ -0,0 +1,5 @@
+xen-vbd
+xen-platform-pci
++++++ tapdisk-ioemu-logfile.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -11,10 +11,10 @@
tapdisk-ioemu.c | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/tapdisk-ioemu.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/tapdisk-ioemu.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c
@@ -78,15 +78,22 @@ int main(void)
struct timeval tv;
void *old_fd_start = NULL;
++++++ tapdisk-ioemu-shutdown-fix.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -16,10 +16,10 @@
tapdisk-ioemu.c | 13 ++++++++++---
2 files changed, 14 insertions(+), 4 deletions(-)
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
@@ -67,6 +67,7 @@ int read_fd;
int write_fd;
@@ -46,10 +46,10 @@
case CTLMSG_PID:
memset(buf, 0x00, MSG_SIZE);
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/tapdisk-ioemu.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/tapdisk-ioemu.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c
@@ -14,6 +14,7 @@ extern void qemu_aio_init(void);
extern void qemu_aio_poll(void);
++++++ tmp_build.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.0.2-testing/tools/xenstore/Makefile
+Index: xen-4.1.0-testing/tools/xenstore/Makefile
===================================================================
---- xen-4.0.2-testing.orig/tools/xenstore/Makefile
-+++ xen-4.0.2-testing/tools/xenstore/Makefile
-@@ -61,6 +61,7 @@ $(CLIENTS_DOMU): xenstore
+--- xen-4.1.0-testing.orig/tools/xenstore/Makefile
++++ xen-4.1.0-testing/tools/xenstore/Makefile
+@@ -58,6 +58,7 @@ $(CLIENTS_DOMU): xenstore
xenstore: xenstore_client.o $(LIBXENSTORE)
$(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@
@@ -10,7 +10,7 @@
xenstore-control: xenstore_control.o $(LIBXENSTORE)
$(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@
-@@ -111,10 +112,11 @@ endif
+@@ -106,10 +107,11 @@ install: all
$(INSTALL_PROG) xenstore-control $(DESTDIR)$(BINDIR)
$(INSTALL_PROG) xenstore $(DESTDIR)$(BINDIR)
set -e ; for c in $(CLIENTS) ; do \
++++++ tools-kboot.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -13,10 +13,10 @@
tools/kboot/select-kernel | 59 +
9 files changed, 2111 insertions(+)
-Index: xen-4.0.2-testing/buildconfigs/linux-defconfig_xenUboot_x86_32
+Index: xen-4.1.0-testing/buildconfigs/linux-defconfig_xenUboot_x86_32
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/buildconfigs/linux-defconfig_xenUboot_x86_32
++++ xen-4.1.0-testing/buildconfigs/linux-defconfig_xenUboot_x86_32
@@ -0,0 +1,874 @@
+#
+# Automatically generated make config: don't edit
@@ -892,10 +892,10 @@
+CONFIG_X86_NO_TSS=y
+CONFIG_X86_NO_IDT=y
+CONFIG_KTIME_SCALAR=y
-Index: xen-4.0.2-testing/buildconfigs/linux-defconfig_xenUboot_x86_64
+Index: xen-4.1.0-testing/buildconfigs/linux-defconfig_xenUboot_x86_64
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/buildconfigs/linux-defconfig_xenUboot_x86_64
++++ xen-4.1.0-testing/buildconfigs/linux-defconfig_xenUboot_x86_64
@@ -0,0 +1,653 @@
+#
+# Automatically generated make config: don't edit
@@ -1550,17 +1550,17 @@
+# CONFIG_CRC32 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
-Index: xen-4.0.2-testing/buildconfigs/mk.linux-2.6-xenUboot
+Index: xen-4.1.0-testing/buildconfigs/mk.linux-2.6-xenUboot
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/buildconfigs/mk.linux-2.6-xenUboot
++++ xen-4.1.0-testing/buildconfigs/mk.linux-2.6-xenUboot
@@ -0,0 +1,2 @@
+EXTRAVERSION = xenUboot
+include buildconfigs/mk.linux-2.6-xen
-Index: xen-4.0.2-testing/tools/kboot/Makefile
+Index: xen-4.1.0-testing/tools/kboot/Makefile
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/kboot/Makefile
++++ xen-4.1.0-testing/tools/kboot/Makefile
@@ -0,0 +1,23 @@
+#
+# tools/kboot/Makefile
@@ -1585,10 +1585,10 @@
+kboot.initramfs: mkinitramfs init select-kernel ../xcutils/xc_kexec
+ sh ./mkinitramfs | tee $@
+
-Index: xen-4.0.2-testing/tools/kboot/README
+Index: xen-4.1.0-testing/tools/kboot/README
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/kboot/README
++++ xen-4.1.0-testing/tools/kboot/README
@@ -0,0 +1,43 @@
+
+This is a simple kexec-based boot loader
@@ -1633,10 +1633,10 @@
+
+--
+Gerd Hoffmann
-Index: xen-4.0.2-testing/tools/kboot/init
+Index: xen-4.1.0-testing/tools/kboot/init
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/kboot/init
++++ xen-4.1.0-testing/tools/kboot/init
@@ -0,0 +1,309 @@
+#!/bin/sh
+
@@ -1947,10 +1947,10 @@
+msg "bye ..."
+banner "boot $guestos"
+xc_kexec -e
-Index: xen-4.0.2-testing/tools/kboot/mkinitramfs
+Index: xen-4.1.0-testing/tools/kboot/mkinitramfs
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/kboot/mkinitramfs
++++ xen-4.1.0-testing/tools/kboot/mkinitramfs
@@ -0,0 +1,111 @@
+#!/bin/sh
+
@@ -2063,10 +2063,10 @@
+ echo "file $LIB/$(basename $lib) $lib 0755 0 0"
+done
+echo
-Index: xen-4.0.2-testing/tools/kboot/select-kernel
+Index: xen-4.1.0-testing/tools/kboot/select-kernel
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/kboot/select-kernel
++++ xen-4.1.0-testing/tools/kboot/select-kernel
@@ -0,0 +1,59 @@
+#!/bin/sh
+
@@ -2127,10 +2127,10 @@
+msg "using $kernelname"
+echo "$kernelname"
+
-Index: xen-4.0.2-testing/make-kboot
+Index: xen-4.1.0-testing/make-kboot
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/make-kboot
++++ xen-4.1.0-testing/make-kboot
@@ -0,0 +1,37 @@
+#!/bin/sh
+
++++++ tools-xc_kexec.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -23,10 +23,10 @@
tools/xcutils/xc_kexec.c | 503 +++++++++++++++
19 files changed, 4988 insertions(+), 2 deletions(-)
-Index: xen-4.0.2-testing/tools/xcutils/Makefile
+Index: xen-4.1.0-testing/tools/xcutils/Makefile
===================================================================
---- xen-4.0.2-testing.orig/tools/xcutils/Makefile
-+++ xen-4.0.2-testing/tools/xcutils/Makefile
+--- xen-4.1.0-testing.orig/tools/xcutils/Makefile
++++ xen-4.1.0-testing/tools/xcutils/Makefile
@@ -14,7 +14,7 @@ include $(XEN_ROOT)/tools/Rules.mk
CFLAGS += -Werror
CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
@@ -34,7 +34,7 @@
-PROGRAMS = xc_restore xc_save readnotes lsevtchn
+PROGRAMS = xc_restore xc_save readnotes lsevtchn xc_kexec
- LDLIBS = $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenguest) $(LDFLAGS_libxenstore)
+ LDLIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore)
@@ -27,6 +27,11 @@ build: $(PROGRAMS)
$(PROGRAMS): %: %.o
@@ -55,10 +55,10 @@
+ make -C helper clean
-include $(DEPS)
-Index: xen-4.0.2-testing/tools/xcutils/helper/Makefile
+Index: xen-4.1.0-testing/tools/xcutils/helper/Makefile
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/xcutils/helper/Makefile
++++ xen-4.1.0-testing/tools/xcutils/helper/Makefile
@@ -0,0 +1,39 @@
+
+XEN_ROOT = ../../..
@@ -99,10 +99,10 @@
+# dependencies
+
+$(XEN_TARGET_ARCH)/entry.o: $(XEN_TARGET_ARCH)/entry.S $(XEN_TARGET_ARCH)/offsets.h
-Index: xen-4.0.2-testing/tools/xcutils/helper/console.c
+Index: xen-4.1.0-testing/tools/xcutils/helper/console.c
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/xcutils/helper/console.c
++++ xen-4.1.0-testing/tools/xcutils/helper/console.c
@@ -0,0 +1,69 @@
+#include
+
@@ -173,10 +173,10 @@
+
+ return printed_len;
+}
-Index: xen-4.0.2-testing/tools/xcutils/helper/ctype.c
+Index: xen-4.1.0-testing/tools/xcutils/helper/ctype.c
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/xcutils/helper/ctype.c
++++ xen-4.1.0-testing/tools/xcutils/helper/ctype.c
@@ -0,0 +1,35 @@
+/*
+ * linux/lib/ctype.c
@@ -213,10 +213,10 @@
+_L,_L,_L,_L,_L,_L,_L,_P,_L,_L,_L,_L,_L,_L,_L,_L}; /* 240-255 */
+
+EXPORT_SYMBOL(_ctype);
-Index: xen-4.0.2-testing/tools/xcutils/helper/ctype.h
+Index: xen-4.1.0-testing/tools/xcutils/helper/ctype.h
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/xcutils/helper/ctype.h
++++ xen-4.1.0-testing/tools/xcutils/helper/ctype.h
@@ -0,0 +1,54 @@
+#ifndef _LINUX_CTYPE_H
+#define _LINUX_CTYPE_H
@@ -272,10 +272,10 @@
+#define toupper(c) __toupper(c)
+
+#endif
-Index: xen-4.0.2-testing/tools/xcutils/helper/helper.h
+Index: xen-4.1.0-testing/tools/xcutils/helper/helper.h
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/xcutils/helper/helper.h
++++ xen-4.1.0-testing/tools/xcutils/helper/helper.h
@@ -0,0 +1,107 @@
+#include
+#include
@@ -384,10 +384,10 @@
+int sprintf(char * buf, const char *fmt, ...);
+int vsscanf(const char * buf, const char * fmt, va_list args);
+int sscanf(const char * buf, const char * fmt, ...);
-Index: xen-4.0.2-testing/tools/xcutils/helper/main.c
+Index: xen-4.1.0-testing/tools/xcutils/helper/main.c
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/xcutils/helper/main.c
++++ xen-4.1.0-testing/tools/xcutils/helper/main.c
@@ -0,0 +1,651 @@
+#include
+#include "hypercall.h"
@@ -1040,10 +1040,10 @@
+ printk("\r\n");
+ start_kernel();
+}
-Index: xen-4.0.2-testing/tools/xcutils/helper/make-offsets.c
+Index: xen-4.1.0-testing/tools/xcutils/helper/make-offsets.c
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/xcutils/helper/make-offsets.c
++++ xen-4.1.0-testing/tools/xcutils/helper/make-offsets.c
@@ -0,0 +1,28 @@
+#include
+#include
@@ -1073,10 +1073,10 @@
+ vcpu_off("cr3", ctrlreg[3]);
+ return 0;
+}
-Index: xen-4.0.2-testing/tools/xcutils/helper/printk.c
+Index: xen-4.1.0-testing/tools/xcutils/helper/printk.c
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/xcutils/helper/printk.c
++++ xen-4.1.0-testing/tools/xcutils/helper/printk.c
@@ -0,0 +1,1051 @@
+/*
+ * linux/kernel/printk.c
@@ -2129,10 +2129,10 @@
+ printk_ratelimit_burst);
+}
+EXPORT_SYMBOL(printk_ratelimit);
-Index: xen-4.0.2-testing/tools/xcutils/helper/string.c
+Index: xen-4.1.0-testing/tools/xcutils/helper/string.c
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/xcutils/helper/string.c
++++ xen-4.1.0-testing/tools/xcutils/helper/string.c
@@ -0,0 +1,601 @@
+/*
+ * linux/lib/string.c
@@ -2735,10 +2735,10 @@
+}
+EXPORT_SYMBOL(memchr);
+#endif
-Index: xen-4.0.2-testing/tools/xcutils/helper/vsprintf.c
+Index: xen-4.1.0-testing/tools/xcutils/helper/vsprintf.c
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/xcutils/helper/vsprintf.c
++++ xen-4.1.0-testing/tools/xcutils/helper/vsprintf.c
@@ -0,0 +1,842 @@
+/*
+ * linux/lib/vsprintf.c
@@ -3582,10 +3582,10 @@
+}
+
+EXPORT_SYMBOL(sscanf);
-Index: xen-4.0.2-testing/tools/xcutils/helper/x86_32/div64.h
+Index: xen-4.1.0-testing/tools/xcutils/helper/x86_32/div64.h
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/xcutils/helper/x86_32/div64.h
++++ xen-4.1.0-testing/tools/xcutils/helper/x86_32/div64.h
@@ -0,0 +1,48 @@
+#ifndef __I386_DIV64
+#define __I386_DIV64
@@ -3635,10 +3635,10 @@
+
+}
+#endif
-Index: xen-4.0.2-testing/tools/xcutils/helper/x86_32/entry.S
+Index: xen-4.1.0-testing/tools/xcutils/helper/x86_32/entry.S
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/xcutils/helper/x86_32/entry.S
++++ xen-4.1.0-testing/tools/xcutils/helper/x86_32/entry.S
@@ -0,0 +1,49 @@
+#include "offsets.h"
+
@@ -3689,10 +3689,10 @@
+ nop
+ .align 4096
+hypercall_end:
-Index: xen-4.0.2-testing/tools/xcutils/helper/x86_32/hypercall.h
+Index: xen-4.1.0-testing/tools/xcutils/helper/x86_32/hypercall.h
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/xcutils/helper/x86_32/hypercall.h
++++ xen-4.1.0-testing/tools/xcutils/helper/x86_32/hypercall.h
@@ -0,0 +1,359 @@
+/******************************************************************************
+ * hypercall.h
@@ -4053,10 +4053,10 @@
+
+
+#endif /* __HYPERCALL_H__ */
-Index: xen-4.0.2-testing/tools/xcutils/helper/x86_64/div64.h
+Index: xen-4.1.0-testing/tools/xcutils/helper/x86_64/div64.h
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/xcutils/helper/x86_64/div64.h
++++ xen-4.1.0-testing/tools/xcutils/helper/x86_64/div64.h
@@ -0,0 +1,57 @@
+#ifndef _ASM_GENERIC_DIV64_H
+#define _ASM_GENERIC_DIV64_H
@@ -4115,10 +4115,10 @@
+#endif /* BITS_PER_LONG */
+
+#endif /* _ASM_GENERIC_DIV64_H */
-Index: xen-4.0.2-testing/tools/xcutils/helper/x86_64/entry.S
+Index: xen-4.1.0-testing/tools/xcutils/helper/x86_64/entry.S
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/xcutils/helper/x86_64/entry.S
++++ xen-4.1.0-testing/tools/xcutils/helper/x86_64/entry.S
@@ -0,0 +1,50 @@
+#include "offsets.h"
+
@@ -4170,10 +4170,10 @@
+ nop
+ .align 4096
+hypercall_end:
-Index: xen-4.0.2-testing/tools/xcutils/helper/x86_64/hypercall.h
+Index: xen-4.1.0-testing/tools/xcutils/helper/x86_64/hypercall.h
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/xcutils/helper/x86_64/hypercall.h
++++ xen-4.1.0-testing/tools/xcutils/helper/x86_64/hypercall.h
@@ -0,0 +1,354 @@
+/******************************************************************************
+ * hypercall.h
@@ -4529,10 +4529,10 @@
+}
+
+#endif /* __HYPERCALL_H__ */
-Index: xen-4.0.2-testing/tools/xcutils/kexec-syscall.h
+Index: xen-4.1.0-testing/tools/xcutils/kexec-syscall.h
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/xcutils/kexec-syscall.h
++++ xen-4.1.0-testing/tools/xcutils/kexec-syscall.h
@@ -0,0 +1,80 @@
+#ifndef KEXEC_SYSCALL_H
+#define KEXEC_SYSCALL_H
@@ -4614,10 +4614,10 @@
+#define KEXEC_MAX_SEGMENTS 16
+
+#endif /* KEXEC_SYSCALL_H */
-Index: xen-4.0.2-testing/tools/xcutils/xc_kexec.c
+Index: xen-4.1.0-testing/tools/xcutils/xc_kexec.c
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/xcutils/xc_kexec.c
++++ xen-4.1.0-testing/tools/xcutils/xc_kexec.c
@@ -0,0 +1,503 @@
+#include
+#include
++++++ udev-rules.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,17 +1,9 @@
-Index: xen-4.0.2-testing/tools/hotplug/Linux/xen-backend.rules
+Index: xen-4.1.0-testing/tools/hotplug/Linux/xen-backend.rules
===================================================================
---- xen-4.0.2-testing.orig/tools/hotplug/Linux/xen-backend.rules
-+++ xen-4.0.2-testing/tools/hotplug/Linux/xen-backend.rules
-@@ -7,5 +7,10 @@ SUBSYSTEM=="xen-backend", KERNEL=="vif-*
- SUBSYSTEM=="xen-backend", KERNEL=="vscsi*", RUN+="/etc/xen/scripts/vscsi $env{ACTION}"
- SUBSYSTEM=="xen-backend", ACTION=="remove", RUN+="/etc/xen/scripts/xen-hotplug-cleanup"
- KERNEL=="evtchn", NAME="xen/%k"
--KERNEL=="blktap[0-9]*", NAME="xen/%k"
--KERNEL=="pci_iomul", NAME="xen/%k"
-+SUBSYSTEM=="xen", KERNEL=="blktap[0-9]*", NAME="xen/%k", MODE="0600"
-+SUBSYSTEM=="blktap2", KERNEL=="blktap[0-9]*", NAME="xen/blktap-2/%k", MODE="0600"
-+KERNEL=="blktap-control", NAME="xen/blktap-2/control", MODE="0600"
-+KERNEL=="gntdev", NAME="xen/%k", MODE="0600"
-+KERNEL=="pci_iomul", NAME="xen/%k", MODE="0600"
-+KERNEL=="tapdev[a-z]*", NAME="xen/blktap-2/tapdev%m", MODE="0600"
+--- xen-4.1.0-testing.orig/tools/hotplug/Linux/xen-backend.rules
++++ xen-4.1.0-testing/tools/hotplug/Linux/xen-backend.rules
+@@ -14,3 +14,4 @@ KERNEL=="gntdev", NAME="xen/%k", MODE="0
+ KERNEL=="pci_iomul", NAME="xen/%k", MODE="0600"
+ KERNEL=="tapdev[a-z]*", NAME="xen/blktap-2/tapdev%m", MODE="0600"
+ SUBSYSTEM=="net", KERNEL=="tap*", ACTION=="add", RUN+="/etc/xen/scripts/vif-setup $env{ACTION} type_if=tap"
+KERNELS=="xen", KERNEL=="xvd*", SUBSYSTEM=="block", OPTIONS+="last_rule"
++++++ usb-list.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -15,11 +15,11 @@
http://www.gossamer-threads.com/lists/xen/devel/181021?search_string=usb-lis...
-Index: xen-4.0.2-testing/tools/python/xen/xm/main.py
+Index: xen-4.1.0-testing/tools/python/xen/xm/main.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xm/main.py
-+++ xen-4.0.2-testing/tools/python/xen/xm/main.py
-@@ -2545,10 +2545,22 @@ def xm_usb_list(args):
+--- xen-4.1.0-testing.orig/tools/python/xen/xm/main.py
++++ xen-4.1.0-testing/tools/python/xen/xm/main.py
+@@ -2629,10 +2629,22 @@ def xm_usb_list(args):
ni = parse_dev_info(x[1])
ni['idx'] = int(x[0])
usbver = sxp.child_value(x[1], 'usb-ver')
++++++ vif-bridge-no-iptables.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,13 +1,17 @@
-Index: xen-4.0.2-testing/tools/hotplug/Linux/vif-bridge
+Index: xen-4.1.0-testing/tools/hotplug/Linux/vif-bridge
===================================================================
---- xen-4.0.2-testing.orig/tools/hotplug/Linux/vif-bridge
-+++ xen-4.0.2-testing/tools/hotplug/Linux/vif-bridge
-@@ -91,7 +91,7 @@ case "$command" in
+--- xen-4.1.0-testing.orig/tools/hotplug/Linux/vif-bridge
++++ xen-4.1.0-testing/tools/hotplug/Linux/vif-bridge
+@@ -101,9 +101,9 @@ case "$command" in
;;
esac
--handle_iptable
-+#handle_iptable
+-if [ "$type_if" = vif ]; then
+- handle_iptable
+-fi
++#if [ "$type_if" = vif ]; then
++# handle_iptable
++#fi
- log debug "Successful vif-bridge $command for $vif, bridge $bridge."
- if [ "$command" == "online" ]
+ log debug "Successful vif-bridge $command for $dev, bridge $bridge."
+ if [ "$type_if" = vif -a "$command" = "online" ]
++++++ vif-bridge.mtu.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -15,19 +15,19 @@
tools/hotplug/Linux/vif-bridge | 5 +++++
1 file changed, 5 insertions(+)
-Index: xen-4.0.2-testing/tools/hotplug/Linux/vif-bridge
+Index: xen-4.1.0-testing/tools/hotplug/Linux/vif-bridge
===================================================================
---- xen-4.0.2-testing.orig/tools/hotplug/Linux/vif-bridge
-+++ xen-4.0.2-testing/tools/hotplug/Linux/vif-bridge
-@@ -82,6 +82,11 @@ fi
- case "$command" in
- online)
- setup_bridge_port "$vif"
+--- xen-4.1.0-testing.orig/tools/hotplug/Linux/vif-bridge
++++ xen-4.1.0-testing/tools/hotplug/Linux/vif-bridge
+@@ -97,6 +97,11 @@ case "$command" in
+
+ add)
+ setup_virtual_bridge_port "$dev"
+ mtu="`ip link show $bridge | awk '/mtu/ { print $5 }'`"
+ if [ -n "$mtu" ] && [ "$mtu" -gt 0 ]
+ then
+ ip link set $vif mtu $mtu || :
+ fi
- add_to_bridge "$bridge" "$vif"
+ add_to_bridge "$bridge" "$dev"
;;
-
+ esac
++++++ vif-route-ifup.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/hotplug/Linux/vif-route-ifup
+Index: xen-4.1.0-testing/tools/hotplug/Linux/vif-route-ifup
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/hotplug/Linux/vif-route-ifup
++++ xen-4.1.0-testing/tools/hotplug/Linux/vif-route-ifup
@@ -0,0 +1,34 @@
+#!/bin/bash
+#============================================================================
@@ -37,11 +37,11 @@
+then
+ success
+fi
-Index: xen-4.0.2-testing/tools/examples/xend-config.sxp
+Index: xen-4.1.0-testing/tools/examples/xend-config.sxp
===================================================================
---- xen-4.0.2-testing.orig/tools/examples/xend-config.sxp
-+++ xen-4.0.2-testing/tools/examples/xend-config.sxp
-@@ -184,6 +184,26 @@
+--- xen-4.1.0-testing.orig/tools/examples/xend-config.sxp
++++ xen-4.1.0-testing/tools/examples/xend-config.sxp
+@@ -200,6 +200,26 @@
#(network-script network-route)
#(vif-script vif-route)
@@ -68,11 +68,11 @@
## Use the following if network traffic is routed with NAT, as an alternative
# to the settings for bridged networking given above.
-Index: xen-4.0.2-testing/tools/hotplug/Linux/Makefile
+Index: xen-4.1.0-testing/tools/hotplug/Linux/Makefile
===================================================================
---- xen-4.0.2-testing.orig/tools/hotplug/Linux/Makefile
-+++ xen-4.0.2-testing/tools/hotplug/Linux/Makefile
-@@ -9,7 +9,7 @@ XENDOMAINS_SYSCONFIG = init.d/sysconfig.
+--- xen-4.1.0-testing.orig/tools/hotplug/Linux/Makefile
++++ xen-4.1.0-testing/tools/hotplug/Linux/Makefile
+@@ -11,7 +11,7 @@ XENCOMMONS_SYSCONFIG = init.d/sysconfig.
# Xen script dir and scripts to go there.
XEN_SCRIPTS = network-bridge vif-bridge
@@ -80,4 +80,4 @@
+XEN_SCRIPTS += network-route vif-route vif-route-ifup
XEN_SCRIPTS += network-nat vif-nat
XEN_SCRIPTS += vif2
- XEN_SCRIPTS += block
+ XEN_SCRIPTS += vif-setup
++++++ x86-cpufreq-report.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,17 +1,17 @@
-Index: xen-4.0.2-testing/xen/arch/x86/platform_hypercall.c
+Index: xen-4.1.0-testing/xen/arch/x86/platform_hypercall.c
===================================================================
---- xen-4.0.2-testing.orig/xen/arch/x86/platform_hypercall.c
-+++ xen-4.0.2-testing/xen/arch/x86/platform_hypercall.c
-@@ -21,7 +21,7 @@
- #include
+--- xen-4.1.0-testing.orig/xen/arch/x86/platform_hypercall.c
++++ xen-4.1.0-testing/xen/arch/x86/platform_hypercall.c
+@@ -22,7 +22,7 @@
+ #include
#include
#include
-#include
+#include
#include
#include
- #include "cpu/mtrr/mtrr.h"
-@@ -62,6 +62,7 @@ static long cpu_down_helper(void *hdl, v
+ #include
+@@ -62,6 +62,7 @@ long cpu_down_helper(void *data);
ret_t do_platform_op(XEN_GUEST_HANDLE(xen_platform_op_t) u_xenpf_op)
{
ret_t ret = 0;
@@ -19,7 +19,7 @@
struct xen_platform_op curop, *op = &curop;
if ( !IS_PRIV(current->domain) )
-@@ -488,6 +489,24 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe
+@@ -493,6 +494,24 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe
op->u.mem_add.epfn,
op->u.mem_add.pxm);
break;
@@ -32,10 +32,10 @@
+ break;
+ }
+
-+ op->u.get_cpu_freq.freq = cpufreq_cpu_policy[v->processor]
++ op->u.get_cpu_freq.freq = per_cpu(cpufreq_cpu_policy, v->processor)
+ ? cpufreq_driver->get
+ ? cpufreq_driver->get(v->processor)
-+ : cpufreq_cpu_policy[v->processor]->cur
++ : per_cpu(cpufreq_cpu_policy, v->processor)->cur
+ : 0;
+ if ( copy_field_to_guest(u_xenpf_op, op, u.get_cpu_freq.freq) )
+ ret = -EFAULT;
@@ -44,10 +44,10 @@
default:
ret = -ENOSYS;
break;
-Index: xen-4.0.2-testing/xen/include/public/platform.h
+Index: xen-4.1.0-testing/xen/include/public/platform.h
===================================================================
---- xen-4.0.2-testing.orig/xen/include/public/platform.h
-+++ xen-4.0.2-testing/xen/include/public/platform.h
+--- xen-4.1.0-testing.orig/xen/include/public/platform.h
++++ xen-4.1.0-testing/xen/include/public/platform.h
@@ -355,6 +355,14 @@ struct xenpf_mem_hotadd
uint32_t flags;
};
++++++ x86-extra-trap-info.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,32 +1,48 @@
-Index: xen-4.0.2-testing/xen/arch/x86/x86_32/entry.S
+Index: xen-4.1.0-testing/xen/arch/x86/x86_32/entry.S
===================================================================
---- xen-4.0.2-testing.orig/xen/arch/x86/x86_32/entry.S
-+++ xen-4.0.2-testing/xen/arch/x86/x86_32/entry.S
-@@ -403,21 +403,33 @@ ring1: /* obtain ss/esp from oldss/olde
+--- xen-4.1.0-testing.orig/xen/arch/x86/x86_32/entry.S
++++ xen-4.1.0-testing/xen/arch/x86/x86_32/entry.S
+@@ -389,29 +389,41 @@ UNLIKELY_END(bounce_vm86_3)
movl %eax,UREGS_eip+4(%esp)
ret
- .section __ex_table,"a"
-- .long .Lft6,domain_crash_synchronous , .Lft7,domain_crash_synchronous
-- .long .Lft8,domain_crash_synchronous , .Lft9,domain_crash_synchronous
-- .long .Lft10,domain_crash_synchronous , .Lft11,domain_crash_synchronous
-- .long .Lft12,domain_crash_synchronous , .Lft13,domain_crash_synchronous
-- .long .Lft14,domain_crash_synchronous , .Lft15,domain_crash_synchronous
-- .long .Lft16,domain_crash_synchronous , .Lft17,domain_crash_synchronous
-- .long .Lft18,domain_crash_synchronous , .Lft19,domain_crash_synchronous
-- .long .Lft20,domain_crash_synchronous , .Lft21,domain_crash_synchronous
-- .long .Lft22,domain_crash_synchronous , .Lft23,domain_crash_synchronous
-- .long .Lft24,domain_crash_synchronous , .Lft25,domain_crash_synchronous
-+ .long .Lft6,domain_crash_synchronous , .Lft7,domain_crash_page_fault
-+ .long .Lft8,domain_crash_page_fault_4 , .Lft9,domain_crash_page_fault_8
-+ .long .Lft10,domain_crash_page_fault_12, .Lft11,domain_crash_page_fault
-+ .long .Lft12,domain_crash_page_fault_4 , .Lft13,domain_crash_synchronous
-+ .long .Lft14,domain_crash_page_fault , .Lft15,domain_crash_page_fault_4
-+ .long .Lft16,domain_crash_page_fault_8 , .Lft17,domain_crash_page_fault
-+ .long .Lft18,domain_crash_page_fault , .Lft19,domain_crash_page_fault_4
-+ .long .Lft20,domain_crash_page_fault_8 , .Lft21,domain_crash_page_fault_12
-+ .long .Lft22,domain_crash_page_fault , .Lft23,domain_crash_page_fault_4
-+ .long .Lft24,domain_crash_page_fault_8 , .Lft25,domain_crash_page_fault_12
- .previous
+ _ASM_EXTABLE(.Lft6, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft7, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft8, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft9, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft10, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft11, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft12, domain_crash_synchronous)
++ _ASM_EXTABLE(.Lft7, domain_crash_page_fault)
++ _ASM_EXTABLE(.Lft8, domain_crash_page_fault_4)
++ _ASM_EXTABLE(.Lft9, domain_crash_page_fault_8)
++ _ASM_EXTABLE(.Lft10, domain_crash_page_fault_12)
++ _ASM_EXTABLE(.Lft11, domain_crash_page_fault)
++ _ASM_EXTABLE(.Lft12, domain_crash_page_fault_4)
+ _ASM_EXTABLE(.Lft13, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft14, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft15, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft16, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft17, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft18, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft19, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft20, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft21, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft22, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft23, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft24, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft25, domain_crash_synchronous)
++ _ASM_EXTABLE(.Lft14, domain_crash_page_fault)
++ _ASM_EXTABLE(.Lft15, domain_crash_page_fault_4)
++ _ASM_EXTABLE(.Lft16, domain_crash_page_fault_8)
++ _ASM_EXTABLE(.Lft17, domain_crash_page_fault)
++ _ASM_EXTABLE(.Lft18, domain_crash_page_fault)
++ _ASM_EXTABLE(.Lft19, domain_crash_page_fault_4)
++ _ASM_EXTABLE(.Lft20, domain_crash_page_fault_8)
++ _ASM_EXTABLE(.Lft21, domain_crash_page_fault_12)
++ _ASM_EXTABLE(.Lft22, domain_crash_page_fault)
++ _ASM_EXTABLE(.Lft23, domain_crash_page_fault_4)
++ _ASM_EXTABLE(.Lft24, domain_crash_page_fault_8)
++ _ASM_EXTABLE(.Lft25, domain_crash_page_fault_12)
+.section .rodata,"a"
domain_crash_synchronous_string:
@@ -46,27 +62,38 @@
domain_crash_synchronous:
pushl $domain_crash_synchronous_string
call printk
-Index: xen-4.0.2-testing/xen/arch/x86/x86_64/entry.S
+Index: xen-4.1.0-testing/xen/arch/x86/x86_64/entry.S
===================================================================
---- xen-4.0.2-testing.orig/xen/arch/x86/x86_64/entry.S
-+++ xen-4.0.2-testing/xen/arch/x86/x86_64/entry.S
-@@ -421,17 +421,30 @@ create_bounce_frame:
+--- xen-4.1.0-testing.orig/xen/arch/x86/x86_64/entry.S
++++ xen-4.1.0-testing/xen/arch/x86/x86_64/entry.S
+@@ -408,22 +408,35 @@ UNLIKELY_END(bounce_failsafe)
+ jz domain_crash_synchronous
movq %rax,UREGS_rip+8(%rsp)
ret
- .section __ex_table,"a"
-- .quad .Lft2,domain_crash_synchronous , .Lft3,domain_crash_synchronous
-- .quad .Lft4,domain_crash_synchronous , .Lft5,domain_crash_synchronous
-- .quad .Lft6,domain_crash_synchronous , .Lft7,domain_crash_synchronous
-- .quad .Lft8,domain_crash_synchronous , .Lft9,domain_crash_synchronous
-- .quad .Lft10,domain_crash_synchronous , .Lft11,domain_crash_synchronous
-- .quad .Lft12,domain_crash_synchronous , .Lft13,domain_crash_synchronous
-+ .quad .Lft2,domain_crash_page_fault_32, .Lft3,domain_crash_page_fault_24
-+ .quad .Lft4,domain_crash_page_fault_8 , .Lft5,domain_crash_page_fault_16
-+ .quad .Lft6,domain_crash_page_fault , .Lft7,domain_crash_page_fault
-+ .quad .Lft8,domain_crash_page_fault_24, .Lft9,domain_crash_page_fault_16
-+ .quad .Lft10,domain_crash_page_fault_8 , .Lft11,domain_crash_page_fault
-+ .quad .Lft12,domain_crash_page_fault_8 , .Lft13,domain_crash_page_fault
- .previous
+- _ASM_EXTABLE(.Lft2, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft3, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft4, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft5, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft6, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft7, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft8, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft9, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft10, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft11, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft12, domain_crash_synchronous)
+- _ASM_EXTABLE(.Lft13, domain_crash_synchronous)
++ _ASM_EXTABLE(.Lft2, domain_crash_page_fault_32)
++ _ASM_EXTABLE(.Lft3, domain_crash_page_fault_24)
++ _ASM_EXTABLE(.Lft4, domain_crash_page_fault_8)
++ _ASM_EXTABLE(.Lft5, domain_crash_page_fault_16)
++ _ASM_EXTABLE(.Lft6, domain_crash_page_fault)
++ _ASM_EXTABLE(.Lft7, domain_crash_page_fault)
++ _ASM_EXTABLE(.Lft8, domain_crash_page_fault_24)
++ _ASM_EXTABLE(.Lft9, domain_crash_page_fault_16)
++ _ASM_EXTABLE(.Lft10, domain_crash_page_fault_8)
++ _ASM_EXTABLE(.Lft11, domain_crash_page_fault)
++ _ASM_EXTABLE(.Lft12, domain_crash_page_fault_8)
++ _ASM_EXTABLE(.Lft13, domain_crash_page_fault)
+.section .rodata,"a"
domain_crash_synchronous_string:
@@ -86,4 +113,4 @@
+ call show_page_walk
ENTRY(domain_crash_synchronous)
# Get out of the guest-save area of the stack.
- GET_GUEST_REGS(%rax)
+ GET_CPUINFO_FIELD(CPUINFO_guest_cpu_user_regs,%rax)
++++++ x86-ioapic-ack-default.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,10 +1,10 @@
Change default IO-APIC ack mode for single IO-APIC systems to old-style.
-Index: xen-4.0.2-testing/xen/arch/x86/io_apic.c
+Index: xen-4.1.0-testing/xen/arch/x86/io_apic.c
===================================================================
---- xen-4.0.2-testing.orig/xen/arch/x86/io_apic.c
-+++ xen-4.0.2-testing/xen/arch/x86/io_apic.c
-@@ -1551,7 +1551,7 @@ static unsigned int startup_level_ioapic
+--- xen-4.1.0-testing.orig/xen/arch/x86/io_apic.c
++++ xen-4.1.0-testing/xen/arch/x86/io_apic.c
+@@ -1546,7 +1546,7 @@ static unsigned int startup_level_ioapic
return 0; /* don't check for pending */
}
@@ -13,7 +13,7 @@
static void setup_ioapic_ack(char *s)
{
if ( !strcmp(s, "old") )
-@@ -2067,6 +2067,8 @@ void __init setup_IO_APIC(void)
+@@ -2053,6 +2053,8 @@ void __init setup_IO_APIC(void)
else
io_apic_irqs = ~PIC_IRQS;
++++++ x86-show-page-walk-early.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,21 +1,21 @@
-Index: xen-4.0.2-testing/xen/arch/x86/mm.c
+Index: xen-4.1.0-testing/xen/arch/x86/mm.c
===================================================================
---- xen-4.0.2-testing.orig/xen/arch/x86/mm.c
-+++ xen-4.0.2-testing/xen/arch/x86/mm.c
-@@ -154,6 +154,8 @@ unsigned long __read_mostly pdx_group_va
- int opt_allow_hugepage;
- boolean_param("allowhugepage", opt_allow_hugepage);
+--- xen-4.1.0-testing.orig/xen/arch/x86/mm.c
++++ xen-4.1.0-testing/xen/arch/x86/mm.c
+@@ -160,6 +160,8 @@ static int get_superpage(unsigned long m
+ #endif
+ static void put_superpage(unsigned long mfn);
+bool_t __read_mostly mpt_valid;
+
#define l1_disallow_mask(d) \
((d != dom_io) && \
(rangeset_is_empty((d)->iomem_caps) && \
-Index: xen-4.0.2-testing/xen/arch/x86/traps.c
+Index: xen-4.1.0-testing/xen/arch/x86/traps.c
===================================================================
---- xen-4.0.2-testing.orig/xen/arch/x86/traps.c
-+++ xen-4.0.2-testing/xen/arch/x86/traps.c
-@@ -1354,6 +1354,7 @@ asmlinkage void do_early_page_fault(stru
+--- xen-4.1.0-testing.orig/xen/arch/x86/traps.c
++++ xen-4.1.0-testing/xen/arch/x86/traps.c
+@@ -1343,6 +1343,7 @@ asmlinkage void __init do_early_page_fau
unsigned long *stk = (unsigned long *)regs;
printk("Early fatal page fault at %04x:%p (cr2=%p, ec=%04x)\n",
regs->cs, _p(regs->eip), _p(cr2), regs->error_code);
@@ -23,11 +23,11 @@
printk("Stack dump: ");
while ( ((long)stk & ((PAGE_SIZE - 1) & ~(BYTES_PER_LONG - 1))) != 0 )
printk("%p ", _p(*stk++));
-Index: xen-4.0.2-testing/xen/arch/x86/x86_32/mm.c
+Index: xen-4.1.0-testing/xen/arch/x86/x86_32/mm.c
===================================================================
---- xen-4.0.2-testing.orig/xen/arch/x86/x86_32/mm.c
-+++ xen-4.0.2-testing/xen/arch/x86/x86_32/mm.c
-@@ -122,6 +122,8 @@ void __init paging_init(void)
+--- xen-4.1.0-testing.orig/xen/arch/x86/x86_32/mm.c
++++ xen-4.1.0-testing/xen/arch/x86/x86_32/mm.c
+@@ -123,6 +123,8 @@ void __init paging_init(void)
#undef CNT
#undef MFN
@@ -36,11 +36,11 @@
/* Create page tables for ioremap()/map_domain_page_global(). */
for ( i = 0; i < (IOREMAP_MBYTES >> (L2_PAGETABLE_SHIFT - 20)); i++ )
{
-Index: xen-4.0.2-testing/xen/arch/x86/x86_32/traps.c
+Index: xen-4.1.0-testing/xen/arch/x86/x86_32/traps.c
===================================================================
---- xen-4.0.2-testing.orig/xen/arch/x86/x86_32/traps.c
-+++ xen-4.0.2-testing/xen/arch/x86/x86_32/traps.c
-@@ -161,7 +161,8 @@ void show_page_walk(unsigned long addr)
+--- xen-4.1.0-testing.orig/xen/arch/x86/x86_32/traps.c
++++ xen-4.1.0-testing/xen/arch/x86/x86_32/traps.c
+@@ -164,7 +164,8 @@ void show_page_walk(unsigned long addr)
l3t += (cr3 & 0xFE0UL) >> 3;
l3e = l3t[l3_table_offset(addr)];
mfn = l3e_get_pfn(l3e);
@@ -50,7 +50,7 @@
printk(" L3[0x%03lx] = %"PRIpte" %08lx\n",
l3_table_offset(addr), l3e_get_intpte(l3e), pfn);
unmap_domain_page(l3t);
-@@ -172,7 +173,8 @@ void show_page_walk(unsigned long addr)
+@@ -175,7 +176,8 @@ void show_page_walk(unsigned long addr)
l2t = map_domain_page(mfn);
l2e = l2t[l2_table_offset(addr)];
mfn = l2e_get_pfn(l2e);
@@ -60,7 +60,7 @@
printk(" L2[0x%03lx] = %"PRIpte" %08lx %s\n",
l2_table_offset(addr), l2e_get_intpte(l2e), pfn,
(l2e_get_flags(l2e) & _PAGE_PSE) ? "(PSE)" : "");
-@@ -185,7 +187,8 @@ void show_page_walk(unsigned long addr)
+@@ -188,7 +190,8 @@ void show_page_walk(unsigned long addr)
l1t = map_domain_page(mfn);
l1e = l1t[l1_table_offset(addr)];
mfn = l1e_get_pfn(l1e);
@@ -70,11 +70,11 @@
printk(" L1[0x%03lx] = %"PRIpte" %08lx\n",
l1_table_offset(addr), l1e_get_intpte(l1e), pfn);
unmap_domain_page(l1t);
-Index: xen-4.0.2-testing/xen/arch/x86/x86_64/mm.c
+Index: xen-4.1.0-testing/xen/arch/x86/x86_64/mm.c
===================================================================
---- xen-4.0.2-testing.orig/xen/arch/x86/x86_64/mm.c
-+++ xen-4.0.2-testing/xen/arch/x86/x86_64/mm.c
-@@ -731,6 +731,8 @@ void __init paging_init(void)
+--- xen-4.1.0-testing.orig/xen/arch/x86/x86_64/mm.c
++++ xen-4.1.0-testing/xen/arch/x86/x86_64/mm.c
+@@ -749,6 +749,8 @@ void __init paging_init(void)
#undef CNT
#undef MFN
@@ -83,10 +83,10 @@
/* Create user-accessible L2 directory to map the MPT for compat guests. */
BUILD_BUG_ON(l4_table_offset(RDWR_MPT_VIRT_START) !=
l4_table_offset(HIRO_COMPAT_MPT_VIRT_START));
-Index: xen-4.0.2-testing/xen/arch/x86/x86_64/traps.c
+Index: xen-4.1.0-testing/xen/arch/x86/x86_64/traps.c
===================================================================
---- xen-4.0.2-testing.orig/xen/arch/x86/x86_64/traps.c
-+++ xen-4.0.2-testing/xen/arch/x86/x86_64/traps.c
+--- xen-4.1.0-testing.orig/xen/arch/x86/x86_64/traps.c
++++ xen-4.1.0-testing/xen/arch/x86/x86_64/traps.c
@@ -176,7 +176,8 @@ void show_page_walk(unsigned long addr)
l4t = mfn_to_virt(mfn);
l4e = l4t[l4_table_offset(addr)];
@@ -127,11 +127,11 @@
printk(" L1[0x%03lx] = %"PRIpte" %016lx\n",
l1_table_offset(addr), l1e_get_intpte(l1e), pfn);
}
-Index: xen-4.0.2-testing/xen/include/asm-x86/mm.h
+Index: xen-4.1.0-testing/xen/include/asm-x86/mm.h
===================================================================
---- xen-4.0.2-testing.orig/xen/include/asm-x86/mm.h
-+++ xen-4.0.2-testing/xen/include/asm-x86/mm.h
-@@ -443,6 +443,8 @@ TYPE_SAFE(unsigned long,mfn);
+--- xen-4.1.0-testing.orig/xen/include/asm-x86/mm.h
++++ xen-4.1.0-testing/xen/include/asm-x86/mm.h
+@@ -467,6 +467,8 @@ TYPE_SAFE(unsigned long,mfn);
#define SHARED_M2P_ENTRY (~0UL - 1UL)
#define SHARED_M2P(_e) ((_e) == SHARED_M2P_ENTRY)
++++++ xen-4.0.2-testing-src.tar.bz2 -> xen-4.1.0-testing-src.tar.bz2 ++++++
xen/xen-4.0.2-testing-src.tar.bz2 /mounts/work_src_done/STABLE/xen/xen-4.1.0-testing-src.tar.bz2 differ: char 11, line 1
++++++ xen-api-auth.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendAuthSessions.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendAuthSessions.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendAuthSessions.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendAuthSessions.py
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendAuthSessions.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendAuthSessions.py
@@ -84,7 +84,7 @@ class XendAuthSessions:
# if PAM doesn't exist, let's ignore it
return False
++++++ xen-changeset.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/xen/Makefile
+Index: xen-4.1.0-testing/xen/Makefile
===================================================================
---- xen-4.0.2-testing.orig/xen/Makefile
-+++ xen-4.0.2-testing/xen/Makefile
+--- xen-4.1.0-testing.orig/xen/Makefile
++++ xen-4.1.0-testing/xen/Makefile
@@ -1,3 +1,4 @@
+export XEN_CHANGESET = unavailable
# This is the correct place to edit the build version.
++++++ xen-config.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,39 +1,92 @@
-Index: xen-4.0.2-testing/Config.mk
+Index: xen-4.1.0-testing/Config.mk
===================================================================
---- xen-4.0.2-testing.orig/Config.mk
-+++ xen-4.0.2-testing/Config.mk
-@@ -165,7 +165,7 @@ endif
+--- xen-4.1.0-testing.orig/Config.mk
++++ xen-4.1.0-testing/Config.mk
+@@ -183,7 +183,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 ?= `pwd`/$(XEN_ROOT)/../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
+ QEMU_TAG := xen-4.1.0-rc8
+ #QEMU_TAG ?= e073e69457b4d99b6da0b6536296e3498f7f6599
+@@ -193,7 +193,7 @@ QEMU_TAG := xen-4.1.0-rc8
# Optional components
XENSTAT_XENTOP ?= y
VTPM_TOOLS ?= n
-LIBXENAPI_BINDINGS ?= n
+LIBXENAPI_BINDINGS ?= y
PYTHON_TOOLS ?= y
+ OCAML_TOOLS ?= y
CONFIG_MINITERM ?= n
- CONFIG_LOMOUNT ?= n
+Index: xen-4.1.0-testing/tools/Makefile
+===================================================================
+--- xen-4.1.0-testing.orig/tools/Makefile
++++ xen-4.1.0-testing/tools/Makefile
+@@ -79,14 +79,16 @@ IOEMU_CONFIGURE_CROSS ?= --cpu=$(XEN_TAR
+ --interp-prefix=$(CROSS_SYS_ROOT)
+ endif
+
+-QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo "$(CONFIG_QEMU)"; else echo .; fi)
+-ifneq ($(QEMU_ROOT),.)
+-export QEMU_ROOT
+-endif
++#QEMU_ROOT := $(shell if [ -d "$(CONFIG_QEMU)" ]; then echo ""; else echo .; fi)
++#ifneq ($(QEMU_ROOT),.)
++#export QEMU_ROOT
++#endif
+
+ ioemu-dir-find:
+ set -ex; \
+ if test -d $(CONFIG_QEMU); then \
++ rm -f ioemu-dir; \
++ ln -sf $(CONFIG_QEMU) ioemu-dir; \
+ mkdir -p ioemu-dir; \
+ else \
+ if [ ! -d ioemu-remote ]; then \
+@@ -108,7 +110,7 @@ ioemu-dir-find:
+ $(absolutify_xen_root); \
+ $(buildmakevars2shellvars); \
+ cd ioemu-dir; \
+- $(QEMU_ROOT)/xen-setup $(IOEMU_CONFIGURE_CROSS)
++ ./xen-setup $(IOEMU_CONFIGURE_CROSS)
---include $(XEN_ROOT)/.config
-+#-include $(XEN_ROOT)/.config
-Index: xen-4.0.2-testing/tools/libxc/Makefile
+ .PHONY: ioemu-dir-force-update
+ ioemu-dir-force-update:
+Index: xen-4.1.0-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
+--- xen-4.1.0-testing.orig/tools/libxc/Makefile
++++ xen-4.1.0-testing/tools/libxc/Makefile
+@@ -195,7 +195,7 @@ xc_dom_bzimageloader.opic: CFLAGS += $(c
- libxenguest.so.$(MAJOR).$(MINOR): LDFLAGS += $(call zlib-options,l)
+ libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(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)
-+
+- $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz -lxenctrl $(PTHREAD_LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz -lxenctrl $(PTHREAD_LIBS) $(call zlib-options,l)
+
+ xenctrl_osdep_ENOSYS.so: $(OSDEP_PIC_OBJS) libxenctrl.so
+ $(CC) -g $(CFLAGS) $(LDFLAGS) $(SHLIB_LDFLAGS) -o $@ $(OSDEP_PIC_OBJS) -lxenctrl
+Index: xen-4.1.0-testing/tools/firmware/etherboot/Makefile
+===================================================================
+--- xen-4.1.0-testing.orig/tools/firmware/etherboot/Makefile
++++ xen-4.1.0-testing/tools/firmware/etherboot/Makefile
+@@ -35,11 +35,13 @@ eb-roms.h: Config
+ mv -f $@.new $@
- -include $(DEPS)
+ $T:
+- if ! wget -O _$T $(IPXE_TARBALL_URL); then \
+- $(GIT) clone $(IPXE_GIT_URL) $D.git; \
+- (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \
+- $(IPXE_GIT_TAG) | gzip >../_$T); \
+- rm -rf $D.git; \
++ if test -f /usr/bin/wget; then \
++ if ! wget -O _$T $(IPXE_TARBALL_URL); then \
++ $(GIT) clone $(IPXE_GIT_URL) $D.git; \
++ (cd $D.git && $(GIT) archive --format=tar --prefix=$D/ \
++ $(IPXE_GIT_TAG) | gzip >../_$T); \
++ rm -rf $D.git; \
++ fi \
+ fi
+ mv _$T $T
++++++ xen-destdir.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/docs/Makefile
+Index: xen-4.1.0-testing/docs/Makefile
===================================================================
---- xen-4.0.2-testing.orig/docs/Makefile
-+++ xen-4.0.2-testing/docs/Makefile
+--- xen-4.1.0-testing.orig/docs/Makefile
++++ xen-4.1.0-testing/docs/Makefile
@@ -90,7 +90,8 @@ install: all
$(INSTALL_DIR) $(DESTDIR)$(MANDIR)
cp -dR man1 $(DESTDIR)$(MANDIR)
@@ -22,10 +22,10 @@
+ ln -sf $*.html html.done/$*/index.html
+ rm -rf html/
+
-Index: xen-4.0.2-testing/tools/security/Makefile
+Index: xen-4.1.0-testing/tools/security/Makefile
===================================================================
---- xen-4.0.2-testing.orig/tools/security/Makefile
-+++ xen-4.0.2-testing/tools/security/Makefile
+--- xen-4.1.0-testing.orig/tools/security/Makefile
++++ xen-4.1.0-testing/tools/security/Makefile
@@ -60,8 +60,8 @@ install: all $(ACM_CONFIG_FILE)
$(INSTALL_DATA) $(ACM_INST_HTML) $(DESTDIR)$(ACM_SECGEN_HTMLDIR)
$(INSTALL_DIR) $(DESTDIR)$(ACM_SECGEN_CGIDIR)
@@ -37,10 +37,10 @@
else
.PHONY: all
all:
-Index: xen-4.0.2-testing/tools/pygrub/Makefile
+Index: xen-4.1.0-testing/tools/pygrub/Makefile
===================================================================
---- xen-4.0.2-testing.orig/tools/pygrub/Makefile
-+++ xen-4.0.2-testing/tools/pygrub/Makefile
+--- xen-4.1.0-testing.orig/tools/pygrub/Makefile
++++ xen-4.1.0-testing/tools/pygrub/Makefile
@@ -11,7 +11,7 @@ build:
.PHONY: install
install: all
@@ -50,11 +50,11 @@
$(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(BINDIR)/pygrub
$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
-Index: xen-4.0.2-testing/tools/python/Makefile
+Index: xen-4.1.0-testing/tools/python/Makefile
===================================================================
---- xen-4.0.2-testing.orig/tools/python/Makefile
-+++ xen-4.0.2-testing/tools/python/Makefile
-@@ -60,7 +60,7 @@ refresh-po: $(POTFILE)
+--- xen-4.1.0-testing.orig/tools/python/Makefile
++++ xen-4.1.0-testing/tools/python/Makefile
+@@ -65,7 +65,7 @@ refresh-po: $(POTFILE)
.PHONY: install
install: install-messages install-dtd
CC="$(CC)" CFLAGS="$(CFLAGS)" $(PYTHON) setup.py install \
@@ -63,19 +63,19 @@
install-dtd: all
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/xen
-Index: xen-4.0.2-testing/tools/xenstore/Makefile
+Index: xen-4.1.0-testing/tools/xenstore/Makefile
===================================================================
---- xen-4.0.2-testing.orig/tools/xenstore/Makefile
-+++ xen-4.0.2-testing/tools/xenstore/Makefile
+--- xen-4.1.0-testing.orig/tools/xenstore/Makefile
++++ xen-4.1.0-testing/tools/xenstore/Makefile
@@ -10,6 +10,7 @@ CFLAGS += $(CFLAGS_libxenctrl)
CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod
- CLIENTS += xenstore-write xenstore-ls
+ CLIENTS += xenstore-write xenstore-ls xenstore-watch
+CLIENTS_DOMU := $(patsubst xenstore-%,domu-xenstore-%,$(CLIENTS))
XENSTORED_OBJS = xenstored_core.o xenstored_watch.o xenstored_domain.o xenstored_transaction.o xs_lib.o talloc.o utils.o tdb.o hashtable.o
-@@ -35,7 +36,7 @@ endif
+@@ -32,7 +33,7 @@ ALL_TARGETS = libxenstore.so libxenstore
all: $(ALL_TARGETS)
.PHONY: clients
@@ -84,7 +84,7 @@
ifeq ($(CONFIG_SunOS),y)
xenstored_probes.h: xenstored_probes.d
-@@ -55,6 +56,9 @@ xenstored: $(XENSTORED_OBJS)
+@@ -52,6 +53,9 @@ xenstored: $(XENSTORED_OBJS)
$(CLIENTS): xenstore
ln -f xenstore $@
@@ -94,7 +94,7 @@
xenstore: xenstore_client.o $(LIBXENSTORE)
$(CC) $(CFLAGS) $(LDFLAGS) $< -L. -lxenstore $(SOCKET_LIBS) -o $@
-@@ -82,7 +86,7 @@ clean:
+@@ -79,7 +83,7 @@ clean:
rm -f *.a *.o *.opic *.so* xenstored_probes.h
rm -f xenstored xs_random xs_stress xs_crashme
rm -f xs_tdb_dump xenstore-control
@@ -103,15 +103,15 @@
$(RM) $(DEPS)
.PHONY: TAGS
-@@ -100,6 +104,7 @@ ifneq ($(CONFIG_OCAML_XENSTORED),y)
- $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
- $(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
- endif
-+ $(INSTALL_DIR) $(DESTDIR)/bin
+@@ -95,6 +99,7 @@ install: all
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
$(INSTALL_DIR) $(DESTDIR)$(SBINDIR)
$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
-@@ -108,6 +113,9 @@ endif
++ $(INSTALL_DIR) $(DESTDIR)/bin
+ $(INSTALL_DIR) $(DESTDIR)/var/run/xenstored
+ $(INSTALL_DIR) $(DESTDIR)/var/lib/xenstored
+ $(INSTALL_PROG) xenstored $(DESTDIR)$(SBINDIR)
+@@ -103,6 +108,9 @@ install: all
set -e ; for c in $(CLIENTS) ; do \
ln -f $(DESTDIR)$(BINDIR)/xenstore $(DESTDIR)$(BINDIR)/$${c} ; \
done
@@ -121,11 +121,11 @@
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)
$(INSTALL_PROG) libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)
ln -sf libxenstore.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenstore.so.$(MAJOR)
-Index: xen-4.0.2-testing/tools/hotplug/Linux/Makefile
+Index: xen-4.1.0-testing/tools/hotplug/Linux/Makefile
===================================================================
---- xen-4.0.2-testing.orig/tools/hotplug/Linux/Makefile
-+++ xen-4.0.2-testing/tools/hotplug/Linux/Makefile
-@@ -38,18 +38,6 @@ endif
+--- xen-4.1.0-testing.orig/tools/hotplug/Linux/Makefile
++++ xen-4.1.0-testing/tools/hotplug/Linux/Makefile
+@@ -41,18 +41,6 @@ endif
UDEV_RULES_DIR = $(CONFIG_DIR)/udev
UDEV_RULES = xen-backend.rules xend.rules
@@ -144,34 +144,26 @@
.PHONY: all
all:
-@@ -57,16 +45,16 @@ all:
+@@ -60,18 +48,18 @@ all:
build:
.PHONY: install
-install: all install-initd install-scripts $(HOTPLUGS)
+install: all install-initd install-scripts install-udev
+ # See docs/misc/distro_mapping.txt for INITD_DIR location
.PHONY: install-initd
install-initd:
- [ -d $(DESTDIR)$(CONFIG_DIR)/init.d ] || $(INSTALL_DIR) $(DESTDIR)$(CONFIG_DIR)/init.d
-- [ -d $(DESTDIR)$(CONFIG_DIR)/sysconfig ] || $(INSTALL_DIR) $(DESTDIR)$(CONFIG_DIR)/sysconfig
+ [ -d $(DESTDIR)$(INITD_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(INITD_DIR)
+- [ -d $(DESTDIR)$(SYSCONFIG_DIR) ] || $(INSTALL_DIR) $(DESTDIR)$(SYSCONFIG_DIR)
+ [ -d $(DESTDIR)/var/adm/fillup-templates ] || $(INSTALL_DIR) $(DESTDIR)/var/adm/fillup-templates/
- $(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d
-- $(INSTALL_PROG) $(XEND_SYSCONFIG) $(DESTDIR)$(CONFIG_DIR)/sysconfig/xend
-+ $(INSTALL_PROG) $(XEND_SYSCONFIG) $(DESTDIR)/var/adm/fillup-templates/
- $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(CONFIG_DIR)/init.d
-- $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(CONFIG_DIR)/sysconfig/xendomains
+ $(INSTALL_PROG) $(XEND_INITD) $(DESTDIR)$(INITD_DIR)
+ $(INSTALL_PROG) $(XENDOMAINS_INITD) $(DESTDIR)$(INITD_DIR)
+- $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xendomains
+ $(INSTALL_PROG) $(XENDOMAINS_SYSCONFIG) $(DESTDIR)/var/adm/fillup-templates/
+ $(INSTALL_PROG) $(XENCOMMONS_INITD) $(DESTDIR)$(INITD_DIR)
+- $(INSTALL_PROG) $(XENCOMMONS_SYSCONFIG) $(DESTDIR)$(SYSCONFIG_DIR)/xencommons
++ $(INSTALL_PROG) $(XENCOMMONS_SYSCONFIG) $(DESTDIR)/var/adm/fillup-templates/
+ $(INSTALL_PROG) init.d/xen-watchdog $(DESTDIR)$(INITD_DIR)
.PHONY: install-scripts
- install-scripts:
-@@ -96,8 +84,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
++++++ xen-disable-qemu-monitor.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -5,10 +5,10 @@
commands that can read/write dom0's state.
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/monitor.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/monitor.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/monitor.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/monitor.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/monitor.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/monitor.c
@@ -1497,6 +1497,7 @@ static const term_cmd_t term_cmds[] = {
"device|all", "commit changes to the disk images (if -snapshot is used) or backing files" },
{ "info", "s?", do_info,
++++++ xen-domUloader.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,44 +1,7 @@
-Index: xen-4.0.2-testing/tools/python/xen/util/blkif.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/server/DevController.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/util/blkif.py
-+++ xen-4.0.2-testing/tools/python/xen/util/blkif.py
-@@ -71,8 +71,8 @@ def blkdev_segment(name):
- 'type' : 'Disk' }
- return val
-
--def _parse_uname(uname):
-- fn = taptype = None
-+def parse_uname(uname):
-+ fn = typ = taptype = None
- if uname.find(":") != -1:
- (typ, fn) = uname.split(":", 1)
-
-@@ -88,15 +88,18 @@ def _parse_uname(uname):
-
- if typ in ("tap", "tap2"):
- (taptype, fn) = fn.split(":", 1)
-- return (fn, taptype)
-+ if taptype in ("tapdisk", "ioemu"):
-+ (taptype, fn) = fn.split(":", 1)
-+ return (fn, (typ, taptype))
-+ return (fn, (typ,taptype))
-
- def blkdev_uname_to_file(uname):
- """Take a blkdev uname and return the corresponding filename."""
-- return _parse_uname(uname)[0]
-+ return parse_uname(uname)[0]
-
- def blkdev_uname_to_taptype(uname):
- """Take a blkdev uname and return the blktap type."""
-- return _parse_uname(uname)[1]
-+ return parse_uname(uname)[1]
-
- def mount_mode(name):
- mode = None
-Index: xen-4.0.2-testing/tools/python/xen/xend/server/DevController.py
-===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/server/DevController.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/server/DevController.py
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/server/DevController.py
++++ xen-4.1.0-testing/tools/python/xen/xend/server/DevController.py
@@ -592,6 +592,31 @@ class DevController:
return (Missing, None)
@@ -71,10 +34,10 @@
def backendPath(self, backdom, devid):
"""Construct backend path given the backend domain and device id.
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendBootloader.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendBootloader.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendBootloader.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendBootloader.py
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendBootloader.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendBootloader.py
@@ -12,7 +12,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
@@ -112,20 +75,11 @@
log.error(msg)
raise VmError(msg)
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
-@@ -37,7 +37,7 @@ from types import StringTypes
-
- import xen.lowlevel.xc
- from xen.util import asserts, auxbin
--from xen.util.blkif import blkdev_uname_to_file, blkdev_uname_to_taptype
-+from xen.util.blkif import parse_uname
- import xen.util.xsm.xsm as security
- from xen.util import xsconstants
- from xen.util import mkdir
-@@ -2346,6 +2346,10 @@ class XendDomainInfo:
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
+@@ -2332,6 +2332,10 @@ class XendDomainInfo:
deviceClass, config = self.info['devices'].get(dev_uuid)
self._waitForDevice(deviceClass, config['devid'])
@@ -136,37 +90,7 @@
def _waitForDevice_destroy(self, deviceClass, devid, backpath):
return self.getDeviceController(deviceClass).waitForDevice_destroy(
devid, backpath)
-@@ -3234,7 +3238,7 @@ class XendDomainInfo:
- devtype = devinfo[0]
- disk = devinfo[1]['uname']
-
-- fn = blkdev_uname_to_file(disk)
-+ (fn, types) = parse_uname(disk)
-
- # If this is a drbd volume, check if we need to activate it
- if disk.find(":") != -1:
-@@ -3245,9 +3249,18 @@ class XendDomainInfo:
- if state == 'Secondary':
- os.system('/sbin/drbdadm primary ' + diskname)
-
-- taptype = blkdev_uname_to_taptype(disk)
-- mounted = devtype in ['tap', 'tap2'] and taptype != 'aio' and taptype != 'sync' and not os.stat(fn).st_rdev
- mounted_vbd_uuid = 0
-+ def _shouldMount(types):
-+ if types[0] in ('file', 'phy'):
-+ return False
-+ if types[0] in ('tap', 'tap2'):
-+ if types[1] in ('aio', 'sync'):
-+ return False
-+ else:
-+ return True
-+ return os.access('/etc/xen/scripts/block-%s' % types[0], os.X_OK)
-+
-+ mounted = _shouldMount(types)
- if mounted:
- # This is a file, not a device. pygrub can cope with a
- # file if it's raw, but if it's QCOW or other such formats
-@@ -3264,7 +3277,8 @@ class XendDomainInfo:
+@@ -3277,7 +3281,8 @@ class XendDomainInfo:
from xen.xend import XendDomain
dom0 = XendDomain.instance().privilegedDomain()
mounted_vbd_uuid = dom0.create_vbd(vbd, disk);
@@ -176,7 +100,7 @@
fn = BOOTLOADER_LOOPBACK_DEVICE
try:
-@@ -3274,10 +3288,10 @@ class XendDomainInfo:
+@@ -3287,10 +3292,10 @@ class XendDomainInfo:
if mounted:
log.info("Unmounting %s from %s." %
(fn, BOOTLOADER_LOOPBACK_DEVICE))
++++++ xen-fixme-doc.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/docs/man/xmdomain.cfg.pod.5
+Index: xen-4.1.0-testing/docs/man/xmdomain.cfg.pod.5
===================================================================
---- xen-4.0.2-testing.orig/docs/man/xmdomain.cfg.pod.5
-+++ xen-4.0.2-testing/docs/man/xmdomain.cfg.pod.5
+--- xen-4.1.0-testing.orig/docs/man/xmdomain.cfg.pod.5
++++ xen-4.1.0-testing/docs/man/xmdomain.cfg.pod.5
@@ -335,16 +335,10 @@ at hda1, which is the root filesystem.
=item I<NFS Root>
@@ -19,11 +19,11 @@
=back
=head1 SEE ALSO
-Index: xen-4.0.2-testing/docs/man/xm.pod.1
+Index: xen-4.1.0-testing/docs/man/xm.pod.1
===================================================================
---- xen-4.0.2-testing.orig/docs/man/xm.pod.1
-+++ xen-4.0.2-testing/docs/man/xm.pod.1
-@@ -297,7 +297,8 @@ scheduling by the Xen hypervisor.
+--- xen-4.1.0-testing.orig/docs/man/xm.pod.1
++++ xen-4.1.0-testing/docs/man/xm.pod.1
+@@ -295,7 +295,8 @@ scheduling by the Xen hypervisor.
=item B
@@ -33,7 +33,7 @@
=item B
-@@ -310,8 +311,6 @@ restart on crash. See L f
+@@ -308,8 +309,6 @@ restart on crash. See L f
The domain is in process of dying, but hasn't completely shutdown or
crashed.
@@ -42,7 +42,7 @@
=back
B<NOTES>
-@@ -735,8 +734,6 @@ Xen ships with a number of domain schedu
+@@ -733,8 +732,6 @@ Xen ships with a number of domain schedu
time with the B parameter on the Xen command line. By
default B<credit> is used for scheduling.
@@ -51,7 +51,7 @@
=over 4
=item B<sched-credit> [ B<-d> I<domain-id> [ B<-w>[B<=>I<WEIGHT>] | B<-c>[B<=>I<CAP>] ] ]
-@@ -786,8 +783,6 @@ The normal EDF scheduling usage in nanos
+@@ -784,8 +781,6 @@ The normal EDF scheduling usage in nanos
The normal EDF scheduling usage in nanoseconds
@@ -60,7 +60,7 @@
=item I<latency-hint>
Scaled period if domain is doing heavy I/O.
-@@ -937,9 +932,6 @@ the default setting in xend-config.sxp f
+@@ -935,9 +930,6 @@ the default setting in xend-config.sxp f
Passes the specified IP Address to the adapter on creation.
@@ -70,7 +70,7 @@
=item BI<macaddr>
The MAC address that the domain will see on its Ethernet device. If
-@@ -965,9 +957,6 @@ Removes the network device from the doma
+@@ -963,9 +955,6 @@ Removes the network device from the doma
I<devid> is the virtual interface device number within the domain
(i.e. the 3 in vif22.3).
@@ -80,7 +80,7 @@
=item B<network-list> [B<-l>|B<--long>]> I<domain-id>
List virtual network interfaces for a domain. The returned output is
-@@ -990,9 +979,6 @@ formatted as a list or as an S-Expressio
+@@ -988,9 +977,6 @@ formatted as a list or as an S-Expressio
The Virtual Network interfaces for Xen.
++++++ xen-hvm-default-bridge.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/net.h
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/net.h
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/net.h
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/net.h
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/net.h
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/net.h
@@ -107,8 +107,8 @@ void net_host_device_add(const char *dev
void net_host_device_remove(int vlan_id, const char *device);
@@ -13,10 +13,10 @@
#endif
#ifdef __sun__
#define SMBD_COMMAND "/usr/sfw/sbin/smbd"
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/net.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/net.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/net.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/net.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/net.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/net.c
@@ -1759,9 +1759,10 @@ int net_client_init(const char *device,
}
if (get_param_value(script_arg, sizeof(script_arg), "scriptarg", p) == 0 &&
@@ -30,10 +30,10 @@
}
} else
#endif
-Index: xen-4.0.2-testing/tools/python/xen/xend/image.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/image.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/image.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/image.py
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/image.py
++++ xen-4.1.0-testing/tools/python/xen/xend/image.py
@@ -912,11 +912,13 @@ class HVMImageHandler(ImageHandler):
mac = devinfo.get('mac')
if mac is None:
@@ -51,10 +51,10 @@
vifname = devinfo.get('vifname')
if vifname:
vifname = "tap-" + vifname
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/i386-dm/qemu-ifup-Linux
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/i386-dm/qemu-ifup-Linux
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/i386-dm/qemu-ifup-Linux
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/i386-dm/qemu-ifup-Linux
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/i386-dm/qemu-ifup-Linux
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/i386-dm/qemu-ifup-Linux
@@ -1,36 +1,22 @@
#!/bin/sh
@@ -103,4 +103,4 @@
+ exit 0
fi
- # We have to change mac address of tap device to not change bridge mac
+ ifconfig $1 0.0.0.0 up
++++++ xen-hvm-default-pae.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,9 +1,9 @@
PAE must be on for 64-on-64 to work at all.
-Index: xen-4.0.2-testing/tools/python/xen/xend/image.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/image.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/image.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/image.py
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/image.py
++++ xen-4.1.0-testing/tools/python/xen/xend/image.py
@@ -1030,7 +1030,7 @@ class X86_HVM_ImageHandler(HVMImageHandl
def configure(self, vmConfig):
++++++ xen-ioemu-hvm-pv-support.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_platform.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_platform.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xen_platform.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_platform.c
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/hw/xen_platform.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/hw/xen_platform.c
@@ -30,6 +30,8 @@
#include "qemu-xen.h"
#include "net.h"
++++++ xen-max-free-mem.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,16 +1,14 @@
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendNode.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendNode.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendNode.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendNode.py
-@@ -916,15 +916,39 @@ class XendNode:
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendNode.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendNode.py
+@@ -949,11 +949,35 @@ class XendNode:
info['cpu_mhz'] = info['cpu_khz'] / 1000
- # physinfo is in KiB, need it in MiB
- info['total_memory'] = info['total_memory'] / 1024
- info['free_memory'] = info['free_memory'] / 1024
-- info['node_to_cpu'] = self.format_node_to_cpu(info)
-- info['node_to_memory'] = \
+ configured_floor = xendoptions().get_dom0_min_mem() * 1024
+ from xen.xend import balloon
+ try:
@@ -24,17 +22,13 @@
+ extra_mem = dom0_mem - dom0_min_mem
+ info['free_memory'] = info['free_memory'] + info['scrub_memory']
+ info['max_free_memory'] = info['free_memory'] + extra_mem
-+
+ info['free_cpus'] = len(XendCPUPool.unbound_cpus())
+
+ # Convert KiB to MiB, rounding down to be conservative
+ info['total_memory'] = info['total_memory'] / 1024
+ info['free_memory'] = info['free_memory'] / 1024
+ info['max_free_memory'] = info['max_free_memory'] / 1024
-+ info['node_to_cpu'] = self.format_node_to_cpu(info)
-+ info['node_to_memory'] = \
- self.format_node_to_memory(info, 'node_to_memory')
- info['node_to_dma32_mem'] = \
- self.format_node_to_memory(info, 'node_to_dma32_mem')
-
++
+ # FIXME: These are hard-coded to be the inverse of the getXenMemory
+ # functions in image.py. Find a cleaner way.
+ info['max_para_memory'] = info['max_free_memory'] - 4
@@ -47,20 +41,20 @@
ITEM_ORDER = ['nr_cpus',
'nr_nodes',
'cores_per_socket',
-@@ -934,6 +958,9 @@ class XendNode:
- 'virt_caps',
+@@ -964,6 +988,9 @@ class XendNode:
'total_memory',
'free_memory',
+ 'free_cpus',
+ 'max_free_memory',
+ 'max_para_memory',
+ 'max_hvm_memory',
- 'node_to_cpu',
- 'node_to_memory',
- 'node_to_dma32_mem',
-Index: xen-4.0.2-testing/tools/python/xen/xend/balloon.py
+ ]
+
+ if show_numa != 0:
+Index: xen-4.1.0-testing/tools/python/xen/xend/balloon.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/balloon.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/balloon.py
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/balloon.py
++++ xen-4.1.0-testing/tools/python/xen/xend/balloon.py
@@ -43,6 +43,8 @@ SLEEP_TIME_GROWTH = 0.1
# label actually shown in the PROC_XEN_BALLOON file.
#labels = { 'current' : 'Current allocation',
@@ -94,11 +88,11 @@
def free(need_mem, dominfo):
"""Balloon out memory from the privileged domain so that there is the
specified required amount (in KiB) free.
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
-@@ -1473,6 +1473,27 @@ class XendDomainInfo:
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
+@@ -1459,6 +1459,27 @@ class XendDomainInfo:
pci_conf = self.info['devices'][dev_uuid][1]
return map(pci_dict_to_bdf_str, pci_conf['devs'])
@@ -126,11 +120,11 @@
def setMemoryTarget(self, target):
"""Set the memory target of this domain.
@param target: In MiB.
-Index: xen-4.0.2-testing/tools/python/xen/xend/server/SrvDomain.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/server/SrvDomain.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/server/SrvDomain.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/server/SrvDomain.py
-@@ -173,7 +173,7 @@ class SrvDomain(SrvDir):
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/server/SrvDomain.py
++++ xen-4.1.0-testing/tools/python/xen/xend/server/SrvDomain.py
+@@ -187,7 +187,7 @@ class SrvDomain(SrvDir):
def op_mem_target_set(self, _, req):
++++++ xen-minimum-restart-time.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,9 +1,9 @@
References: bnc#661298
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendConstants.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendConstants.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendConstants.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendConstants.py
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendConstants.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendConstants.py
@@ -92,7 +92,7 @@ DOM_STATES_OLD = [
SHUTDOWN_TIMEOUT = (60.0 * 5)
++++++ xen-no-dummy-nfs-ip.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.0.2-testing/tools/python/xen/xm/create.py
+Index: xen-4.1.0-testing/tools/python/xen/xm/create.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xm/create.py
-+++ xen-4.0.2-testing/tools/python/xen/xm/create.py
-@@ -1331,9 +1331,8 @@ def preprocess_access_control(vals):
+--- xen-4.1.0-testing.orig/tools/python/xen/xm/create.py
++++ xen-4.1.0-testing/tools/python/xen/xm/create.py
+@@ -1337,9 +1337,8 @@ def preprocess_access_control(vals):
def preprocess_ip(vals):
if vals.ip or vals.dhcp != 'off':
++++++ xen-paths.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/python/xen/xm/create.py
+Index: xen-4.1.0-testing/tools/python/xen/xm/create.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xm/create.py
-+++ xen-4.0.2-testing/tools/python/xen/xm/create.py
+--- xen-4.1.0-testing.orig/tools/python/xen/xm/create.py
++++ xen-4.1.0-testing/tools/python/xen/xm/create.py
@@ -73,7 +73,7 @@ gopts.opt('quiet', short='q',
use="Quiet.")
@@ -11,11 +11,11 @@
use="Search path for configuration scripts. "
"The value of PATH is a colon-separated directory list.")
-Index: xen-4.0.2-testing/docs/man/xm.pod.1
+Index: xen-4.1.0-testing/docs/man/xm.pod.1
===================================================================
---- xen-4.0.2-testing.orig/docs/man/xm.pod.1
-+++ xen-4.0.2-testing/docs/man/xm.pod.1
-@@ -77,7 +77,7 @@ in the config file. See L
+--- xen-4.1.0-testing.orig/docs/man/xm.pod.1
++++ xen-4.1.0-testing/docs/man/xm.pod.1
+@@ -75,7 +75,7 @@ in the config file. See L
format, and possible options used in either the configfile or for I<vars>.
I<configfile> can either be an absolute path to a file, or a relative
@@ -24,7 +24,7 @@
Create will return B<as soon> as the domain is started. This B<does
not> mean the guest OS in the domain has actually booted, or is
-@@ -158,7 +158,7 @@ B<EXAMPLES>
+@@ -156,7 +156,7 @@ B<EXAMPLES>
xm create Fedora4
@@ -33,10 +33,10 @@
soon as it is run.
=item I<without config file>
-Index: xen-4.0.2-testing/docs/man/xmdomain.cfg.pod.5
+Index: xen-4.1.0-testing/docs/man/xmdomain.cfg.pod.5
===================================================================
---- xen-4.0.2-testing.orig/docs/man/xmdomain.cfg.pod.5
-+++ xen-4.0.2-testing/docs/man/xmdomain.cfg.pod.5
+--- xen-4.1.0-testing.orig/docs/man/xmdomain.cfg.pod.5
++++ xen-4.1.0-testing/docs/man/xmdomain.cfg.pod.5
@@ -4,9 +4,9 @@ xmdomain.cfg - xm domain config file for
=head1 SYNOPSIS
++++++ xen-qemu-iscsi-fix.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
+Index: xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c
===================================================================
---- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/xenstore.c
-+++ xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
-@@ -399,7 +399,7 @@ void xenstore_parse_domain_config(int hv
+--- xen-4.1.0-testing.orig/tools/ioemu-qemu-xen/xenstore.c
++++ xen-4.1.0-testing/tools/ioemu-qemu-xen/xenstore.c
+@@ -449,7 +449,7 @@ void xenstore_parse_domain_config(int hv
char *buf = NULL;
char *fpath = NULL, *bpath = NULL, *btype = NULL,
*dev = NULL, *params = NULL, *drv = NULL;
@@ -11,7 +11,7 @@
unsigned int len, num, hd_index, pci_devid = 0;
BlockDriverState *bs;
BlockDriver *format;
-@@ -491,12 +491,7 @@ void xenstore_parse_domain_config(int hv
+@@ -533,12 +533,7 @@ void xenstore_parse_domain_config(int hv
continue;
free(danger_type);
danger_type = xs_read(xsh, XBT_NULL, danger_buf, &len);
@@ -25,7 +25,7 @@
/* read the name of the device */
if (pasprintf(&buf, "%s/type", bpath) == -1)
continue;
-@@ -504,6 +499,35 @@ void xenstore_parse_domain_config(int hv
+@@ -546,6 +541,35 @@ void xenstore_parse_domain_config(int hv
drv = xs_read(xsh, XBT_NULL, buf, &len);
if (drv == NULL)
continue;
@@ -59,5 +59,5 @@
+ }
+
/* Obtain blktap sub-type prefix */
- if (!strcmp(drv, "tap") && params[0]) {
+ if ((!strcmp(drv, "tap") || !strcmp(drv, "qdisk")) && params[0]) {
char *offset = strchr(params, ':');
++++++ xen-rpmoptflags.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:23.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/blktap/drivers/Makefile
+Index: xen-4.1.0-testing/tools/blktap/drivers/Makefile
===================================================================
---- xen-4.0.2-testing.orig/tools/blktap/drivers/Makefile
-+++ xen-4.0.2-testing/tools/blktap/drivers/Makefile
+--- xen-4.1.0-testing.orig/tools/blktap/drivers/Makefile
++++ xen-4.1.0-testing/tools/blktap/drivers/Makefile
@@ -6,7 +6,6 @@ QCOW_UTIL = img2qcow qcow2raw qcow-cr
LIBAIO_DIR = ../../libaio/src
MEMSHR_DIR = ../../memshr
@@ -10,10 +10,10 @@
CFLAGS += -Wno-unused
CFLAGS += -I../lib
CFLAGS += $(CFLAGS_libxenctrl)
-Index: xen-4.0.2-testing/Config.mk
+Index: xen-4.1.0-testing/Config.mk
===================================================================
---- xen-4.0.2-testing.orig/Config.mk
-+++ xen-4.0.2-testing/Config.mk
+--- xen-4.1.0-testing.orig/Config.mk
++++ xen-4.1.0-testing/Config.mk
@@ -14,7 +14,7 @@ SHELL ?= /bin/sh
# Tools to run on system hosting the build
++++++ xen-utils-0.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-utils-0.1/Makefile new/xen-utils-0.1/Makefile
--- old/xen-utils-0.1/Makefile 2010-08-31 23:14:58.000000000 +0200
+++ new/xen-utils-0.1/Makefile 2011-03-21 18:25:15.000000000 +0100
@@ -22,7 +22,7 @@
CFLAGS += -Werror -Wall
endif
-LIBS += -lxenstore -lxenctrl -lxenguest
+LIBS += -L../xenstore -L../libxc -lxenstore -lxenctrl -lxenguest
PROGRAMS = xen-list xen-destroy
SRCS = xen-list.c xen-destroy.c xen-utils.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-utils-0.1/xen-destroy.c new/xen-utils-0.1/xen-destroy.c
--- old/xen-utils-0.1/xen-destroy.c 2010-08-30 19:55:56.000000000 +0200
+++ new/xen-utils-0.1/xen-destroy.c 2011-03-15 16:56:20.000000000 +0100
@@ -244,8 +244,13 @@
int destroy_domain(char *domname)
{
- int domid, rcode, ret, xc_handle, i, DMid, status;
- unsigned int len;
+ int domid, rcode, ret, i, DMid, status;
+#ifdef XENCTRL_HAS_XC_INTERFACE
+ xc_interface *xc_handle = NULL;
+#else
+ int xc_handle = 0;
+#endif
+ unsigned int len;
char *s;
char path[256];
struct xs_handle *xsh = NULL;
@@ -268,8 +273,13 @@
}
+#ifdef XENCTRL_HAS_XC_INTERFACE
+ xc_handle = xc_interface_open(NULL, NULL, 0);
+ if (xc_handle == NULL) {
+#else
xc_handle = xc_interface_open();
- if (xc_handle < 0) {
+ if (xc_handle < 0) {
+#endif
perror("Couldn't open xc handle.");
rcode = 1;
goto out;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-utils-0.1/xen-utils.c new/xen-utils-0.1/xen-utils.c
--- old/xen-utils-0.1/xen-utils.c 2010-08-30 19:55:56.000000000 +0200
+++ new/xen-utils-0.1/xen-utils.c 2011-03-15 16:55:10.000000000 +0100
@@ -50,12 +50,21 @@
char *path;
char *s;
- if (asprintf(&path, "/local/domain/%u/name", domid) < 0)
+ if (asprintf(&path, "/local/domain/%u/vm", domid) < 0)
return NULL;
s = xs_read(xsh, XBT_NULL, path, &len);
free(path);
+
+ if (asprintf(&path, "%s/name", s) < 0) {
+ free(s);
+ return NULL;
+ }
+ free(s);
+ s = xs_read(xsh, XBT_NULL, path, &len);
+ free(path);
+
return s;
}
@@ -79,11 +88,13 @@
const char *vncport,
int compact)
{
+ unsigned long dommem = (dominfo.nr_pages * (XC_PAGE_SIZE / 1024UL)) / 1024UL;
+
if (compact) {
printf("%-40s %5d %5lu %5d %c%c%c%c%c %8.1f %s\n",
name,
dominfo.domid,
- (unsigned long) (dominfo.nr_pages / 1024),
+ dommem,
dominfo.nr_online_vcpus,
dominfo.running ? 'r' : '-',
dominfo.blocked ? 'b' : '-',
@@ -95,7 +106,7 @@
} else {
printf("Name: %s\n", name);
printf("ID: %d\n", dominfo.domid);
- printf("Mem: %lu\n", (unsigned long) (dominfo.nr_pages / 1024));
+ printf("Mem: %lu\n", dommem);
printf("VCPUs: %d\n", dominfo.nr_online_vcpus);
printf("State: %c%c%c%c%c\n",
dominfo.running ? 'r' : '-',
@@ -114,7 +125,11 @@
xc_dominfo_t *info = NULL;
uint32_t first_dom = 0;
int max_doms = 1024, nr_doms, i;
- int xc_handle = 0;
+#ifdef XENCTRL_HAS_XC_INTERFACE
+ xc_interface *xc_handle;
+#else
+ int xc_handle;
+#endif
struct xs_handle *xsh = NULL;
char *domname, *vncport;
@@ -123,8 +138,13 @@
return 1;
}
+#ifdef XENCTRL_HAS_XC_INTERFACE
+ xc_handle = xc_interface_open(NULL, NULL, 0);
+ if (xc_handle == NULL) {
+#else
xc_handle = xc_interface_open();
- if (xc_handle < 0) {
+ if (xc_handle < 0) {
+#endif
perror("Unable to open libxc handle.");
goto out;
}
@@ -151,6 +171,8 @@
printf("Name ID Mem VCPUs\tState\tTime(s)\tVnc-port\n");
for (i = 0; i < nr_doms; i++) {
domname = domid_to_domname(xsh, info[i].domid);
+ if (domname == NULL)
+ continue;
vncport = get_vncport(xsh, info[i].domid);
print_dom(info[i], domname, vncport, 1);
free(domname);
++++++ xen-warnings.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/misc/miniterm/miniterm.c
+Index: xen-4.1.0-testing/tools/misc/miniterm/miniterm.c
===================================================================
---- xen-4.0.2-testing.orig/tools/misc/miniterm/miniterm.c
-+++ xen-4.0.2-testing/tools/misc/miniterm/miniterm.c
+--- xen-4.1.0-testing.orig/tools/misc/miniterm/miniterm.c
++++ xen-4.1.0-testing/tools/misc/miniterm/miniterm.c
@@ -157,7 +157,7 @@ int main(int argc, char **argv)
case 0:
close(1); /* stdout not needed */
@@ -35,11 +35,11 @@
break;
}
-Index: xen-4.0.2-testing/tools/libxc/xc_dom_elfloader.c
+Index: xen-4.1.0-testing/tools/libxc/xc_dom_elfloader.c
===================================================================
---- xen-4.0.2-testing.orig/tools/libxc/xc_dom_elfloader.c
-+++ xen-4.0.2-testing/tools/libxc/xc_dom_elfloader.c
-@@ -193,8 +193,9 @@ static int xc_dom_load_elf_symtab(struct
+--- xen-4.1.0-testing.orig/tools/libxc/xc_dom_elfloader.c
++++ xen-4.1.0-testing/tools/libxc/xc_dom_elfloader.c
+@@ -228,8 +228,9 @@ static int xc_dom_load_elf_symtab(struct
if ( load )
{
@@ -50,10 +50,10 @@
elf_section_start(elf, shdr2),
size);
}
-Index: xen-4.0.2-testing/tools/xenstore/Makefile
+Index: xen-4.1.0-testing/tools/xenstore/Makefile
===================================================================
---- xen-4.0.2-testing.orig/tools/xenstore/Makefile
-+++ xen-4.0.2-testing/tools/xenstore/Makefile
+--- xen-4.1.0-testing.orig/tools/xenstore/Makefile
++++ xen-4.1.0-testing/tools/xenstore/Makefile
@@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk
MAJOR = 3.0
MINOR = 0
@@ -63,10 +63,10 @@
CFLAGS += -I.
CFLAGS += $(CFLAGS_libxenctrl)
-Index: xen-4.0.2-testing/tools/xenstore/xenstored_core.c
+Index: xen-4.1.0-testing/tools/xenstore/xenstored_core.c
===================================================================
---- xen-4.0.2-testing.orig/tools/xenstore/xenstored_core.c
-+++ xen-4.0.2-testing/tools/xenstore/xenstored_core.c
+--- xen-4.1.0-testing.orig/tools/xenstore/xenstored_core.c
++++ xen-4.1.0-testing/tools/xenstore/xenstored_core.c
@@ -77,8 +77,8 @@ static void check_store(void);
int quota_nb_entry_per_domain = 1000;
@@ -91,11 +91,11 @@
break;
case 'T':
tracefile = optarg;
-Index: xen-4.0.2-testing/tools/xenstore/xenstored_domain.c
+Index: xen-4.1.0-testing/tools/xenstore/xenstored_domain.c
===================================================================
---- xen-4.0.2-testing.orig/tools/xenstore/xenstored_domain.c
-+++ xen-4.0.2-testing/tools/xenstore/xenstored_domain.c
-@@ -212,7 +212,7 @@ void handle_event(void)
+--- xen-4.1.0-testing.orig/tools/xenstore/xenstored_domain.c
++++ xen-4.1.0-testing/tools/xenstore/xenstored_domain.c
+@@ -213,7 +213,7 @@ void handle_event(void)
{
evtchn_port_t port;
@@ -104,7 +104,7 @@
barf_perror("Failed to read from event fd");
if (port == virq_port)
-@@ -561,7 +561,7 @@ static int dom0_init(void)
+@@ -562,7 +562,7 @@ static int dom0_init(void)
struct domain *dom0;
port = xenbus_evtchn();
@@ -113,10 +113,10 @@
return -1;
dom0 = new_domain(NULL, 0, port);
-Index: xen-4.0.2-testing/tools/xenstore/xenstored_transaction.c
+Index: xen-4.1.0-testing/tools/xenstore/xenstored_transaction.c
===================================================================
---- xen-4.0.2-testing.orig/tools/xenstore/xenstored_transaction.c
-+++ xen-4.0.2-testing/tools/xenstore/xenstored_transaction.c
+--- xen-4.1.0-testing.orig/tools/xenstore/xenstored_transaction.c
++++ xen-4.1.0-testing/tools/xenstore/xenstored_transaction.c
@@ -82,7 +82,7 @@ struct transaction
struct list_head changed_domains;
};
@@ -126,11 +126,11 @@
static unsigned int generation;
/* Return tdb context to use for this connection. */
-Index: xen-4.0.2-testing/tools/xenstore/xenstore_client.c
+Index: xen-4.1.0-testing/tools/xenstore/xenstore_client.c
===================================================================
---- xen-4.0.2-testing.orig/tools/xenstore/xenstore_client.c
-+++ xen-4.0.2-testing/tools/xenstore/xenstore_client.c
-@@ -251,7 +251,7 @@ do_chmod(char *path, struct xs_permissio
+--- xen-4.1.0-testing.orig/tools/xenstore/xenstore_client.c
++++ xen-4.1.0-testing/tools/xenstore/xenstore_client.c
+@@ -255,7 +255,7 @@ do_chmod(char *path, struct xs_permissio
char **xsval = xs_directory(xsh, xth, path, &xsval_n);
if (xsval) {
@@ -139,10 +139,10 @@
for (i = 0; i < xsval_n; i++) {
snprintf(buf, MAX_PATH_LEN, "%s/%s", path, xsval[i]);
-Index: xen-4.0.2-testing/tools/libxen/src/xen_common.c
+Index: xen-4.1.0-testing/tools/libxen/src/xen_common.c
===================================================================
---- xen-4.0.2-testing.orig/tools/libxen/src/xen_common.c
-+++ xen-4.0.2-testing/tools/libxen/src/xen_common.c
+--- xen-4.1.0-testing.orig/tools/libxen/src/xen_common.c
++++ xen-4.1.0-testing/tools/libxen/src/xen_common.c
@@ -1057,6 +1057,8 @@ static size_t size_of_member(const abstr
default:
assert(false);
@@ -161,10 +161,10 @@
}
-Index: xen-4.0.2-testing/tools/blktap2/drivers/block-remus.c
+Index: xen-4.1.0-testing/tools/blktap2/drivers/block-remus.c
===================================================================
---- xen-4.0.2-testing.orig/tools/blktap2/drivers/block-remus.c
-+++ xen-4.0.2-testing/tools/blktap2/drivers/block-remus.c
+--- xen-4.1.0-testing.orig/tools/blktap2/drivers/block-remus.c
++++ xen-4.1.0-testing/tools/blktap2/drivers/block-remus.c
@@ -1579,7 +1579,7 @@ static int tdremus_open(td_driver_t *dri
td_flag_t flags)
{
@@ -174,10 +174,10 @@
RPRINTF("opening %s\n", name);
-Index: xen-4.0.2-testing/tools/blktap/lib/blktaplib.h
+Index: xen-4.1.0-testing/tools/blktap/lib/blktaplib.h
===================================================================
---- xen-4.0.2-testing.orig/tools/blktap/lib/blktaplib.h
-+++ xen-4.0.2-testing/tools/blktap/lib/blktaplib.h
+--- xen-4.1.0-testing.orig/tools/blktap/lib/blktaplib.h
++++ xen-4.1.0-testing/tools/blktap/lib/blktaplib.h
@@ -196,6 +196,7 @@ typedef struct msg_pid {
} msg_pid_t;
@@ -186,11 +186,11 @@
#define WRITE 1
/*Control Messages between manager and tapdev*/
-Index: xen-4.0.2-testing/tools/blktap2/include/blktaplib.h
+Index: xen-4.1.0-testing/tools/blktap2/include/blktaplib.h
===================================================================
---- xen-4.0.2-testing.orig/tools/blktap2/include/blktaplib.h
-+++ xen-4.0.2-testing/tools/blktap2/include/blktaplib.h
-@@ -198,6 +198,7 @@ typedef struct msg_lock {
+--- xen-4.1.0-testing.orig/tools/blktap2/include/blktaplib.h
++++ xen-4.1.0-testing/tools/blktap2/include/blktaplib.h
+@@ -190,6 +190,7 @@ typedef struct msg_lock {
} msg_lock_t;
#define READ 0
++++++ xen-xm-top-needs-root.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100
@@ -1,11 +1,11 @@
From: Charles Coffing
Upstream: no
-Index: xen-4.0.2-testing/tools/python/xen/xm/main.py
+Index: xen-4.1.0-testing/tools/python/xen/xm/main.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xm/main.py
-+++ xen-4.0.2-testing/tools/python/xen/xm/main.py
-@@ -2054,6 +2054,10 @@ def xm_debug_keys(args):
+--- xen-4.1.0-testing.orig/tools/python/xen/xm/main.py
++++ xen-4.1.0-testing/tools/python/xen/xm/main.py
+@@ -2201,6 +2201,10 @@ def xm_debug_keys(args):
def xm_top(args):
arg_check(args, "top", 0)
++++++ xen-xmexample-vti.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/examples/Makefile
+Index: xen-4.1.0-testing/tools/examples/Makefile
===================================================================
---- xen-4.0.2-testing.orig/tools/examples/Makefile
-+++ xen-4.0.2-testing/tools/examples/Makefile
+--- xen-4.1.0-testing.orig/tools/examples/Makefile
++++ xen-4.1.0-testing/tools/examples/Makefile
@@ -18,7 +18,6 @@ XEN_CONFIGS += xmexample.hvm
XEN_CONFIGS += xmexample.hvm-stubdom
XEN_CONFIGS += xmexample.pv-grub
@@ -9,4 +9,4 @@
-XEN_CONFIGS += xmexample.vti
XEN_CONFIGS += xend-pci-quirks.sxp
XEN_CONFIGS += xend-pci-permissive.sxp
-
+ XEN_CONFIGS += xl.conf
++++++ xen-xmexample.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100
@@ -1,9 +1,9 @@
Change various example paths in the config files to match SUSE.
-Index: xen-4.0.2-testing/tools/examples/xmexample1
+Index: xen-4.1.0-testing/tools/examples/xmexample1
===================================================================
---- xen-4.0.2-testing.orig/tools/examples/xmexample1
-+++ xen-4.0.2-testing/tools/examples/xmexample1
+--- xen-4.1.0-testing.orig/tools/examples/xmexample1
++++ xen-4.1.0-testing/tools/examples/xmexample1
@@ -7,11 +7,13 @@
#============================================================================
@@ -43,10 +43,10 @@
#----------------------------------------------------------------------------
# Configure the behaviour when a domain exits. There are three 'reasons'
-Index: xen-4.0.2-testing/tools/examples/xmexample2
+Index: xen-4.1.0-testing/tools/examples/xmexample2
===================================================================
---- xen-4.0.2-testing.orig/tools/examples/xmexample2
-+++ xen-4.0.2-testing/tools/examples/xmexample2
+--- xen-4.1.0-testing.orig/tools/examples/xmexample2
++++ xen-4.1.0-testing/tools/examples/xmexample2
@@ -35,11 +35,13 @@ xm_vars.var('vmid',
xm_vars.check()
@@ -86,10 +86,10 @@
#----------------------------------------------------------------------------
# Configure the behaviour when a domain exits. There are three 'reasons'
-Index: xen-4.0.2-testing/tools/examples/xmexample3
+Index: xen-4.1.0-testing/tools/examples/xmexample3
===================================================================
---- xen-4.0.2-testing.orig/tools/examples/xmexample3
-+++ xen-4.0.2-testing/tools/examples/xmexample3
+--- xen-4.1.0-testing.orig/tools/examples/xmexample3
++++ xen-4.1.0-testing/tools/examples/xmexample3
@@ -35,11 +35,13 @@ xm_vars.var('vmid',
xm_vars.check()
@@ -108,10 +108,10 @@
# The domain build function. Default is 'linux'.
#builder='linux'
-Index: xen-4.0.2-testing/tools/examples/xmexample.hvm
+Index: xen-4.1.0-testing/tools/examples/xmexample.hvm
===================================================================
---- xen-4.0.2-testing.orig/tools/examples/xmexample.hvm
-+++ xen-4.0.2-testing/tools/examples/xmexample.hvm
+--- xen-4.1.0-testing.orig/tools/examples/xmexample.hvm
++++ xen-4.1.0-testing/tools/examples/xmexample.hvm
@@ -78,7 +78,7 @@ vif = [ 'type=ioemu, bridge=xenbr0' ]
# and MODE is r for read-only, w for read-write.
@@ -121,10 +121,10 @@
#----------------------------------------------------------------------------
# Configure the behaviour when a domain exits. There are three 'reasons'
-Index: xen-4.0.2-testing/docs/man/xmdomain.cfg.pod.5
+Index: xen-4.1.0-testing/docs/man/xmdomain.cfg.pod.5
===================================================================
---- xen-4.0.2-testing.orig/docs/man/xmdomain.cfg.pod.5
-+++ xen-4.0.2-testing/docs/man/xmdomain.cfg.pod.5
+--- xen-4.1.0-testing.orig/docs/man/xmdomain.cfg.pod.5
++++ xen-4.1.0-testing/docs/man/xmdomain.cfg.pod.5
@@ -38,13 +38,13 @@ file.
The kernel image for the domain. The format of the parameter is the
@@ -160,11 +160,11 @@
at hda1, which is the root filesystem.
=item I<NFS Root>
-Index: xen-4.0.2-testing/docs/man/xm.pod.1
+Index: xen-4.1.0-testing/docs/man/xm.pod.1
===================================================================
---- xen-4.0.2-testing.orig/docs/man/xm.pod.1
-+++ xen-4.0.2-testing/docs/man/xm.pod.1
-@@ -163,8 +163,8 @@ soon as it is run.
+--- xen-4.1.0-testing.orig/docs/man/xm.pod.1
++++ xen-4.1.0-testing/docs/man/xm.pod.1
+@@ -161,8 +161,8 @@ soon as it is run.
=item I<without config file>
++++++ xenapi-console-protocol.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
-@@ -3925,6 +3925,14 @@ class XendDomainInfo:
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
+@@ -3934,6 +3934,14 @@ class XendDomainInfo:
if not config.has_key('backend'):
config['backend'] = "00000000-0000-0000-0000-000000000000"
++++++ xenconsole-no-multiple-connections.patch ++++++
Index: xen-4.1.0-testing/tools/console/client/main.c
===================================================================
--- xen-4.1.0-testing.orig/tools/console/client/main.c
+++ xen-4.1.0-testing/tools/console/client/main.c
@@ -96,6 +96,7 @@ static int get_pty_fd(struct xs_handle *
* Assumes there is already a watch set in the store for this path. */
{
struct timeval tv;
+ struct flock lock;
fd_set watch_fdset;
int xs_fd = xs_fileno(xs), pty_fd = -1;
int start, now;
@@ -122,6 +123,12 @@ static int get_pty_fd(struct xs_handle *
if (pty_fd == -1)
err(errno, "Could not open tty `%s'",
pty_path);
+ memset(&lock, 0, sizeof(lock));
+ lock.l_type = F_WRLCK;
+ lock.l_whence = SEEK_SET;
+ if (fcntl(pty_fd, F_SETLK, &lock) != 0)
+ err(errno, "Could not lock tty '%s'",
+ pty_path);
free(pty_path);
}
}
++++++ xend-config.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/hotplug/Linux/init.d/sysconfig.xendomains
+Index: xen-4.1.0-testing/tools/hotplug/Linux/init.d/sysconfig.xendomains
===================================================================
---- xen-4.0.2-testing.orig/tools/hotplug/Linux/init.d/sysconfig.xendomains
-+++ xen-4.0.2-testing/tools/hotplug/Linux/init.d/sysconfig.xendomains
+--- xen-4.1.0-testing.orig/tools/hotplug/Linux/init.d/sysconfig.xendomains
++++ xen-4.1.0-testing/tools/hotplug/Linux/init.d/sysconfig.xendomains
@@ -1,4 +1,4 @@
-## Path: System/xen
+## Path: System/Virtualization
@@ -27,10 +27,10 @@
## Type: integer
## Default: 300
-Index: xen-4.0.2-testing/tools/examples/xend-config.sxp
+Index: xen-4.1.0-testing/tools/examples/xend-config.sxp
===================================================================
---- xen-4.0.2-testing.orig/tools/examples/xend-config.sxp
-+++ xen-4.0.2-testing/tools/examples/xend-config.sxp
+--- xen-4.1.0-testing.orig/tools/examples/xend-config.sxp
++++ xen-4.1.0-testing/tools/examples/xend-config.sxp
@@ -58,11 +58,12 @@
@@ -46,17 +46,7 @@
#(xend-relocation-ssl-server no)
#(xend-udev-event-server no)
-@@ -145,7 +146,8 @@
- #
- # (network-script 'network-bridge netdev=eth1')
- #
--# The bridge is named xenbr0, by default. To rename the bridge, use
-+# The bridge takes on the ethernet device name by default. To rename the
-+# bridge, use
- #
- # (network-script 'network-bridge bridge=<name>')
- #
-@@ -154,7 +156,12 @@
+@@ -170,7 +171,12 @@
# two fake interfaces per guest domain. To do things like this, write
# yourself a wrapper script, and call network-bridge from it, as appropriate.
#
@@ -70,7 +60,7 @@
# The script used to control virtual interfaces. This can be overridden on a
# per-vif basis when creating a domain or a configuring a new vif. The
-@@ -186,7 +193,7 @@
+@@ -203,7 +209,7 @@
# dom0-min-mem is the lowest permissible memory level (in MB) for dom0.
# This is a minimum both for auto-ballooning (as enabled by
# enable-dom0-ballooning below) and for xm mem-set when applied to dom0.
++++++ xend-core-dump-loc.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
-@@ -2317,7 +2317,7 @@ class XendDomainInfo:
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
+@@ -2303,7 +2303,7 @@ class XendDomainInfo:
# To prohibit directory traversal
based_name = os.path.basename(self.info['name_label'])
++++++ xend-devid-or-name.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100
@@ -11,11 +11,11 @@
Signed-off-by: Jim Fehlig
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
-@@ -1218,6 +1218,9 @@ class XendDomainInfo:
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomainInfo.py
+@@ -1203,6 +1203,9 @@ class XendDomainInfo:
except ValueError:
pass
devid = dev_control.convertToDeviceNumber(dev)
++++++ xend-domain-lock.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.0.2-testing/tools/examples/xend-config.sxp
+Index: xen-4.1.0-testing/tools/examples/xend-config.sxp
===================================================================
---- xen-4.0.2-testing.orig/tools/examples/xend-config.sxp
-+++ xen-4.0.2-testing/tools/examples/xend-config.sxp
-@@ -305,6 +305,65 @@
+--- xen-4.1.0-testing.orig/tools/examples/xend-config.sxp
++++ xen-4.1.0-testing/tools/examples/xend-config.sxp
+@@ -321,6 +321,65 @@
# device assignment could really work properly even after we do this.
#(pci-passthrough-strict-check yes)
@@ -68,123 +68,10 @@
# If we have a very big scsi device configuration, start of xend is slow,
# because xend scans all the device paths to build its internal PSCSI device
# list. If we need only a few devices for assigning to a guest, we can reduce
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendOptions.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
-@@ -32,11 +32,12 @@ import re
- import copy
- import os
- import stat
-+import shutil
- import traceback
- from types import StringTypes
-
- import xen.lowlevel.xc
--from xen.util import asserts, auxbin
-+from xen.util import asserts, auxbin, mkdir
- from xen.util.blkif import parse_uname
- import xen.util.xsm.xsm as security
- from xen.util import xsconstants
-@@ -469,6 +470,7 @@ class XendDomainInfo:
-
- if self._stateGet() in (XEN_API_VM_POWER_STATE_HALTED, XEN_API_VM_POWER_STATE_SUSPENDED, XEN_API_VM_POWER_STATE_CRASHED):
- try:
-+ self.acquire_running_lock();
- XendTask.log_progress(0, 30, self._constructDomain)
- XendTask.log_progress(31, 60, self._initDomain)
-
-@@ -2989,6 +2991,11 @@ class XendDomainInfo:
-
- self._stateSet(DOM_STATE_HALTED)
- self.domid = None # Do not push into _stateSet()!
-+
-+ try:
-+ self.release_running_lock()
-+ except:
-+ log.exception("Failed to release domain lock.")
- finally:
- self.refresh_shutdown_lock.release()
-
-@@ -4497,6 +4504,74 @@ class XendDomainInfo:
- def has_device(self, dev_class, dev_uuid):
- return (dev_uuid in self.info['%s_refs' % dev_class.lower()])
-
-+ # Return name of host contained in lock file.
-+ def get_lock_host(self, path):
-+ fin = os.popen(xoptions.get_xend_domain_lock_utility() + \
-+ ' -s ' + path, 'r')
-+ hostname = "unknown"
-+
-+ try:
-+ tokens = fin.readline().split()
-+ for token in tokens:
-+ item = token.split('=')
-+ if item[0] == 'host':
-+ hostname = item[1]
-+ return hostname
-+ finally:
-+ fin.close()
-+
-+ # Acquire a lock for the domain. No-op if domain locking is turned off.
-+ def acquire_running_lock(self):
-+ if not xoptions.get_xend_domain_lock():
-+ return
-+
-+ log.debug("Acquiring lock for domain %s" % self.info['name_label'])
-+ path = xoptions.get_xend_domain_lock_path()
-+ path = os.path.join(path, self.get_uuid())
-+
-+ try:
-+ if not os.path.exists(path):
-+ mkdir.parents(path, stat.S_IRWXU)
-+ except:
-+ log.exception("%s could not be created." % path)
-+ raise XendError("%s could not be created." % path)
-+
-+ status = os.system('%s -l -p %s -n %s -i %s %s' % \
-+ (xoptions.get_xend_domain_lock_utility(), \
-+ XendNode.instance().get_name(), \
-+ self.info['name_label'], \
-+ self.info['uuid'], \
-+ path))
-+ if status != 0:
-+ log.debug("Failed to aqcuire lock: status = %d" % status)
-+ raise XendError("The VM is locked and appears to be running on host %s." % self.get_lock_host(path))
-+
-+ # Release lock for domain. No-op if domain locking is turned off.
-+ def release_running_lock(self, name = None):
-+ if not xoptions.get_xend_domain_lock():
-+ return
-+
-+ dom_name = self.info['name_label']
-+ if name:
-+ dom_name = name
-+ log.debug("Releasing lock for domain %s" % dom_name)
-+
-+ path = xoptions.get_xend_domain_lock_path()
-+ path = os.path.join(path, self.get_uuid())
-+ status = os.system('%s -u -p %s -n %s -i %s %s' % \
-+ (xoptions.get_xend_domain_lock_utility(), \
-+ XendNode.instance().get_name(), \
-+ dom_name, \
-+ self.info['uuid'], \
-+ path))
-+ if status != 0:
-+ log.exception("Failed to release lock: status = %s" % status)
-+ try:
-+ if len(os.listdir(path)) == 0:
-+ shutil.rmtree(path)
-+ except:
-+ log.exception("Failed to remove unmanaged directory %s." % path)
-+
- def __str__(self):
- return '<domain id=%s name=%s memory=%s state=%s>' % \
- (str(self.domid), self.info['name_label'],
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendOptions.py
-===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendOptions.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendOptions.py
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendOptions.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendOptions.py
@@ -154,6 +154,17 @@ class XendOptions:
use loose check automatically if necessary."""
pci_dev_assign_strict_check_default = True
@@ -228,10 +115,10 @@
def get_vnc_tls(self):
return self.get_config_string('vnc-tls', self.xend_vnc_tls)
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendCheckpoint.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendCheckpoint.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendCheckpoint.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendCheckpoint.py
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendCheckpoint.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendCheckpoint.py
@@ -133,6 +133,8 @@ def save(fd, dominfo, network, live, dst
dominfo.shutdown('suspend')
dominfo.waitForSuspend()
@@ -249,11 +136,11 @@
return dominfo
except Exception, exn:
dominfo.destroy()
-Index: xen-4.0.2-testing/tools/hotplug/Linux/Makefile
+Index: xen-4.1.0-testing/tools/hotplug/Linux/Makefile
===================================================================
---- xen-4.0.2-testing.orig/tools/hotplug/Linux/Makefile
-+++ xen-4.0.2-testing/tools/hotplug/Linux/Makefile
-@@ -19,6 +19,7 @@ XEN_SCRIPTS += vtpm vtpm-delete
+--- xen-4.1.0-testing.orig/tools/hotplug/Linux/Makefile
++++ xen-4.1.0-testing/tools/hotplug/Linux/Makefile
+@@ -22,6 +22,7 @@ XEN_SCRIPTS += vtpm vtpm-delete
XEN_SCRIPTS += xen-hotplug-cleanup
XEN_SCRIPTS += external-device-migrate
XEN_SCRIPTS += vscsi
@@ -261,10 +148,10 @@
XEN_SCRIPT_DATA = xen-script-common.sh locking.sh logging.sh
XEN_SCRIPT_DATA += xen-hotplug-common.sh xen-network-common.sh vif-common.sh
XEN_SCRIPT_DATA += block-common.sh vtpm-common.sh vtpm-hotplug-common.sh
-Index: xen-4.0.2-testing/tools/hotplug/Linux/domain-lock
+Index: xen-4.1.0-testing/tools/hotplug/Linux/domain-lock
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/hotplug/Linux/domain-lock
++++ xen-4.1.0-testing/tools/hotplug/Linux/domain-lock
@@ -0,0 +1,83 @@
+#!/bin/bash
+
@@ -349,10 +236,10 @@
+ get_status $vm_path
+ ;;
+esac
-Index: xen-4.0.2-testing/tools/hotplug/Linux/vm-monitor
+Index: xen-4.1.0-testing/tools/hotplug/Linux/vm-monitor
===================================================================
--- /dev/null
-+++ xen-4.0.2-testing/tools/hotplug/Linux/vm-monitor
++++ xen-4.1.0-testing/tools/hotplug/Linux/vm-monitor
@@ -0,0 +1,41 @@
+#!/bin/bash
+
++++++ xend-sysconfig.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100
@@ -1,14 +1,14 @@
-Index: xen-4.0.2-testing/tools/hotplug/Linux/init.d/sysconfig.xend
+Index: xen-4.1.0-testing/tools/hotplug/Linux/init.d/sysconfig.xencommons
===================================================================
---- xen-4.0.2-testing.orig/tools/hotplug/Linux/init.d/sysconfig.xend
-+++ xen-4.0.2-testing/tools/hotplug/Linux/init.d/sysconfig.xend
-@@ -1,11 +1,27 @@
+--- xen-4.1.0-testing.orig/tools/hotplug/Linux/init.d/sysconfig.xencommons
++++ xen-4.1.0-testing/tools/hotplug/Linux/init.d/sysconfig.xencommons
+@@ -1,11 +1,31 @@
+## Path: System/Virtualization
+## Type: string(none,guest,hv,all)
+## Default: ""
+#
- # Log xenconsoled messages (cf xm dmesg)
--#XENCONSOLED_TRACE=[none|guest|hv|all]
+ # Log xenconsoled messages (cf xl dmesg)
+ #XENCONSOLED_TRACE=[none|guest|hv|all]
+XENCONSOLED_TRACE=""
+## Path: System/Virtualization
@@ -16,7 +16,7 @@
+## Default: ""
+#
# Log xenstored messages
--#XENSTORED_TRACE=[yes|on|1]
+ #XENSTORED_TRACE=[yes|on|1]
+XENSTORED_TRACE=""
+## Path: System/Virtualization
@@ -24,7 +24,7 @@
+## Default: ""
+#
# Running xenstored on XENSTORED_ROOTDIR
--#XENSTORED_ROOTDIR=/var/lib/xenstored
+ #XENSTORED_ROOTDIR=/var/lib/xenstored
+XENSTORED_ROOTDIR=""
+## Path: System/Virtualization
@@ -32,5 +32,5 @@
+## Default: ""
+#
# Running xenbackendd in debug mode
--#XENBACKENDD_DEBUG=[yes|on|1]
+ #XENBACKENDD_DEBUG=[yes|on|1]
+XENBACKENDD_DEBUG=""
++++++ xenpaging.autostart_delay.patch ++++++
Subject: xenpaging: add dynamic startup delay for xenpaging
This is a debug helper. Since the xenpaging support is still fragile, run
xenpaging at different stages in the bootprocess. Different delays will trigger
more bugs. This implementation starts without delay for 5 reboots, then
increments the delay by 0.1 seconds It uses xenstore for presistant storage of
delay values
TODO: find the correct place to remove the xenstore directory when the guest is shutdown or crashed
Signed-off-by: Olaf Hering
---
tools/python/xen/xend/image.py | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
Index: xen-4.0.2-testing/tools/python/xen/xend/image.py
===================================================================
--- xen-4.0.2-testing.orig/tools/python/xen/xend/image.py
+++ xen-4.0.2-testing/tools/python/xen/xend/image.py
@@ -123,6 +123,19 @@ class ImageHandler:
self.device_model = vmConfig['platform'].get('device_model')
self.xenpaging = vmConfig['platform'].get('xenpaging')
+ if self.xenpaging is not "0":
+ self.xenpaging_delay = xstransact.Read("/local/domain/0/xenpaging/%s/xenpaging_delay" % self.vm.info['name_label'])
+ if self.xenpaging_delay == None:
+ log.warn("XXX creating /local/domain/0/xenpaging/%s" % self.vm.info['name_label'])
+ xstransact.Mkdir("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'])
+ xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay', '0.0'))
+ xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay_inc', '0.1'))
+ xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay_use', '5'))
+ xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay_used', '0'))
+ self.xenpaging_delay = float(xstransact.Read("/local/domain/0/xenpaging/%s/xenpaging_delay" % self.vm.info['name_label']))
+ self.xenpaging_delay_inc = float(xstransact.Read("/local/domain/0/xenpaging/%s/xenpaging_delay_inc" % self.vm.info['name_label']))
+ self.xenpaging_delay_use = int(xstransact.Read("/local/domain/0/xenpaging/%s/xenpaging_delay_use" % self.vm.info['name_label']))
+ self.xenpaging_delay_used = int(xstransact.Read("/local/domain/0/xenpaging/%s/xenpaging_delay_used" % self.vm.info['name_label']))
self.display = vmConfig['platform'].get('display')
self.xauthority = vmConfig['platform'].get('xauthority')
@@ -399,6 +412,17 @@ class ImageHandler:
return
if self.xenpaging_pid:
return
+ if self.xenpaging_delay_used < self.xenpaging_delay_use:
+ self.xenpaging_delay_used += 1
+ else:
+ self.xenpaging_delay_used = 0
+ self.xenpaging_delay += self.xenpaging_delay_inc
+ log.info("delay_used %s" % self.xenpaging_delay_used)
+ log.info("delay_use %s" % self.xenpaging_delay_use)
+ log.info("delay %s" % self.xenpaging_delay)
+ log.info("delay_inc %s" % self.xenpaging_delay_inc)
+ xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay', self.xenpaging_delay))
+ xstransact.Store("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'], ('xenpaging_delay_used', self.xenpaging_delay_used))
xenpaging_bin = auxbin.pathTo("xenpaging")
args = [xenpaging_bin]
args = args + ([ "%d" % self.vm.getDomid()])
@@ -427,6 +451,9 @@ class ImageHandler:
except:
log.warn("chdir %s failed" % xenpaging_dir)
try:
+ if self.xenpaging_delay != 0.0:
+ log.info("delaying xenpaging startup %s seconds ..." % self.xenpaging_delay)
+ time.sleep(self.xenpaging_delay)
log.info("starting %s" % args)
os.execve(xenpaging_bin, args, env)
except Exception, e:
@@ -442,10 +469,16 @@ class ImageHandler:
self.xenpaging_pid = xenpaging_pid
os.close(null)
os.close(logfd)
+ if self.xenpaging_delay == 0.0:
+ log.warn("waiting for xenpaging ...")
+ time.sleep(22)
+ log.warn("waiting for xenpaging done.")
def destroyXenPaging(self):
if self.xenpaging == "0":
return
+ # FIXME find correct place for guest shutdown or crash
+ #xstransact.Remove("/local/domain/0/xenpaging/%s" % self.vm.info['name_label'])
if self.xenpaging_pid:
try:
os.kill(self.xenpaging_pid, signal.SIGHUP)
++++++ xentrace.dynamic_sized_tbuf.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100
@@ -2,11 +2,11 @@
xen/common/trace.c | 215 ++++++++++++++++++++---------------------------------
1 file changed, 83 insertions(+), 132 deletions(-)
-Index: xen-4.0.2-testing/xen/common/trace.c
+Index: xen-4.1.0-testing/xen/common/trace.c
===================================================================
---- xen-4.0.2-testing.orig/xen/common/trace.c
-+++ xen-4.0.2-testing/xen/common/trace.c
-@@ -41,14 +41,14 @@ CHECK_t_buf;
+--- xen-4.1.0-testing.orig/xen/common/trace.c
++++ xen-4.1.0-testing/xen/common/trace.c
+@@ -42,14 +42,14 @@ CHECK_t_buf;
#define compat_t_rec t_rec
#endif
@@ -25,7 +25,7 @@
static DEFINE_PER_CPU_READ_MOSTLY(struct t_buf *, t_bufs);
static DEFINE_PER_CPU_READ_MOSTLY(unsigned char *, t_data);
static DEFINE_PER_CPU_READ_MOSTLY(spinlock_t, t_lock);
-@@ -84,20 +84,30 @@ static void calc_tinfo_first_offset(void
+@@ -85,20 +85,30 @@ static void calc_tinfo_first_offset(void
}
/**
@@ -65,7 +65,7 @@
}
/**
-@@ -110,47 +120,28 @@ static int check_tbuf_size(u32 pages)
+@@ -111,47 +121,28 @@ static int check_tbuf_size(u32 pages)
* This function may also be called later when enabling trace buffers
* via the SET_SIZE hypercall.
*/
@@ -92,7 +92,7 @@
+ if ( pages == 0 )
return -EINVAL;
- }
--
+
- /* t_info size is fixed for now. Currently this works great, so there
- * seems to be no need to make it dynamic. */
- t_info = alloc_xenheap_pages(get_order_from_pages(T_INFO_PAGES), 0);
@@ -106,7 +106,7 @@
- for ( i = 0; i < T_INFO_PAGES; i++ )
- share_xen_page_with_privileged_guests(
- virt_to_page(t_info) + i, XENSHARE_readonly);
-
+-
- t_info_mfn_list = (uint32_t *)t_info;
- offset = t_info_first_offset;
+ /* Calculate offset in u32 of first mfn */
@@ -125,7 +125,7 @@
/*
* First, allocate buffers for all of the cpus. If any
-@@ -158,27 +149,29 @@ static int alloc_trace_bufs(void)
+@@ -159,27 +150,29 @@ static int alloc_trace_bufs(void)
*/
for_each_online_cpu(cpu)
{
@@ -164,16 +164,17 @@
/*
* Now share the pages to xentrace can map them, and write them in
-@@ -187,91 +180,72 @@ static int alloc_trace_bufs(void)
+@@ -188,89 +181,74 @@ static int alloc_trace_bufs(void)
for_each_online_cpu(cpu)
{
/* Share pages so that xentrace can map them. */
- char *rawbuf;
+
+- if ( (rawbuf = (char *)per_cpu(t_bufs, cpu)) )
+ void *rawbuf = per_cpu(t_bufs, cpu);
+ struct page_info *p = virt_to_page(rawbuf);
+ uint32_t mfn = virt_to_mfn(rawbuf);
-
-- if ( (rawbuf = (char *)per_cpu(t_bufs, cpu)) )
++
+ for ( i = 0; i < pages; i++ )
{
- struct page_info *p = virt_to_page(rawbuf);
@@ -206,12 +207,13 @@
- data_size = (opt_tbuf_size * PAGE_SIZE - sizeof(struct t_buf));
+ data_size = (pages * PAGE_SIZE - sizeof(struct t_buf));
t_buf_highwater = data_size >> 1; /* 50% high water */
+
+ opt_tbuf_size = pages;
+
+ printk("Xen trace buffers: initialised\n");
+ wmb(); /* above must be visible before tb_init_done flag set */
+ tb_init_done = 1;
-
++
return 0;
+
out_dealloc:
@@ -257,8 +259,6 @@
*/
- int ret = 0;
-
--
--
- if ( opt_tbuf_size != 0 )
+ if ( opt_tbuf_size && pages != opt_tbuf_size )
{
@@ -287,7 +287,29 @@
}
int trace_will_trace_event(u32 event)
-@@ -309,36 +283,13 @@ int trace_will_trace_event(u32 event)
+@@ -299,21 +277,6 @@ int trace_will_trace_event(u32 event)
+ return 1;
+ }
+
+-static int cpu_callback(
+- struct notifier_block *nfb, unsigned long action, void *hcpu)
+-{
+- unsigned int cpu = (unsigned long)hcpu;
+-
+- if ( action == CPU_UP_PREPARE )
+- spin_lock_init(&per_cpu(t_lock, cpu));
+-
+- return NOTIFY_DONE;
+-}
+-
+-static struct notifier_block cpu_nfb = {
+- .notifier_call = cpu_callback
+-};
+-
+ /**
+ * init_trace_bufs - performs initialization of the per-cpu trace buffers.
+ *
+@@ -323,37 +286,13 @@ static struct notifier_block cpu_nfb = {
*/
void __init init_trace_bufs(void)
{
@@ -297,8 +319,9 @@
- calc_tinfo_first_offset();
-
- /* Per-cpu t_lock initialisation. */
-- for ( i = 0; i < NR_CPUS; i++ )
+- for_each_online_cpu ( i )
- spin_lock_init(&per_cpu(t_lock, i));
+- register_cpu_notifier(&cpu_nfb);
-
- if ( opt_tbuf_size == 0 )
+ if ( opt_tbuf_size && alloc_trace_bufs(opt_tbuf_size) )
@@ -329,7 +352,7 @@
}
/**
-@@ -357,7 +308,7 @@ int tb_control(xen_sysctl_tbuf_op_t *tbc
+@@ -372,7 +311,7 @@ int tb_control(xen_sysctl_tbuf_op_t *tbc
case XEN_SYSCTL_TBUFOP_get_info:
tbc->evt_mask = tb_event_mask;
tbc->buffer_mfn = t_info ? virt_to_mfn(t_info) : 0;
++++++ xm-create-xflag.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/python/xen/xm/create.py
+Index: xen-4.1.0-testing/tools/python/xen/xm/create.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xm/create.py
-+++ xen-4.0.2-testing/tools/python/xen/xm/create.py
+--- xen-4.1.0-testing.orig/tools/python/xen/xm/create.py
++++ xen-4.1.0-testing/tools/python/xen/xm/create.py
@@ -36,7 +36,7 @@ from xen.xend.server.DevConstants import
from xen.util import blkif
from xen.util import vscsi_util
@@ -11,7 +11,7 @@
from xen.util import utils, auxbin
from xen.util.pci import dev_dict_to_sxp, \
parse_pci_name_extended, PciDeviceParseError
-@@ -1522,7 +1522,7 @@ def main(argv):
+@@ -1528,7 +1528,7 @@ def main(argv):
except IOError, exn:
raise OptionError("Cannot read file %s: %s" % (config, exn[1]))
@@ -20,19 +20,23 @@
from xen.xm.xenapi_create import sxp2xml
sxp2xml_inst = sxp2xml()
doc = sxp2xml_inst.convert_sxp_to_xml(config, transient=True)
-@@ -1530,7 +1530,7 @@ def main(argv):
+@@ -1536,9 +1536,9 @@ def main(argv):
if opts.vals.dryrun and not opts.is_xml:
SXPPrettyPrint.prettyprint(config)
- if opts.vals.xmldryrun and serverType == SERVER_XEN_API:
+- from xml.dom.ext import PrettyPrint as XMLPrettyPrint
+- XMLPrettyPrint(doc)
+ if opts.vals.xmldryrun:
- from xml.dom.ext import PrettyPrint as XMLPrettyPrint
- XMLPrettyPrint(doc)
++ xml_as_string = doc.toprettyxml()
++ print("%s" % xml_as_string)
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendAPIConstants.py
+ if opts.vals.dryrun or opts.vals.xmldryrun:
+ return
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendAPIConstants.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendAPIConstants.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendAPIConstants.py
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendAPIConstants.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendAPIConstants.py
@@ -45,8 +45,10 @@ XEN_API_ON_NORMAL_EXIT = [
XEN_API_ON_CRASH_BEHAVIOUR = [
'destroy',
++++++ xm-save-check-file.patch ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendAPI.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendAPI.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendAPI.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendAPI.py
-@@ -1923,10 +1923,10 @@ class XendAPI(object):
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendAPI.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendAPI.py
+@@ -1959,10 +1959,10 @@ class XendAPI(object):
bool(live), port, node, ssl, bool(chs))
return xen_api_success_void()
@@ -15,20 +15,20 @@
return xen_api_success_void()
def VM_restore(self, _, src, paused):
-Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomain.py
+Index: xen-4.1.0-testing/tools/python/xen/xend/XendDomain.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xend/XendDomain.py
-+++ xen-4.0.2-testing/tools/python/xen/xend/XendDomain.py
-@@ -1496,7 +1496,7 @@ class XendDomain:
- pass
- sock.close()
+--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendDomain.py
++++ xen-4.1.0-testing/tools/python/xen/xend/XendDomain.py
+@@ -1505,7 +1505,7 @@ class XendDomain:
+ pass
+ sock.close()
- def domain_save(self, domid, dst, checkpoint=False):
+ def domain_save(self, domid, dst, checkpoint=False, force=False):
"""Start saving a domain to file.
@param domid: Domain ID or Name
-@@ -1512,6 +1512,9 @@ class XendDomain:
+@@ -1521,6 +1521,9 @@ class XendDomain:
if not dominfo:
raise XendInvalidDomain(str(domid))
@@ -38,11 +38,11 @@
if dominfo.getDomid() == DOM0_ID:
raise XendError("Cannot save privileged domain %s" % str(domid))
if dominfo._stateGet() != DOM_STATE_RUNNING:
-Index: xen-4.0.2-testing/tools/python/xen/xm/main.py
+Index: xen-4.1.0-testing/tools/python/xen/xm/main.py
===================================================================
---- xen-4.0.2-testing.orig/tools/python/xen/xm/main.py
-+++ xen-4.0.2-testing/tools/python/xen/xm/main.py
-@@ -120,7 +120,7 @@ SUBCOMMAND_HELP = {
+--- xen-4.1.0-testing.orig/tools/python/xen/xm/main.py
++++ xen-4.1.0-testing/tools/python/xen/xm/main.py
+@@ -121,7 +121,7 @@ SUBCOMMAND_HELP = {
'reset' : ('<Domain>', 'Reset a domain.'),
'restore' : ('<CheckpointFile> [-p]',
'Restore a domain from a saved state.'),
@@ -51,7 +51,7 @@
'Save a domain state to restore later.'),
'shutdown' : ('<Domain> [-waRH]', 'Shutdown a domain.'),
'top' : ('', 'Monitor a host and the domains in real time.'),
-@@ -316,6 +316,7 @@ SUBCOMMAND_OPTIONS = {
+@@ -342,6 +342,7 @@ SUBCOMMAND_OPTIONS = {
),
'save': (
('-c', '--checkpoint', 'Leave domain running after creating snapshot'),
@@ -59,7 +59,7 @@
),
'restore': (
('-p', '--paused', 'Do not unpause domain after restoring it'),
-@@ -820,18 +821,21 @@ def xm_event_monitor(args):
+@@ -864,18 +865,21 @@ def xm_event_monitor(args):
def xm_save(args):
@@ -83,7 +83,7 @@
if len(params) != 2:
err("Wrong number of parameters")
-@@ -845,9 +849,9 @@ def xm_save(args):
+@@ -889,9 +893,9 @@ def xm_save(args):
sys.exit(1)
if serverType == SERVER_XEN_API:
++++++ xm-test-cleanup.diff ++++++
--- /var/tmp/diff_new_pack.DG628O/_old 2011-03-24 10:01:24.000000000 +0100
+++ /var/tmp/diff_new_pack.DG628O/_new 2011-03-24 10:01:24.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.2-testing/tools/xm-test/tests/save/01_save_basic_pos.py
+Index: xen-4.1.0-testing/tools/xm-test/tests/save/01_save_basic_pos.py
===================================================================
---- xen-4.0.2-testing.orig/tools/xm-test/tests/save/01_save_basic_pos.py
-+++ xen-4.0.2-testing/tools/xm-test/tests/save/01_save_basic_pos.py
+--- xen-4.1.0-testing.orig/tools/xm-test/tests/save/01_save_basic_pos.py
++++ xen-4.1.0-testing/tools/xm-test/tests/save/01_save_basic_pos.py
@@ -35,3 +35,9 @@ if s != 0:
# Make sure it's gone
if isDomainRunning(domain.getName()):
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org