Hello community,
here is the log from the commit of package xen for openSUSE:Factory
checked in at Mon Feb 7 12:21:08 CET 2011.
--------
--- xen/xen.changes 2011-02-02 01:41:44.000000000 +0100
+++ /mounts/work_src_done/STABLE/xen/xen.changes 2011-02-04 22:19:00.000000000 +0100
@@ -1,0 +2,20 @@
+Tue Feb 1 16:01:45 MST 2011 - carnold@novell.com
+
+- Update to Xen 4.0.2 rc2-pre, changeset 21443
+
+-------------------------------------------------------------------
+Mon Jan 31 10:45:21 MST 2011 - carnold@novell.com
+
+- bnc#633573 - System fail to boot after running several warm
+ reboot tests
+ 22749-vtd-workarounds.patch
+- Upstream patches from Jan
+ 22744-ept-pod-locking.patch
+ 22777-vtd-ats-fixes.patch
+ 22781-pod-hap-logdirty.patch
+ 22782-x86-emul-smsw.patch
+ 22789-i386-no-x2apic.patch
+ 22790-svm-resume-migrate-pirqs.patch
+ 22816-x86-pirq-drop-priv-check.patch
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
21344-4.0-testing-xenstore-fd-leak.patch
21421-vts-ats-enabling.patch
21432-4.0-cpu-boot-failure.patch
21989-x2apic-resume.patch
22045-python27-compat.patch
22051-x86-forced-EOI.patch
22067-x86-irq-domain.patch
22068-vtd-irte-RH-bit.patch
22071-ept-get-entry-lock.patch
22084-x86-xsave-off.patch
22135-heap-lock.patch
22148-serial-irq-dest.patch
22157-x86-debug-key-i.patch
22159-notify-evtchn-dying.patch
22160-Intel-C6-EOI.patch
22174-x86-pmtimer-accuracy.patch
22175-x86-irq-enter-exit.patch
22177-i386-irq-safe-map_domain_page.patch
22194-tmem-check-pv-mfn.patch
22213-x86-xsave-cpuid-check.patch
22222-x86-timer-extint.patch
22223-vtd-workarounds.patch
22232-x86-64-lahf-lm-bios-workaround.patch
22280-kexec.patch
22337-vtd-scan-single-func.patch
22348-vtd-check-secbus-devfn.patch
22389-amd-iommu-decls.patch
22416-acpi-check-mwait.patch
22417-vpmu-nehalem.patch
22448-x86_64-gdt-ldt-fault-filter.patch
22451-hvm-cap-clobber.patch
22452-x86-irq-migrate-directed-eoi.patch
22466-x86-sis-apic-bug.patch
22470-vlapic-tick-loss.patch
22506-x86-iommu-dom0-estimate.patch
22526-ept-access-once.patch
22538-keyhandler-relax.patch
22540-32on64-hypercall-debug.patch
22549-vtd-map-page-leak.patch
22574-ept-skip-validation.patch
22632-vtd-print-entries.patch
qemu-fix-7433.patch
xen-4.0.1-testing-src.tar.bz2
New:
----
21421-vtd-ats-enabling.patch
22332-vtd-workarounds.patch
22408-vpmu-nehalem.patch
22526-ept-get-entry-no-lock.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
xen-4.0.2-testing-src.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xen.spec ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:18.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:18.000000000 +0100
@@ -22,8 +22,8 @@
ExclusiveArch: %ix86 x86_64
%define xvers 4.0
%define xvermaj 4
-%define changeset 21326
-%define xen_build_dir xen-4.0.1-testing
+%define changeset 21443
+%define xen_build_dir xen-4.0.2-testing
%define with_kmp 1
%define with_stubdom 1
BuildRequires: LibVNCServer-devel
@@ -70,14 +70,14 @@
%if %{?with_kmp}0
BuildRequires: kernel-source kernel-syms module-init-tools xorg-x11
%endif
-Version: 4.0.1_04
-Release: 2
+Version: 4.0.2_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.1-testing-src.tar.bz2
+Source0: xen-4.0.2-testing-src.tar.bz2
Source1: stubdom.tar.bz2
Source2: xen-utils-0.1.tar.bz2
Source3: README.SuSE
@@ -115,84 +115,52 @@
Patch2: 21271-x86-cache-flush-global.patch
Patch3: 21301-svm-lmsl.patch
Patch4: 21304-keyhandler-alternative.patch
-Patch5: 21344-4.0-testing-xenstore-fd-leak.patch
-Patch6: 21406-x86-microcode-quiet.patch
-Patch7: 21421-vts-ats-enabling.patch
-Patch8: 21526-x86-nehalem-cpuid-mask.patch
-Patch9: 21432-4.0-cpu-boot-failure.patch
-Patch10: 21542-amd-erratum-411.patch
-Patch11: 21615-dont-save-xen-heap-pages.patch
-Patch12: 21627-cpuidle-wrap.patch
-Patch13: 21653-xend-mac-addr.patch
-Patch14: 21678-xend-mac-fix.patch
-Patch15: 21683-vtd-kill-timer-conditional.patch
-Patch16: 21723-get-domu-state.patch
-Patch17: 21847-pscsi.patch
-Patch18: 21866-xenapi.patch
-Patch19: 21894-intel-unmask-cpuid.patch
-Patch20: 22019-x86-cpuidle-online-check.patch
-Patch21: 22045-python27-compat.patch
-Patch22: 22051-x86-forced-EOI.patch
-Patch23: 22067-x86-irq-domain.patch
-Patch24: 22068-vtd-irte-RH-bit.patch
-Patch25: 22071-ept-get-entry-lock.patch
-Patch26: 22084-x86-xsave-off.patch
-Patch27: 22135-heap-lock.patch
-Patch28: 22148-serial-irq-dest.patch
-Patch29: 22157-x86-debug-key-i.patch
-Patch30: 22159-notify-evtchn-dying.patch
-Patch31: 22160-Intel-C6-EOI.patch
-Patch32: 22174-x86-pmtimer-accuracy.patch
-Patch33: 22175-x86-irq-enter-exit.patch
-Patch34: 22177-i386-irq-safe-map_domain_page.patch
-Patch35: 22194-tmem-check-pv-mfn.patch
-Patch36: 21810-x2apic-acpi.patch
-Patch37: 21989-x2apic-resume.patch
-Patch38: 22213-x86-xsave-cpuid-check.patch
-Patch39: 22214-x86-msr-misc-enable.patch
-Patch40: 22222-x86-timer-extint.patch
-Patch41: 22223-vtd-workarounds.patch
-Patch42: 22231-x86-pv-ucode-msr-intel.patch
-Patch43: 22232-x86-64-lahf-lm-bios-workaround.patch
-Patch44: 22235-lxml-validator.patch
-Patch45: 22280-kexec.patch
-Patch46: 22337-vtd-scan-single-func.patch
-Patch47: 22348-vtd-check-secbus-devfn.patch
-Patch48: 22369-xend-pci-passthru-fix.patch
-Patch49: 22388-x2apic-panic.patch
-Patch50: 22389-amd-iommu-decls.patch
-Patch51: 22416-acpi-check-mwait.patch
-Patch52: 22417-vpmu-nehalem.patch
-Patch53: 22431-p2m-remove-bug-check.patch
-Patch54: 22448-x86_64-gdt-ldt-fault-filter.patch
-Patch55: 22451-hvm-cap-clobber.patch
-Patch56: 22452-x86-irq-migrate-directed-eoi.patch
-Patch57: 22466-x86-sis-apic-bug.patch
-Patch58: 22470-vlapic-tick-loss.patch
-Patch59: 22475-x2apic-cleanup.patch
-Patch60: 22484-vlapic-tmcct-periodic.patch
-Patch61: 22504-iommu-dom0-holes.patch
-Patch62: 22506-x86-iommu-dom0-estimate.patch
-Patch63: 22526-ept-access-once.patch
-Patch64: 22533-x86-32bit-apicid.patch
-Patch65: 22534-x86-max-local-apic.patch
-Patch66: 22535-x2apic-preenabled.patch
-Patch67: 22538-keyhandler-relax.patch
-Patch68: 22540-32on64-hypercall-debug.patch
-Patch69: 22549-vtd-map-page-leak.patch
-Patch70: 22574-ept-skip-validation.patch
-Patch71: 22632-vtd-print-entries.patch
-Patch72: 22645-amd-flush-filter.patch
-Patch73: 22693-fam10-mmio-conf-base-protect.patch
-Patch74: 22694-x86_64-no-weak.patch
-Patch75: 22707-x2apic-preenabled-check.patch
-Patch76: 22708-xenctx-misc.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: 22526-ept-get-entry-no-lock.patch
+Patch32: 22533-x86-32bit-apicid.patch
+Patch33: 22534-x86-max-local-apic.patch
+Patch34: 22535-x2apic-preenabled.patch
+Patch35: 22645-amd-flush-filter.patch
+Patch36: 22693-fam10-mmio-conf-base-protect.patch
+Patch37: 22694-x86_64-no-weak.patch
+Patch38: 22707-x2apic-preenabled-check.patch
+Patch39: 22708-xenctx-misc.patch
+Patch40: 22744-ept-pod-locking.patch
+Patch41: 22749-vtd-workarounds.patch
+Patch42: 22777-vtd-ats-fixes.patch
+Patch43: 22781-pod-hap-logdirty.patch
+Patch44: 22789-i386-no-x2apic.patch
+Patch45: 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: qemu-fix-7433.patch
-Patch204: 7434-qemu-rlimit-as.patch
+Patch203: 7434-qemu-rlimit-as.patch
# Our patches
Patch300: xen-config.diff
Patch301: xend-config.diff
@@ -722,42 +690,10 @@
%patch43 -p1
%patch44 -p1
%patch45 -p1
-%patch46 -p1
-%patch47 -p1
-%patch48 -p1
-%patch49 -p1
-%patch50 -p1
-%patch51 -p1
-%patch52 -p1
-%patch53 -p1
-%patch54 -p1
-%patch55 -p1
-%patch56 -p1
-%patch57 -p1
-%patch58 -p1
-%patch59 -p1
-%patch60 -p1
-%patch61 -p1
-%patch62 -p1
-%patch63 -p1
-%patch64 -p1
-%patch65 -p1
-%patch66 -p1
-%patch67 -p1
-%patch68 -p1
-%patch69 -p1
-%patch70 -p1
-%patch71 -p1
-%patch72 -p1
-%patch73 -p1
-%patch74 -p1
-%patch75 -p1
-%patch76 -p1
%patch200 -p1
%patch201 -p1
%patch202 -p1
%patch203 -p1
-%patch204 -p1
%patch300 -p1
%patch301 -p1
%patch302 -p1
++++++ 20158-revert.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:18.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:18.000000000 +0100
@@ -15,10 +15,10 @@
http://lists.xensource.com/archives/html/xen-devel/2010-12/msg01160.html
-Index: xen-4.0.1-testing/tools/python/xen/util/blkif.py
+Index: xen-4.0.2-testing/tools/python/xen/util/blkif.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/util/blkif.py
-+++ xen-4.0.1-testing/tools/python/xen/util/blkif.py
+--- xen-4.0.2-testing.orig/tools/python/xen/util/blkif.py
++++ xen-4.0.2-testing/tools/python/xen/util/blkif.py
@@ -79,13 +79,6 @@ def parse_uname(uname):
if typ == "phy" and not fn.startswith("/"):
fn = "/dev/%s" %(fn,)
@@ -33,10 +33,10 @@
if typ in ("tap", "tap2"):
(taptype, fn) = fn.split(":", 1)
if taptype in ("tapdisk", "ioemu"):
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.1-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
@@ -3283,15 +3283,6 @@ class XendDomainInfo:
(fn, types) = parse_uname(disk)
@@ -50,6 +50,6 @@
- if state == 'Secondary':
- os.system('/sbin/drbdadm primary ' + diskname)
-
+ mounted_vbd_uuid = 0
def _shouldMount(types):
if types[0] in ('file', 'phy'):
- return False
++++++ 21089-x86-startup-irq-from-setup-gsi.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:18.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:18.000000000 +0100
@@ -54,11 +54,11 @@
Signed-off-by: Jan Beulich
-Index: xen-4.0.1-testing/xen/arch/x86/io_apic.c
+Index: xen-4.0.2-testing/xen/arch/x86/io_apic.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/io_apic.c
-+++ xen-4.0.1-testing/xen/arch/x86/io_apic.c
-@@ -2231,6 +2231,7 @@ int __init io_apic_get_redir_entries (in
+--- xen-4.0.2-testing.orig/xen/arch/x86/io_apic.c
++++ xen-4.0.2-testing/xen/arch/x86/io_apic.c
+@@ -2232,6 +2232,7 @@ int __init io_apic_get_redir_entries (in
int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int active_high_low)
{
@@ -66,7 +66,7 @@
struct IO_APIC_route_entry entry;
unsigned long flags;
int vector;
-@@ -2282,7 +2283,12 @@ int io_apic_set_pci_routing (int ioapic,
+@@ -2283,7 +2284,12 @@ int io_apic_set_pci_routing (int ioapic,
io_apic_write(ioapic, 0x11+2*pin, *(((int *)&entry)+1));
io_apic_write(ioapic, 0x10+2*pin, *(((int *)&entry)+0));
set_native_irq_info(irq, TARGET_CPUS);
@@ -80,10 +80,10 @@
return 0;
}
-Index: xen-4.0.1-testing/xen/arch/x86/mpparse.c
+Index: xen-4.0.2-testing/xen/arch/x86/mpparse.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/mpparse.c
-+++ xen-4.0.1-testing/xen/arch/x86/mpparse.c
+--- xen-4.0.2-testing.orig/xen/arch/x86/mpparse.c
++++ xen-4.0.2-testing/xen/arch/x86/mpparse.c
@@ -1102,6 +1102,8 @@ int mp_register_gsi (u32 gsi, int trigge
int ioapic = -1;
int ioapic_pin = 0;
@@ -93,9 +93,9 @@
/*
* Mapping between Global System Interrups, which
-@@ -1126,8 +1128,13 @@ int mp_register_gsi (u32 gsi, int trigge
- if (ioapic_renumber_irq)
- gsi = ioapic_renumber_irq(ioapic, gsi);
+@@ -1123,8 +1125,13 @@ int mp_register_gsi (u32 gsi, int trigge
+
+ ioapic_pin = gsi - mp_ioapic_routing[ioapic].gsi_base;
- if (!(irq_to_desc(gsi)->status & IRQ_DISABLED))
+ desc = irq_to_desc(gsi);
++++++ 21235-crashkernel-advanced.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:18.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:18.000000000 +0100
@@ -33,10 +33,10 @@
Signed-off-by: Jan Beulich
-Index: xen-4.0.1-testing/xen/arch/x86/setup.c
+Index: xen-4.0.2-testing/xen/arch/x86/setup.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/setup.c
-+++ xen-4.0.1-testing/xen/arch/x86/setup.c
+--- xen-4.0.2-testing.orig/xen/arch/x86/setup.c
++++ xen-4.0.2-testing/xen/arch/x86/setup.c
@@ -664,6 +664,11 @@ void __init __start_xen(unsigned long mb
memcpy(&boot_e820, &e820, sizeof(e820));
@@ -49,10 +49,10 @@
kexec_reserve_area(&boot_e820);
/*
-Index: xen-4.0.1-testing/xen/common/kexec.c
+Index: xen-4.0.2-testing/xen/common/kexec.c
===================================================================
---- xen-4.0.1-testing.orig/xen/common/kexec.c
-+++ xen-4.0.1-testing/xen/common/kexec.c
+--- xen-4.0.2-testing.orig/xen/common/kexec.c
++++ xen-4.0.2-testing/xen/common/kexec.c
@@ -49,15 +49,109 @@ static unsigned char vmcoreinfo_data[VMC
static size_t vmcoreinfo_size = 0;
@@ -166,10 +166,10 @@
static void one_cpu_only(void)
{
/* Only allow the first cpu to continue - force other cpus to spin */
-Index: xen-4.0.1-testing/xen/include/xen/kexec.h
+Index: xen-4.0.2-testing/xen/include/xen/kexec.h
===================================================================
---- xen-4.0.1-testing.orig/xen/include/xen/kexec.h
-+++ xen-4.0.1-testing/xen/include/xen/kexec.h
+--- xen-4.0.2-testing.orig/xen/include/xen/kexec.h
++++ xen-4.0.2-testing/xen/include/xen/kexec.h
@@ -12,6 +12,8 @@ typedef struct xen_kexec_reserve {
extern xen_kexec_reserve_t kexec_crash_area;
++++++ 21271-x86-cache-flush-global.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:18.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:18.000000000 +0100
@@ -12,10 +12,10 @@
Signed-off-by: Jan Beulich
-Index: xen-4.0.1-testing/xen/arch/x86/mm.c
+Index: xen-4.0.2-testing/xen/arch/x86/mm.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/mm.c
-+++ xen-4.0.1-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
@@ -2889,6 +2889,27 @@ int do_mmuext_op(
}
break;
@@ -44,10 +44,10 @@
case MMUEXT_SET_LDT:
{
unsigned long ptr = op.arg1.linear_addr;
-Index: xen-4.0.1-testing/xen/include/public/xen.h
+Index: xen-4.0.2-testing/xen/include/public/xen.h
===================================================================
---- xen-4.0.1-testing.orig/xen/include/public/xen.h
-+++ xen-4.0.1-testing/xen/include/public/xen.h
+--- xen-4.0.2-testing.orig/xen/include/public/xen.h
++++ xen-4.0.2-testing/xen/include/public/xen.h
@@ -239,6 +239,10 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t);
*
* cmd: MMUEXT_FLUSH_CACHE
++++++ 21301-svm-lmsl.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:18.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:18.000000000 +0100
@@ -11,10 +11,10 @@
Signed-off-by: Jan Beulich
-Index: xen-4.0.1-testing/xen/arch/x86/hvm/hvm.c
+Index: xen-4.0.2-testing/xen/arch/x86/hvm/hvm.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/hvm/hvm.c
-+++ xen-4.0.1-testing/xen/arch/x86/hvm/hvm.c
+--- xen-4.0.2-testing.orig/xen/arch/x86/hvm/hvm.c
++++ xen-4.0.2-testing/xen/arch/x86/hvm/hvm.c
@@ -603,11 +603,12 @@ static int hvm_load_cpu_ctxt(struct doma
return -EINVAL;
}
@@ -42,10 +42,10 @@
(!cpu_has_ffxsr && (value & EFER_FFXSE)) )
{
gdprintk(XENLOG_WARNING, "Trying to set reserved bit in "
-Index: xen-4.0.1-testing/xen/arch/x86/hvm/svm/svm.c
+Index: xen-4.0.2-testing/xen/arch/x86/hvm/svm/svm.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/hvm/svm/svm.c
-+++ xen-4.0.1-testing/xen/arch/x86/hvm/svm/svm.c
+--- xen-4.0.2-testing.orig/xen/arch/x86/hvm/svm/svm.c
++++ xen-4.0.2-testing/xen/arch/x86/hvm/svm/svm.c
@@ -57,6 +57,9 @@
u32 svm_feature_flags;
@@ -86,10 +86,10 @@
return 1;
}
-Index: xen-4.0.1-testing/xen/include/asm-x86/hvm/hvm.h
+Index: xen-4.0.2-testing/xen/include/asm-x86/hvm/hvm.h
===================================================================
---- xen-4.0.1-testing.orig/xen/include/asm-x86/hvm/hvm.h
-+++ xen-4.0.1-testing/xen/include/asm-x86/hvm/hvm.h
+--- xen-4.0.2-testing.orig/xen/include/asm-x86/hvm/hvm.h
++++ xen-4.0.2-testing/xen/include/asm-x86/hvm/hvm.h
@@ -143,6 +143,7 @@ struct hvm_function_table {
extern struct hvm_function_table hvm_funcs;
++++++ 21304-keyhandler-alternative.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:18.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:18.000000000 +0100
@@ -11,10 +11,10 @@
Signed-off-by: Jan Beulich
-Index: xen-4.0.1-testing/xen/common/keyhandler.c
+Index: xen-4.0.2-testing/xen/common/keyhandler.c
===================================================================
---- xen-4.0.1-testing.orig/xen/common/keyhandler.c
-+++ xen-4.0.1-testing/xen/common/keyhandler.c
+--- xen-4.0.2-testing.orig/xen/common/keyhandler.c
++++ xen-4.0.2-testing/xen/common/keyhandler.c
@@ -19,6 +19,7 @@
static struct keyhandler *key_table[256];
@@ -68,7 +68,7 @@
}
static struct keyhandler dump_dom0_registers_keyhandler = {
-@@ -434,8 +465,28 @@ static struct keyhandler do_debug_key_ke
+@@ -439,8 +470,28 @@ static struct keyhandler do_debug_key_ke
.desc = "trap to xendbg"
};
++++++ 21406-x86-microcode-quiet.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:18.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:18.000000000 +0100
@@ -7,8 +7,10 @@
Signed-off-by: Keir Fraser
---- a/xen/arch/x86/microcode.c
-+++ b/xen/arch/x86/microcode.c
+Index: xen-4.0.2-testing/xen/arch/x86/microcode.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/microcode.c
++++ xen-4.0.2-testing/xen/arch/x86/microcode.c
@@ -66,12 +66,10 @@ static void microcode_fini_cpu(int cpu)
int microcode_resume_cpu(int cpu)
++++++ 21421-vtd-ats-enabling.patch ++++++
References: bnc#573413
# HG changeset patch
# User Keir Fraser
# Date 1274253726 -3600
# Node ID f67ae6f9d4107f091d062fc1501a96f873671d10
# Parent eb4ecc037b7a53647f0ac89c7067d11ea622ab00
VT-d: Fix ATS enabling for device assignment
Currently, Xen only enables ATS in Xen booting. When an ATS capable
device is assigned to guest, ATS is actually not enabled because FLR
before assignment causes it to be disabled. Thus ATS cannot be used in
guest. This patch enables ATS in domain_context_mapping. This ensures
ATS is enabled in assignment because FLR is earlier than
domain_context_mapping call. Therefore ATS can be used in guest. This
patch also implements disable_ats_device to disable ATS when the
device is deassigned from a domain.
Signed-off-by: Weidong Han
Index: xen-4.0.2-testing/xen/drivers/passthrough/vtd/ia64/ats.c
===================================================================
--- xen-4.0.2-testing.orig/xen/drivers/passthrough/vtd/ia64/ats.c
+++ xen-4.0.2-testing/xen/drivers/passthrough/vtd/ia64/ats.c
@@ -47,6 +47,11 @@ int enable_ats_device(int seg, int bus,
return 0;
}
+int disable_ats_device(int seg, int bus, int devfn)
+{
+ return 0;
+}
+
int dev_invalidate_iotlb(struct iommu *iommu, u16 did,
u64 addr, unsigned int size_order, u64 type)
{
Index: xen-4.0.2-testing/xen/drivers/passthrough/vtd/iommu.c
===================================================================
--- xen-4.0.2-testing.orig/xen/drivers/passthrough/vtd/iommu.c
+++ xen-4.0.2-testing/xen/drivers/passthrough/vtd/iommu.c
@@ -1354,6 +1354,9 @@ static int domain_context_mapping(struct
dprintk(VTDPREFIX, "d%d:PCIe: map bdf = %x:%x.%x\n",
domain->domain_id, bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
ret = domain_context_mapping_one(domain, drhd->iommu, bus, devfn);
+ if ( !ret && ats_device(0, bus, devfn) )
+ enable_ats_device(0, bus, devfn);
+
break;
case DEV_TYPE_PCI:
@@ -1476,6 +1479,9 @@ static int domain_context_unmap(struct d
dprintk(VTDPREFIX, "d%d:PCIe: unmap bdf = %x:%x.%x\n",
domain->domain_id, bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
ret = domain_context_unmap_one(domain, iommu, bus, devfn);
+ if ( !ret && ats_device(0, bus, devfn) )
+ disable_ats_device(0, bus, devfn);
+
break;
case DEV_TYPE_PCI:
@@ -1805,8 +1811,6 @@ static void setup_dom0_devices(struct do
list_add(&pdev->domain_list, &d->arch.pdev_list);
domain_context_mapping(d, pdev->bus, pdev->devfn);
pci_enable_acs(pdev);
- if ( ats_device(0, pdev->bus, pdev->devfn) )
- enable_ats_device(0, pdev->bus, pdev->devfn);
}
}
spin_unlock(&pcidevs_lock);
Index: xen-4.0.2-testing/xen/drivers/passthrough/vtd/x86/ats.c
===================================================================
--- xen-4.0.2-testing.orig/xen/drivers/passthrough/vtd/x86/ats.c
+++ xen-4.0.2-testing/xen/drivers/passthrough/vtd/x86/ats.c
@@ -92,6 +92,9 @@ int ats_device(int seg, int bus, int dev
pdev = pci_get_pdev(bus, devfn);
drhd = acpi_find_matched_drhd_unit(pdev);
+ if ( !drhd )
+ return 0;
+
if ( !ecap_queued_inval(drhd->iommu->ecap) ||
!ecap_dev_iotlb(drhd->iommu->ecap) )
return 0;
@@ -144,6 +147,9 @@ int enable_ats_device(int seg, int bus,
value = pci_conf_read16(bus, PCI_SLOT(devfn),
PCI_FUNC(devfn), pos + ATS_REG_CTL);
+ if ( value & ATS_ENABLE )
+ return 0;
+
value |= ATS_ENABLE;
pci_conf_write16(bus, PCI_SLOT(devfn), PCI_FUNC(devfn),
pos + ATS_REG_CTL, value);
@@ -153,10 +159,50 @@ int enable_ats_device(int seg, int bus,
pdev->devfn = devfn;
pdev->ats_queue_depth = queue_depth;
list_add(&(pdev->list), &ats_devices);
+ if ( iommu_verbose )
+ dprintk(XENLOG_INFO VTDPREFIX, "%x:%x.%x: ATS is enabled\n",
+ bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
return pos;
}
+int disable_ats_device(int seg, int bus, int devfn)
+{
+ struct list_head *pdev_list, *tmp;
+ struct pci_ats_dev *pdev;
+ u32 value;
+ int pos;
+
+ pos = pci_find_ext_capability(seg, bus, devfn, PCI_EXT_CAP_ID_ATS);
+ if ( !pos )
+ return 0;
+
+ /* BUGBUG: add back seg when multi-seg platform support is enabled */
+ value = pci_conf_read16(bus, PCI_SLOT(devfn),
+ PCI_FUNC(devfn), pos + ATS_REG_CTL);
+ value &= ~ATS_ENABLE;
+ pci_conf_write16(bus, PCI_SLOT(devfn), PCI_FUNC(devfn),
+ pos + ATS_REG_CTL, value);
+
+ list_for_each_safe( pdev_list, tmp, &ats_devices )
+ {
+ pdev = list_entry(pdev_list, struct pci_ats_dev, list);
+ if ( pdev->bus == bus && pdev->devfn == devfn )
+ {
+ list_del(&pdev->list);
+ xfree(pdev);
+ break;
+ }
+ }
+
+ if ( iommu_verbose )
+ dprintk(XENLOG_INFO VTDPREFIX, "%x:%x.%x: ATS is disabled\n",
+ bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
+
+ return 0;
+}
+
+
static int device_in_domain(struct iommu *iommu, struct pci_ats_dev *pdev, u16 did)
{
struct root_entry *root_entry = NULL;
++++++ 21526-x86-nehalem-cpuid-mask.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:18.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:18.000000000 +0100
@@ -31,10 +31,10 @@
Signed-off-by: Jan Beulich
-Index: xen-4.0.1-testing/xen/arch/x86/cpu/amd.c
+Index: xen-4.0.2-testing/xen/arch/x86/cpu/amd.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/cpu/amd.c
-+++ xen-4.0.1-testing/xen/arch/x86/cpu/amd.c
+--- xen-4.0.2-testing.orig/xen/arch/x86/cpu/amd.c
++++ xen-4.0.2-testing/xen/arch/x86/cpu/amd.c
@@ -33,14 +33,6 @@ void start_svm(struct cpuinfo_x86 *c);
static char opt_famrev[14];
string_param("cpuid_mask_cpu", opt_famrev);
@@ -50,7 +50,7 @@
static inline void wrmsr_amd(unsigned int index, unsigned int lo,
unsigned int hi)
{
-@@ -61,7 +53,7 @@ static inline void wrmsr_amd(unsigned in
+@@ -102,7 +94,7 @@ static inline int wrmsr_amd_safe(unsigne
*
* The processor revision string parameter has precedene.
*/
@@ -59,7 +59,7 @@
{
static unsigned int feat_ecx, feat_edx;
static unsigned int extfeat_ecx, extfeat_edx;
-@@ -76,12 +68,12 @@ static void __devinit set_cpuidmask(stru
+@@ -117,12 +109,12 @@ static void __devinit set_cpuidmask(stru
ASSERT((status == not_parsed) && (smp_processor_id() == 0));
status = no_mask;
@@ -78,10 +78,10 @@
} else if (*opt_famrev == '\0') {
return;
} else if (!strcmp(opt_famrev, "fam_0f_rev_c")) {
-Index: xen-4.0.1-testing/xen/arch/x86/cpu/common.c
+Index: xen-4.0.2-testing/xen/arch/x86/cpu/common.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/cpu/common.c
-+++ xen-4.0.1-testing/xen/arch/x86/cpu/common.c
+--- xen-4.0.2-testing.orig/xen/arch/x86/cpu/common.c
++++ xen-4.0.2-testing/xen/arch/x86/cpu/common.c
@@ -22,6 +22,15 @@ static int cachesize_override __cpuinitd
static int disable_x86_fxsr __cpuinitdata;
static int disable_x86_serial_nr __cpuinitdata;
@@ -98,10 +98,10 @@
struct cpu_dev * cpu_devs[X86_VENDOR_NUM] = {};
/*
-Index: xen-4.0.1-testing/xen/arch/x86/cpu/cpu.h
+Index: xen-4.0.2-testing/xen/arch/x86/cpu/cpu.h
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/cpu/cpu.h
-+++ xen-4.0.1-testing/xen/arch/x86/cpu/cpu.h
+--- xen-4.0.2-testing.orig/xen/arch/x86/cpu/cpu.h
++++ xen-4.0.2-testing/xen/arch/x86/cpu/cpu.h
@@ -21,6 +21,9 @@ struct cpu_dev {
extern struct cpu_dev * cpu_devs [X86_VENDOR_NUM];
@@ -112,10 +112,10 @@
extern int get_model_name(struct cpuinfo_x86 *c);
extern void display_cacheinfo(struct cpuinfo_x86 *c);
-Index: xen-4.0.1-testing/xen/arch/x86/cpu/intel.c
+Index: xen-4.0.2-testing/xen/arch/x86/cpu/intel.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/cpu/intel.c
-+++ xen-4.0.1-testing/xen/arch/x86/cpu/intel.c
+--- xen-4.0.2-testing.orig/xen/arch/x86/cpu/intel.c
++++ xen-4.0.2-testing/xen/arch/x86/cpu/intel.c
@@ -20,16 +20,6 @@
extern int trap_init_f00f_bug(void);
@@ -130,7 +130,7 @@
-integer_param("cpuid_mask_ecx", opt_cpuid_mask_ecx);
-integer_param("cpuid_mask_edx", opt_cpuid_mask_edx);
-
- static int use_xsave = 1;
+ static int use_xsave;
boolean_param("xsave", use_xsave);
@@ -40,24 +30,57 @@ boolean_param("xsave", use_xsave);
@@ -211,10 +211,10 @@
/* Work around errata */
Intel_errata_workarounds(c);
-Index: xen-4.0.1-testing/xen/include/asm-x86/msr-index.h
+Index: xen-4.0.2-testing/xen/include/asm-x86/msr-index.h
===================================================================
---- xen-4.0.1-testing.orig/xen/include/asm-x86/msr-index.h
-+++ xen-4.0.1-testing/xen/include/asm-x86/msr-index.h
+--- xen-4.0.2-testing.orig/xen/include/asm-x86/msr-index.h
++++ xen-4.0.2-testing/xen/include/asm-x86/msr-index.h
@@ -156,8 +156,10 @@
#define MSR_P6_EVNTSEL0 0x00000186
#define MSR_P6_EVNTSEL1 0x00000187
++++++ 21542-amd-erratum-411.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:18.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:18.000000000 +0100
@@ -9,10 +9,10 @@
Signed-off-by: Wei Wang
-Index: xen-4.0.1-testing/xen/arch/x86/apic.c
+Index: xen-4.0.2-testing/xen/arch/x86/apic.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/apic.c
-+++ xen-4.0.1-testing/xen/arch/x86/apic.c
+--- xen-4.0.2-testing.orig/xen/arch/x86/apic.c
++++ xen-4.0.2-testing/xen/arch/x86/apic.c
@@ -198,6 +198,9 @@ void clear_local_APIC(void)
maxlvt = get_maxlvt();
@@ -23,7 +23,7 @@
/*
* Masking an LVT entry on a P6 can trigger a local APIC error
* if the vector is zero. Mask LVTERR first to prevent this.
-@@ -1335,7 +1338,10 @@ void disable_APIC_timer(void)
+@@ -1327,7 +1330,10 @@ void disable_APIC_timer(void)
{
if (using_apic_timer) {
unsigned long v;
@@ -35,10 +35,10 @@
v = apic_read(APIC_LVTT);
apic_write_around(APIC_LVTT, v | APIC_LVT_MASKED);
}
-Index: xen-4.0.1-testing/xen/arch/x86/hpet.c
+Index: xen-4.0.2-testing/xen/arch/x86/hpet.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/hpet.c
-+++ xen-4.0.1-testing/xen/arch/x86/hpet.c
+--- xen-4.0.2-testing.orig/xen/arch/x86/hpet.c
++++ xen-4.0.2-testing/xen/arch/x86/hpet.c
@@ -659,8 +659,7 @@ void hpet_broadcast_enter(void)
if ( hpet_attach_channel )
hpet_attach_channel(cpu, ch);
++++++ 21615-dont-save-xen-heap-pages.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -17,10 +17,10 @@
Signed-off-by: Jan Beulich
-Index: xen-4.0.1-testing/tools/libxc/xc_domain_save.c
+Index: xen-4.0.2-testing/tools/libxc/xc_domain_save.c
===================================================================
---- xen-4.0.1-testing.orig/tools/libxc/xc_domain_save.c
-+++ xen-4.0.1-testing/tools/libxc/xc_domain_save.c
+--- xen-4.0.2-testing.orig/tools/libxc/xc_domain_save.c
++++ xen-4.0.2-testing/tools/libxc/xc_domain_save.c
@@ -1282,58 +1282,64 @@ int xc_domain_save(int xc_handle, int io
goto out;
}
@@ -124,10 +124,10 @@
if ( write_exact(io_fd, &batch, sizeof(unsigned int)) )
{
PERROR("Error when writing to state file (2)");
-Index: xen-4.0.1-testing/xen/arch/x86/domctl.c
+Index: xen-4.0.2-testing/xen/arch/x86/domctl.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/domctl.c
-+++ xen-4.0.1-testing/xen/arch/x86/domctl.c
+--- xen-4.0.2-testing.orig/xen/arch/x86/domctl.c
++++ xen-4.0.2-testing/xen/arch/x86/domctl.c
@@ -206,11 +206,12 @@ long arch_do_domctl(
for ( j = 0; j < k; j++ )
++++++ 21627-cpuidle-wrap.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -7,10 +7,10 @@
Signed-off-by: Wei Gang
-Index: xen-4.0.1-testing/xen/arch/x86/acpi/cpu_idle.c
+Index: xen-4.0.2-testing/xen/arch/x86/acpi/cpu_idle.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/acpi/cpu_idle.c
-+++ xen-4.0.1-testing/xen/arch/x86/acpi/cpu_idle.c
+--- xen-4.0.2-testing.orig/xen/arch/x86/acpi/cpu_idle.c
++++ xen-4.0.2-testing/xen/arch/x86/acpi/cpu_idle.c
@@ -127,9 +127,9 @@ static inline u32 ticks_elapsed(u32 t1,
if ( t2 >= t1 )
return (t2 - t1);
++++++ 21653-xend-mac-addr.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -16,10 +16,10 @@
Signed-off-by Chunyan Liu
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.1-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
@@ -847,11 +847,6 @@ class XendDomainInfo:
@type dev_config: SXP object (parsed config)
"""
++++++ 21678-xend-mac-fix.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -16,10 +16,10 @@
Signed-off-by: Ian Jackson
Signed-off-by Chunyan Liu
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.1-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
@@ -847,6 +847,8 @@ class XendDomainInfo:
@type dev_config: SXP object (parsed config)
"""
++++++ 21683-vtd-kill-timer-conditional.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -7,10 +7,10 @@
Signed-off-by: Keir Fraser
-Index: xen-4.0.1-testing/xen/drivers/passthrough/io.c
+Index: xen-4.0.2-testing/xen/drivers/passthrough/io.c
===================================================================
---- xen-4.0.1-testing.orig/xen/drivers/passthrough/io.c
-+++ xen-4.0.1-testing/xen/drivers/passthrough/io.c
+--- xen-4.0.2-testing.orig/xen/drivers/passthrough/io.c
++++ xen-4.0.2-testing/xen/drivers/passthrough/io.c
@@ -27,7 +27,7 @@
static void hvm_dirq_assist(unsigned long _d);
@@ -20,10 +20,10 @@
{
return !(flags & (HVM_IRQ_DPCI_GUEST_MSI | HVM_IRQ_DPCI_TRANSLATE));
}
-Index: xen-4.0.1-testing/xen/drivers/passthrough/pci.c
+Index: xen-4.0.2-testing/xen/drivers/passthrough/pci.c
===================================================================
---- xen-4.0.1-testing.orig/xen/drivers/passthrough/pci.c
-+++ xen-4.0.1-testing/xen/drivers/passthrough/pci.c
+--- xen-4.0.2-testing.orig/xen/drivers/passthrough/pci.c
++++ xen-4.0.2-testing/xen/drivers/passthrough/pci.c
@@ -257,7 +257,9 @@ static void pci_clean_dpci_irqs(struct d
i = find_next_bit(hvm_irq_dpci->mapping, d->nr_pirqs, i + 1) )
{
@@ -35,11 +35,11 @@
list_for_each_safe ( digl_list, tmp,
&hvm_irq_dpci->mirq[i].digl_list )
-Index: xen-4.0.1-testing/xen/include/xen/iommu.h
+Index: xen-4.0.2-testing/xen/include/xen/iommu.h
===================================================================
---- xen-4.0.1-testing.orig/xen/include/xen/iommu.h
-+++ xen-4.0.1-testing/xen/include/xen/iommu.h
-@@ -103,6 +103,7 @@ void hvm_dpci_isairq_eoi(struct domain *
+--- xen-4.0.2-testing.orig/xen/include/xen/iommu.h
++++ xen-4.0.2-testing/xen/include/xen/iommu.h
+@@ -106,6 +106,7 @@ void hvm_dpci_isairq_eoi(struct domain *
struct hvm_irq_dpci *domain_get_irq_dpci(struct domain *domain);
int domain_set_irq_dpci(struct domain *domain, struct hvm_irq_dpci *dpci);
void free_hvm_irq_dpci(struct hvm_irq_dpci *dpci);
++++++ 21723-get-domu-state.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -16,10 +16,10 @@
Signed-off-by James (Song Wei)
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomain.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomain.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomain.py
-+++ xen-4.0.1-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
@@ -250,6 +250,18 @@ class XendDomain:
@return: path to config file.
"""
@@ -39,10 +39,10 @@
def _managed_check_point_path(self, domuuid):
"""Returns absolute path to check point file for managed domain.
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.1-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
@@ -327,6 +327,8 @@ class XendDomainInfo:
@type info: dictionary
@ivar domid: Domain ID (if VM has started)
@@ -60,10 +60,10 @@
maxmem = self.info.get('memory_static_max', 0)
memory = self.info.get('memory_dynamic_max', 0)
-Index: xen-4.0.1-testing/tools/python/xen/xend/server/SrvDomain.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/server/SrvDomain.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/server/SrvDomain.py
-+++ xen-4.0.1-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
@@ -225,6 +225,20 @@ class SrvDomain(SrvDir):
self.acceptCommand(req)
return self.xd.domain_reset(self.dom.getName())
@@ -85,10 +85,10 @@
def op_usb_add(self, op, req):
self.acceptCommand(req)
return req.threadRequest(self.do_usb_add, op, req)
-Index: xen-4.0.1-testing/tools/python/xen/xm/main.py
+Index: xen-4.0.2-testing/tools/python/xen/xm/main.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xm/main.py
-+++ xen-4.0.1-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
@@ -165,6 +165,8 @@ SUBCOMMAND_HELP = {
#usb
'usb-add' : ('<domain> <[host:bus.addr] [host:vendor_id:product_id]>','Add the usb device to FV VM.'),
++++++ 21810-x2apic-acpi.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -26,8 +26,10 @@
Signed-off-by: Weidong Han
---- a/xen/arch/x86/acpi/boot.c
-+++ b/xen/arch/x86/acpi/boot.c
+Index: xen-4.0.2-testing/xen/arch/x86/acpi/boot.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/acpi/boot.c
++++ xen-4.0.2-testing/xen/arch/x86/acpi/boot.c
@@ -81,7 +81,7 @@ u8 acpi_enable_value, acpi_disable_value
#warning ACPI uses CMPXCHG, i486 and later hardware
#endif
@@ -136,8 +138,10 @@
printk(KERN_ERR PREFIX "Error parsing LAPIC NMI entry\n");
/* TBD: Cleanup to allow fallback to MPS */
return count;
---- a/xen/arch/x86/mpparse.c
-+++ b/xen/arch/x86/mpparse.c
+Index: xen-4.0.2-testing/xen/arch/x86/mpparse.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/mpparse.c
++++ xen-4.0.2-testing/xen/arch/x86/mpparse.c
@@ -838,7 +838,7 @@ void __init mp_register_lapic_address (
@@ -147,8 +151,10 @@
u8 enabled)
{
struct mpc_config_processor processor;
---- a/xen/arch/x86/srat.c
-+++ b/xen/arch/x86/srat.c
+Index: xen-4.0.2-testing/xen/arch/x86/srat.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/srat.c
++++ xen-4.0.2-testing/xen/arch/x86/srat.c
@@ -164,6 +164,36 @@ void __init acpi_numa_slit_init(struct a
}
#endif
@@ -186,8 +192,10 @@
/* Callback for Proximity Domain -> LAPIC mapping */
void __init
acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
---- a/xen/drivers/acpi/numa.c
-+++ b/xen/drivers/acpi/numa.c
+Index: xen-4.0.2-testing/xen/drivers/acpi/numa.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/drivers/acpi/numa.c
++++ xen-4.0.2-testing/xen/drivers/acpi/numa.c
@@ -90,6 +90,21 @@ void __init acpi_table_print_srat_entry(
#endif /* ACPI_DEBUG_OUTPUT */
break;
@@ -253,8 +261,10 @@
acpi_table_parse_srat(ACPI_SRAT_PROCESSOR_AFFINITY,
acpi_parse_processor_affinity,
NR_CPUS);
---- a/xen/drivers/acpi/tables.c
-+++ b/xen/drivers/acpi/tables.c
+Index: xen-4.0.2-testing/xen/drivers/acpi/tables.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/drivers/acpi/tables.c
++++ xen-4.0.2-testing/xen/drivers/acpi/tables.c
@@ -63,6 +63,18 @@ void __init acpi_table_print_madt_entry(
}
break;
@@ -274,10 +284,11 @@
case ACPI_MADT_TYPE_IO_APIC:
{
struct acpi_madt_io_apic *p =
-@@ -117,6 +129,24 @@ void __init acpi_table_print_madt_entry(
+@@ -116,6 +128,24 @@ void __init acpi_table_print_madt_entry(
+ p->lint);
}
break;
-
++
+ case ACPI_MADT_TYPE_LOCAL_X2APIC_NMI:
+ {
+ u16 polarity, trigger;
@@ -295,12 +306,13 @@
+ p->lint);
+ }
+ break;
-+
+
case ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE:
{
- struct acpi_madt_local_apic_override *p =
---- a/xen/include/acpi/actbl1.h
-+++ b/xen/include/acpi/actbl1.h
+Index: xen-4.0.2-testing/xen/include/acpi/actbl1.h
+===================================================================
+--- xen-4.0.2-testing.orig/xen/include/acpi/actbl1.h
++++ xen-4.0.2-testing/xen/include/acpi/actbl1.h
@@ -404,7 +404,9 @@ enum acpi_madt_type {
ACPI_MADT_TYPE_IO_SAPIC = 6,
ACPI_MADT_TYPE_LOCAL_SAPIC = 7,
@@ -389,8 +401,10 @@
/*******************************************************************************
*
* TCPA - Trusted Computing Platform Alliance table
---- a/xen/include/asm-x86/acpi.h
-+++ b/xen/include/asm-x86/acpi.h
+Index: xen-4.0.2-testing/xen/include/asm-x86/acpi.h
+===================================================================
+--- xen-4.0.2-testing.orig/xen/include/asm-x86/acpi.h
++++ xen-4.0.2-testing/xen/include/asm-x86/acpi.h
@@ -151,7 +151,7 @@ struct acpi_sleep_info {
#endif /* CONFIG_ACPI_SLEEP */
@@ -400,8 +414,10 @@
#define MAX_LOCAL_APIC 256
extern u32 pmtmr_ioport;
---- a/xen/include/asm-x86/mpspec.h
-+++ b/xen/include/asm-x86/mpspec.h
+Index: xen-4.0.2-testing/xen/include/asm-x86/mpspec.h
+===================================================================
+--- xen-4.0.2-testing.orig/xen/include/asm-x86/mpspec.h
++++ xen-4.0.2-testing/xen/include/asm-x86/mpspec.h
@@ -24,7 +24,7 @@ extern int pic_mode;
extern int using_apic_timer;
@@ -411,8 +427,10 @@
extern void mp_unregister_lapic(uint32_t apic_id, uint32_t cpu);
extern void mp_register_lapic_address (u64 address);
extern void mp_register_ioapic (u8 id, u32 address, u32 gsi_base);
---- a/xen/include/xen/acpi.h
-+++ b/xen/include/xen/acpi.h
+Index: xen-4.0.2-testing/xen/include/xen/acpi.h
+===================================================================
+--- xen-4.0.2-testing.orig/xen/include/xen/acpi.h
++++ xen-4.0.2-testing/xen/include/xen/acpi.h
@@ -57,6 +57,8 @@ enum acpi_madt_entry_id {
ACPI_MADT_IOSAPIC,
ACPI_MADT_LSAPIC,
++++++ 21847-pscsi.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -37,10 +37,10 @@
Comment from Masaki Kanno : "Well done"
Committed-by: Ian Jackson
-Index: xen-4.0.1-testing/tools/examples/xend-config.sxp
+Index: xen-4.0.2-testing/tools/examples/xend-config.sxp
===================================================================
---- xen-4.0.1-testing.orig/tools/examples/xend-config.sxp
-+++ xen-4.0.1-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
@@ -277,3 +277,11 @@
# we have to realize this may incur security issue and we can't make sure the
# device assignment could really work properly even after we do this.
@@ -53,10 +53,10 @@
+# command lsscsi, e.g. ('16:0:0:0' '15:0')
+# (pscsi-device-mask ('*'))
+
-Index: xen-4.0.1-testing/tools/python/xen/util/vscsi_util.py
+Index: xen-4.0.2-testing/tools/python/xen/util/vscsi_util.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/util/vscsi_util.py
-+++ xen-4.0.1-testing/tools/python/xen/util/vscsi_util.py
+--- xen-4.0.2-testing.orig/tools/python/xen/util/vscsi_util.py
++++ xen-4.0.2-testing/tools/python/xen/util/vscsi_util.py
@@ -148,11 +148,12 @@ def _vscsi_get_scsidevices_by_sysfs():
return devices
@@ -85,10 +85,10 @@
scsi_record = _make_scsi_record(scsi_info)
scsi_records.append(scsi_record)
return scsi_records
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendNode.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendNode.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendNode.py
-+++ xen-4.0.1-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
@@ -323,7 +323,12 @@ class XendNode:
pscsi_table = {}
pscsi_HBA_table = {}
@@ -103,10 +103,10 @@
scsi_id = pscsi_record['scsi_id']
if scsi_id:
saved_HBA_uuid = None
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendOptions.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendOptions.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendOptions.py
-+++ xen-4.0.1-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
@@ -164,6 +164,9 @@ class XendOptions:
"""
print >>sys.stderr, "xend [ERROR]", fmt % args
++++++ 21866-xenapi.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -18,10 +18,10 @@
Acked-by: Jim Fehlig
Committed-by: Ian Jackson
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendAPI.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendAPI.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendAPI.py
-+++ xen-4.0.1-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
@@ -1667,7 +1667,8 @@ class XendAPI(object):
def VM_set_actions_after_crash(self, session, vm_ref, action):
if action not in XEN_API_ON_CRASH_BEHAVIOUR:
@@ -32,10 +32,10 @@
def VM_set_HVM_boot_policy(self, session, vm_ref, value):
if value != "" and value != "BIOS order":
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendAPIConstants.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendAPIConstants.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendAPIConstants.py
-+++ xen-4.0.1-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
@@ -63,6 +63,18 @@ XEN_API_ON_CRASH_BEHAVIOUR_FILTER = {
'rename_restart' : 'rename_restart',
}
@@ -55,10 +55,10 @@
XEN_API_VBD_MODE = ['RO', 'RW']
XEN_API_VDI_TYPE = ['system', 'user', 'ephemeral']
XEN_API_VBD_TYPE = ['CD', 'Disk']
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendConfig.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendConfig.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendConfig.py
-+++ xen-4.0.1-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
@@ -41,6 +41,7 @@ from xen.util.pci import pci_opts_list_f
from xen.xend.XendSXPDev import dev_dict_to_sxp
from xen.util import xsconstants
++++++ 21894-intel-unmask-cpuid.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -13,8 +13,10 @@
Signed-off-by: Wei Gang
---- a/xen/arch/x86/cpu/intel.c
-+++ b/xen/arch/x86/cpu/intel.c
+Index: xen-4.0.2-testing/xen/arch/x86/cpu/intel.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/cpu/intel.c
++++ xen-4.0.2-testing/xen/arch/x86/cpu/intel.c
@@ -90,6 +90,20 @@ void __devinit early_intel_workaround(st
/* Netburst reports 64 bytes clflush size, but does IO in 128 bytes */
if (c->x86 == 15 && c->x86_cache_alignment == 64)
@@ -36,8 +38,10 @@
}
/*
---- a/xen/include/asm-x86/msr-index.h
-+++ b/xen/include/asm-x86/msr-index.h
+Index: xen-4.0.2-testing/xen/include/asm-x86/msr-index.h
+===================================================================
+--- xen-4.0.2-testing.orig/xen/include/asm-x86/msr-index.h
++++ xen-4.0.2-testing/xen/include/asm-x86/msr-index.h
@@ -324,6 +324,7 @@
#define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1<<11)
#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1<<12)
++++++ 22019-x86-cpuidle-online-check.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -13,8 +13,10 @@
Signed-off-by: Uwe Dannowski
Acked-by: Wei Huang
---- a/xen/arch/x86/acpi/cpuidle_menu.c
-+++ b/xen/arch/x86/acpi/cpuidle_menu.c
+Index: xen-4.0.2-testing/xen/arch/x86/acpi/cpuidle_menu.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/acpi/cpuidle_menu.c
++++ xen-4.0.2-testing/xen/arch/x86/acpi/cpuidle_menu.c
@@ -270,9 +270,10 @@ static void menu_reflect(struct acpi_pro
static int menu_enable_device(struct acpi_processor_power *power)
++++++ 22214-x86-msr-misc-enable.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -23,9 +23,11 @@
Signed-off-by: Jan Beulich
---- a/xen/arch/x86/traps.c
-+++ b/xen/arch/x86/traps.c
-@@ -1661,6 +1661,16 @@ unsigned long guest_to_host_gpr_switch(u
+Index: xen-4.0.2-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
+@@ -1679,6 +1679,16 @@ unsigned long guest_to_host_gpr_switch(u
void (*pv_post_outb_hook)(unsigned int port, u8 value);
@@ -42,7 +44,7 @@
/* Instruction fetch with error handling. */
#define insn_fetch(type, base, eip, limit) \
({ unsigned long _rc, _ptr = (base) + (eip); \
-@@ -2258,6 +2268,13 @@ static int emulate_privileged_op(struct
+@@ -2276,6 +2286,13 @@ static int emulate_privileged_op(struct
if ( wrmsr_safe(MSR_FAM10H_MMIO_CONF_BASE, eax, edx) != 0 )
goto fail;
break;
@@ -56,7 +58,7 @@
case MSR_IA32_MPERF:
case MSR_IA32_APERF:
if (( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL ) &&
-@@ -2364,11 +2381,7 @@ static int emulate_privileged_op(struct
+@@ -2382,11 +2399,7 @@ static int emulate_privileged_op(struct
case MSR_IA32_MISC_ENABLE:
if ( rdmsr_safe(regs->ecx, regs->eax, regs->edx) )
goto fail;
@@ -69,8 +71,10 @@
break;
case MSR_EFER:
case MSR_AMD_PATCHLEVEL:
---- a/xen/include/asm-x86/msr.h
-+++ b/xen/include/asm-x86/msr.h
+Index: xen-4.0.2-testing/xen/include/asm-x86/msr.h
+===================================================================
+--- xen-4.0.2-testing.orig/xen/include/asm-x86/msr.h
++++ xen-4.0.2-testing/xen/include/asm-x86/msr.h
@@ -39,7 +39,8 @@ static inline void wrmsrl(unsigned int m
__asm__ __volatile__( \
"1: rdmsr\n2:\n" \
++++++ 22231-x86-pv-ucode-msr-intel.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -13,9 +13,11 @@
Signed-off-by: Jan Beulich
---- a/xen/arch/x86/traps.c
-+++ b/xen/arch/x86/traps.c
-@@ -2268,6 +2268,14 @@ static int emulate_privileged_op(struct
+Index: xen-4.0.2-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
+@@ -2286,6 +2286,14 @@ static int emulate_privileged_op(struct
if ( wrmsr_safe(MSR_FAM10H_MMIO_CONF_BASE, eax, edx) != 0 )
goto fail;
break;
@@ -30,7 +32,7 @@
case MSR_IA32_MISC_ENABLE:
if ( rdmsr_safe(regs->ecx, l, h) )
goto invalid;
-@@ -2375,16 +2383,21 @@ static int emulate_privileged_op(struct
+@@ -2393,16 +2401,21 @@ static int emulate_privileged_op(struct
regs->eax = regs->edx = 0;
break;
}
@@ -57,7 +59,7 @@
default:
if ( rdmsr_hypervisor_regs(regs->ecx, &val) )
{
-@@ -2400,6 +2413,8 @@ static int emulate_privileged_op(struct
+@@ -2418,6 +2431,8 @@ static int emulate_privileged_op(struct
if ( rc )
goto rdmsr_writeback;
++++++ 22235-lxml-validator.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -16,10 +16,10 @@
Signed-off-by: Stefano Stabellini
committer: Stefano Stabellini
-Index: xen-4.0.1-testing/README
+Index: xen-4.0.2-testing/README
===================================================================
---- xen-4.0.1-testing.orig/README
-+++ xen-4.0.1-testing/README
+--- xen-4.0.2-testing.orig/README
++++ xen-4.0.2-testing/README
@@ -137,12 +137,15 @@ Python Runtime Libraries
Xend (the Xen daemon) has the following runtime dependencies:
@@ -50,10 +50,10 @@
Intel(R) Trusted Execution Technology Support
-Index: xen-4.0.1-testing/tools/python/xen/xm/xenapi_create.py
+Index: xen-4.0.2-testing/tools/python/xen/xm/xenapi_create.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xm/xenapi_create.py
-+++ xen-4.0.1-testing/tools/python/xen/xm/xenapi_create.py
+--- xen-4.0.2-testing.orig/tools/python/xen/xm/xenapi_create.py
++++ xen-4.0.2-testing/tools/python/xen/xm/xenapi_create.py
@@ -14,13 +14,15 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#============================================================================
++++++ 22326-cpu-pools-numa-placement.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -12,10 +12,10 @@
Signed-off-by: Juergen Gross
Signed-off-by: Ian Jackson
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendCPUPool.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendCPUPool.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendCPUPool.py
-+++ xen-4.0.1-testing/tools/python/xen/xend/XendCPUPool.py
+--- xen-4.0.2-testing.orig/tools/python/xen/xend/XendCPUPool.py
++++ xen-4.0.2-testing/tools/python/xen/xend/XendCPUPool.py
@@ -881,6 +881,11 @@ class XendCPUPool(XendBase):
lookup_pool = classmethod(lookup_pool)
@@ -28,10 +28,10 @@
def _cpu_number_to_ref(cls, number):
node = XendNode.instance()
for cpu_ref in node.get_host_cpu_refs():
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.1-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
@@ -2790,7 +2790,7 @@ class XendDomainInfo:
return map(lambda x: x[0], sorted(enumerate(nodeload), key=lambda x:x[1]))
++++++ 22223-vtd-workarounds.patch -> 22332-vtd-workarounds.patch ++++++
--- xen/22223-vtd-workarounds.patch 2011-01-14 13:21:26.000000000 +0100
+++ /mounts/work_src_done/STABLE/xen/22332-vtd-workarounds.patch 2011-02-04 22:14:29.000000000 +0100
@@ -1,21 +1,5 @@
# HG changeset patch
# User Keir Fraser
-# Date 1286028261 -3600
-# Node ID 4beee577912215c734b79cb84bfe3fb20c1afbfc
-# Parent aed9fd361340158daf2d7160d1b367478b6312d6
-Vt-d: fix dom0 graphics problem on Levnovo T410.
-References: bnc#643477
-
-The patch is derived from a similar quirk in Linux kernel by David
-Woodhouse and Adam Jackson. It checks for VT enabling bit in IGD GGC
-register. If VT is not enabled correctly in the IGD, Xen does not
-enable VT-d translation for IGD VT-d engine. In case where iommu boot
-parameter is set to force, Xen calls panic().
-
-Signed-off-by: Allen Kay
-
-# HG changeset patch
-# User Keir Fraser
# Date 1288344554 -3600
# Node ID b48d8f27fca251c2df0222d195ffcb772d6a1128
# Parent 2d5e8f4ac43a120bbb5d4c52d08f6980848f0166
@@ -41,43 +25,52 @@
Signed-off-by: Allen Kay
-Index: xen-4.0.1-testing/xen/drivers/passthrough/vtd/Makefile
-===================================================================
---- xen-4.0.1-testing.orig/xen/drivers/passthrough/vtd/Makefile
-+++ xen-4.0.1-testing/xen/drivers/passthrough/vtd/Makefile
+# HG changeset patch
+# User Keir Fraser
+# Date 1294221021 0
+# Node ID e635e6641c07ee2da66b16f46f45442c9a46821d
+# Parent 76d897a06b316bf2278220b006d578faf31ce3fb
+[VTD] added WLAN device ID on Fujitsu's platform in quirks.c
+
+Added WLAN device ID 0x422C that was found on Fujitsu's Calpella
+system to WLAN quirk.
+
+Signed-off-by: Allen Kay
+
+--- a/xen/drivers/passthrough/vtd/Makefile
++++ b/xen/drivers/passthrough/vtd/Makefile
@@ -6,3 +6,4 @@ obj-y += dmar.o
obj-y += utils.o
obj-y += qinval.o
obj-y += intremap.o
+obj-y += quirks.o
-Index: xen-4.0.1-testing/xen/drivers/passthrough/vtd/dmar.c
-===================================================================
---- xen-4.0.1-testing.orig/xen/drivers/passthrough/vtd/dmar.c
-+++ xen-4.0.1-testing/xen/drivers/passthrough/vtd/dmar.c
-@@ -46,6 +46,7 @@ LIST_HEAD(acpi_rmrr_units);
- LIST_HEAD(acpi_atsr_units);
- LIST_HEAD(acpi_rhsa_units);
-
-+static u64 igd_drhd_address;
- u8 dmar_host_address_width;
-
- void dmar_scope_add_buses(struct dmar_scope *scope, u16 sec_bus, u16 sub_bus)
-@@ -239,6 +240,11 @@ struct acpi_rhsa_unit * drhd_to_rhsa(str
- return NULL;
- }
+--- a/xen/drivers/passthrough/vtd/dmar.c
++++ b/xen/drivers/passthrough/vtd/dmar.c
+@@ -242,7 +242,7 @@ struct acpi_rhsa_unit * drhd_to_rhsa(str
-+int is_igd_drhd(struct acpi_drhd_unit *drhd)
-+{
+ int is_igd_drhd(struct acpi_drhd_unit *drhd)
+ {
+- return ( drhd->address == igd_drhd_address ? 1 : 0);
+ return drhd && (drhd->address == igd_drhd_address);
-+}
-+
+ }
+
/*
- * Count number of devices in device scope. Do not include PCI sub
- * hierarchies.
-@@ -333,6 +339,15 @@ static int __init acpi_parse_dev_scope(v
+@@ -278,8 +278,7 @@ static int scope_device_count(void *star
+
+
+ static int __init acpi_parse_dev_scope(void *start, void *end,
+- void *acpi_entry, int type,
+- int *igd)
++ void *acpi_entry, int type)
+ {
+ struct dmar_scope *scope = acpi_entry;
+ struct acpi_ioapic_unit *acpi_ioapic_unit;
+@@ -340,8 +339,15 @@ static int __init acpi_parse_dev_scope(v
if ( iommu_verbose )
dprintk(VTDPREFIX, " endpoint: %x:%x.%x\n",
bus, path->dev, path->fn);
+- if ( (bus == 0) && (path->dev == 2) && (path->fn == 0) )
+- *igd = 1;
+
+ if ( type == DMAR_TYPE )
+ {
@@ -90,21 +83,65 @@
break;
case ACPI_DEV_IOAPIC:
-Index: xen-4.0.1-testing/xen/drivers/passthrough/vtd/dmar.h
-===================================================================
---- xen-4.0.1-testing.orig/xen/drivers/passthrough/vtd/dmar.h
-+++ xen-4.0.1-testing/xen/drivers/passthrough/vtd/dmar.h
-@@ -114,5 +114,6 @@ void *map_to_nocache_virt(int nr_iommus,
- int vtd_hw_check(void);
- void disable_pmr(struct iommu *iommu);
- int is_usb_device(u8 bus, u8 devfn);
-+int is_igd_drhd(struct acpi_drhd_unit *drhd);
-
- #endif /* _DMAR_H_ */
-Index: xen-4.0.1-testing/xen/drivers/passthrough/vtd/extern.h
-===================================================================
---- xen-4.0.1-testing.orig/xen/drivers/passthrough/vtd/extern.h
-+++ xen-4.0.1-testing/xen/drivers/passthrough/vtd/extern.h
+@@ -388,7 +394,7 @@ acpi_parse_one_drhd(struct acpi_dmar_ent
+ struct acpi_table_drhd * drhd = (struct acpi_table_drhd *)header;
+ void *dev_scope_start, *dev_scope_end;
+ struct acpi_drhd_unit *dmaru;
+- int ret, igd = 0;
++ int ret;
+ static int include_all = 0;
+
+ if ( (ret = acpi_dmar_check_length(header, sizeof(*drhd))) != 0 )
+@@ -413,10 +419,7 @@ acpi_parse_one_drhd(struct acpi_dmar_ent
+ dev_scope_start = (void *)(drhd + 1);
+ dev_scope_end = ((void *)drhd) + header->length;
+ ret = acpi_parse_dev_scope(dev_scope_start, dev_scope_end,
+- dmaru, DMAR_TYPE, &igd);
+-
+- if ( igd )
+- igd_drhd_address = dmaru->address;
++ dmaru, DMAR_TYPE);
+
+ if ( dmaru->include_all )
+ {
+@@ -504,7 +507,7 @@ acpi_parse_one_rmrr(struct acpi_dmar_ent
+ struct acpi_rmrr_unit *rmrru;
+ void *dev_scope_start, *dev_scope_end;
+ u64 base_addr = rmrr->base_address, end_addr = rmrr->end_address;
+- int ret, igd = 0;
++ int ret;
+
+ if ( (ret = acpi_dmar_check_length(header, sizeof(*rmrr))) != 0 )
+ return ret;
+@@ -536,7 +539,7 @@ acpi_parse_one_rmrr(struct acpi_dmar_ent
+ dev_scope_start = (void *)(rmrr + 1);
+ dev_scope_end = ((void *)rmrr) + header->length;
+ ret = acpi_parse_dev_scope(dev_scope_start, dev_scope_end,
+- rmrru, RMRR_TYPE, &igd);
++ rmrru, RMRR_TYPE);
+
+ if ( ret || (rmrru->scope.devices_cnt == 0) )
+ xfree(rmrru);
+@@ -601,7 +604,7 @@ acpi_parse_one_atsr(struct acpi_dmar_ent
+ {
+ struct acpi_table_atsr *atsr = (struct acpi_table_atsr *)header;
+ struct acpi_atsr_unit *atsru;
+- int ret, igd = 0;
++ int ret;
+ static int all_ports;
+ void *dev_scope_start, *dev_scope_end;
+
+@@ -622,7 +625,7 @@ acpi_parse_one_atsr(struct acpi_dmar_ent
+ dev_scope_start = (void *)(atsr + 1);
+ dev_scope_end = ((void *)atsr) + header->length;
+ ret = acpi_parse_dev_scope(dev_scope_start, dev_scope_end,
+- atsru, ATSR_TYPE, &igd);
++ atsru, ATSR_TYPE);
+ }
+ else
+ {
+--- a/xen/drivers/passthrough/vtd/extern.h
++++ b/xen/drivers/passthrough/vtd/extern.h
@@ -26,6 +26,7 @@
extern int qinval_enabled;
@@ -170,10 +207,8 @@
+void me_wifi_quirk(struct domain *domain, u8 bus, u8 devfn, int map);
#endif // _VTD_EXTERN_H_
-Index: xen-4.0.1-testing/xen/drivers/passthrough/vtd/iommu.c
-===================================================================
---- xen-4.0.1-testing.orig/xen/drivers/passthrough/vtd/iommu.c
-+++ xen-4.0.1-testing/xen/drivers/passthrough/vtd/iommu.c
+--- a/xen/drivers/passthrough/vtd/iommu.c
++++ b/xen/drivers/passthrough/vtd/iommu.c
@@ -43,7 +43,6 @@
#endif
@@ -247,35 +282,43 @@
}
static void iommu_flush_all(void)
-@@ -688,10 +716,26 @@ static int iommu_set_root_entry(struct i
+@@ -688,24 +716,13 @@ static int iommu_set_root_entry(struct i
return 0;
}
--static void iommu_enable_translation(struct iommu *iommu)
-+static void iommu_enable_translation(struct acpi_drhd_unit *drhd)
+-#define GGC 0x52
+-#define GGC_MEMORY_VT_ENABLED (0x8 << 8)
+-static int is_igd_vt_enabled(void)
+-{
+- unsigned short ggc;
+-
+- /* integrated graphics on Intel platforms is located at 0:2.0 */
+- ggc = pci_conf_read16(0, 2, 0, GGC);
+- return ( ggc & GGC_MEMORY_VT_ENABLED ? 1 : 0 );
+-}
+-
+ static void iommu_enable_translation(struct acpi_drhd_unit *drhd)
{
u32 sts;
unsigned long flags;
-+ struct iommu *iommu = drhd->iommu;
-+
+ struct iommu *iommu = drhd->iommu;
+
+- if ( !is_igd_vt_enabled() && is_igd_drhd(drhd) )
+ if ( is_igd_drhd(drhd) && !is_igd_vt_enabled_quirk() )
-+ {
-+ if ( force_iommu )
-+ panic("BIOS did not enable IGD for VT properly, crash Xen for security purpose!\n");
-+ else
-+ {
-+ dprintk(XENLOG_WARNING VTDPREFIX,
-+ "BIOS did not enable IGD for VT properly. Disabling IGD VT-d engine.\n");
-+ return;
-+ }
-+ }
-+
+ {
+ if ( force_iommu )
+ panic("BIOS did not enable IGD for VT properly, crash Xen for security purpose!\n");
+@@ -717,6 +734,9 @@ static void iommu_enable_translation(str
+ }
+ }
+
+ /* apply platform specific errata workarounds */
+ vtd_ops_preamble_quirk(iommu);
-
++
if ( iommu_verbose )
dprintk(VTDPREFIX,
-@@ -705,6 +749,9 @@ static void iommu_enable_translation(str
+ "iommu_enable_translation: iommu->reg = %p\n", iommu->reg);
+@@ -729,6 +749,9 @@ static void iommu_enable_translation(str
(sts & DMA_GSTS_TES), sts);
spin_unlock_irqrestore(&iommu->register_lock, flags);
@@ -285,7 +328,7 @@
/* Disable PMRs when VT-d engine takes effect per spec definition */
disable_pmr(iommu);
}
-@@ -714,6 +761,9 @@ static void iommu_disable_translation(st
+@@ -738,6 +761,9 @@ static void iommu_disable_translation(st
u32 sts;
unsigned long flags;
@@ -295,7 +338,7 @@
spin_lock_irqsave(&iommu->register_lock, flags);
sts = dmar_readl(iommu->reg, DMAR_GSTS_REG);
dmar_writel(iommu->reg, DMAR_GCMD_REG, sts & (~DMA_GCMD_TE));
-@@ -722,6 +772,9 @@ static void iommu_disable_translation(st
+@@ -746,6 +772,9 @@ static void iommu_disable_translation(st
IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG, dmar_readl,
!(sts & DMA_GSTS_TES), sts);
spin_unlock_irqrestore(&iommu->register_lock, flags);
@@ -305,7 +348,7 @@
}
enum faulttype {
-@@ -1065,6 +1118,7 @@ int __init iommu_alloc(struct acpi_drhd_
+@@ -1089,6 +1118,7 @@ int __init iommu_alloc(struct acpi_drhd_
xfree(iommu);
return -ENOMEM;
}
@@ -313,21 +356,7 @@
iommu->reg = map_to_nocache_virt(nr_iommus, drhd->address);
iommu->index = nr_iommus++;
-@@ -1178,7 +1232,6 @@ static int intel_iommu_domain_init(struc
-
- static void intel_iommu_dom0_init(struct domain *d)
- {
-- struct iommu *iommu;
- struct acpi_drhd_unit *drhd;
-
- if ( !iommu_passthrough && !need_iommu(d) )
-@@ -1194,12 +1247,11 @@ static void intel_iommu_dom0_init(struct
-
- for_each_drhd_unit ( drhd )
- {
-- iommu = drhd->iommu;
-- iommu_enable_translation(iommu);
-+ iommu_enable_translation(drhd);
+@@ -1221,7 +1251,7 @@ static void intel_iommu_dom0_init(struct
}
}
@@ -336,7 +365,7 @@
struct domain *domain,
struct iommu *iommu,
u8 bus, u8 devfn)
-@@ -1301,6 +1353,8 @@ static int domain_context_mapping_one(
+@@ -1324,6 +1354,8 @@ static int domain_context_mapping_one(
unmap_vtd_domain_page(context_entries);
@@ -345,7 +374,7 @@
return 0;
}
-@@ -1382,7 +1436,7 @@ static int domain_context_mapping(struct
+@@ -1398,7 +1430,7 @@ static int domain_context_mapping(struct
return ret;
}
@@ -354,7 +383,7 @@
struct domain *domain,
struct iommu *iommu,
u8 bus, u8 devfn)
-@@ -1430,6 +1484,8 @@ static int domain_context_unmap_one(
+@@ -1446,6 +1478,8 @@ static int domain_context_unmap_one(
spin_unlock(&iommu->lock);
unmap_vtd_domain_page(context_entries);
@@ -363,7 +392,7 @@
return 0;
}
-@@ -1928,19 +1984,6 @@ static void setup_dom0_rmrr(struct domai
+@@ -1945,19 +1979,6 @@ static void setup_dom0_rmrr(struct domai
spin_unlock(&pcidevs_lock);
}
@@ -383,7 +412,7 @@
int intel_vtd_setup(void)
{
struct acpi_drhd_unit *drhd;
-@@ -1949,7 +1992,7 @@ int intel_vtd_setup(void)
+@@ -1966,7 +1987,7 @@ int intel_vtd_setup(void)
if ( list_empty(&acpi_drhd_units) )
return -ENODEV;
@@ -392,19 +421,8 @@
irq_to_iommu = xmalloc_array(struct iommu*, nr_irqs);
BUG_ON(!irq_to_iommu);
-@@ -2164,7 +2207,7 @@ static void vtd_resume(void)
- (u32) iommu_state[i][DMAR_FEUADDR_REG]);
- spin_unlock_irqrestore(&iommu->register_lock, flags);
-
-- iommu_enable_translation(iommu);
-+ iommu_enable_translation(drhd);
- }
- }
-
-Index: xen-4.0.1-testing/xen/drivers/passthrough/vtd/iommu.h
-===================================================================
---- xen-4.0.1-testing.orig/xen/drivers/passthrough/vtd/iommu.h
-+++ xen-4.0.1-testing/xen/drivers/passthrough/vtd/iommu.h
+--- a/xen/drivers/passthrough/vtd/iommu.h
++++ b/xen/drivers/passthrough/vtd/iommu.h
@@ -501,6 +501,7 @@ struct intel_iommu {
struct qi_ctrl qi_ctrl;
struct ir_ctrl ir_ctrl;
@@ -413,11 +431,9 @@
};
#endif
-Index: xen-4.0.1-testing/xen/drivers/passthrough/vtd/quirks.c
-===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/xen/drivers/passthrough/vtd/quirks.c
-@@ -0,0 +1,262 @@
++++ b/xen/drivers/passthrough/vtd/quirks.c
+@@ -0,0 +1,263 @@
+/*
+ * Copyright (c) 2010, Intel Corporation.
+ *
@@ -672,6 +688,7 @@
+ case 0x00858086:
+ case 0x42388086:
+ case 0x422b8086:
++ case 0x422c8086:
+ map_me_phantom_function(domain, 22, map);
+ break;
+ default:
@@ -680,10 +697,8 @@
+
+ }
+}
-Index: xen-4.0.1-testing/xen/drivers/passthrough/vtd/vtd.h
-===================================================================
---- xen-4.0.1-testing.orig/xen/drivers/passthrough/vtd/vtd.h
-+++ xen-4.0.1-testing/xen/drivers/passthrough/vtd/vtd.h
+--- a/xen/drivers/passthrough/vtd/vtd.h
++++ b/xen/drivers/passthrough/vtd/vtd.h
@@ -23,6 +23,9 @@
#include
@@ -713,10 +728,8 @@
-void iommu_free(struct acpi_drhd_unit *drhd);
-
#endif // _VTD_H_
-Index: xen-4.0.1-testing/xen/drivers/passthrough/vtd/x86/vtd.c
-===================================================================
---- xen-4.0.1-testing.orig/xen/drivers/passthrough/vtd/x86/vtd.c
-+++ xen-4.0.1-testing/xen/drivers/passthrough/vtd/x86/vtd.c
+--- a/xen/drivers/passthrough/vtd/x86/vtd.c
++++ b/xen/drivers/passthrough/vtd/x86/vtd.c
@@ -27,6 +27,7 @@
#include "../iommu.h"
#include "../dmar.h"
@@ -725,10 +738,8 @@
/*
* iommu_inclusive_mapping: when set, all memory below 4GB is included in dom0
-Index: xen-4.0.1-testing/xen/include/asm-x86/fixmap.h
-===================================================================
---- xen-4.0.1-testing.orig/xen/include/asm-x86/fixmap.h
-+++ xen-4.0.1-testing/xen/include/asm-x86/fixmap.h
+--- a/xen/include/asm-x86/fixmap.h
++++ b/xen/include/asm-x86/fixmap.h
@@ -52,6 +52,7 @@ enum fixed_addresses {
FIX_MSIX_IO_RESERV_BASE,
FIX_MSIX_IO_RESERV_END = FIX_MSIX_IO_RESERV_BASE + FIX_MSIX_MAX_PAGES -1,
++++++ 22369-xend-pci-passthru-fix.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -38,10 +38,11 @@
Signed-off-by: Jim Fehlig
-diff -r 28a160746815 -r 461b9d3a643a tools/python/xen/util/pci.py
---- a/tools/python/xen/util/pci.py Wed Oct 27 12:24:28 2010 +0100
-+++ b/tools/python/xen/util/pci.py Thu Oct 28 15:27:09 2010 -0600
-@@ -240,10 +240,16 @@
+Index: xen-4.0.2-testing/tools/python/xen/util/pci.py
+===================================================================
+--- xen-4.0.2-testing.orig/tools/python/xen/util/pci.py
++++ xen-4.0.2-testing/tools/python/xen/util/pci.py
+@@ -240,10 +240,16 @@ def pci_convert_sxp_to_dict(dev_sxp):
pci_dev_info = dict(pci_dev[1:])
if 'opts' in pci_dev_info:
pci_dev_info['opts'] = pci_opts_list_from_sxp(pci_dev)
++++++ 22388-x2apic-panic.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -16,9 +16,11 @@
Signed-off-by: Weidong Han
---- a/xen/arch/x86/apic.c
-+++ b/xen/arch/x86/apic.c
-@@ -1000,22 +1000,11 @@ static void enable_bsp_x2apic(void)
+Index: xen-4.0.2-testing/xen/arch/x86/apic.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/apic.c
++++ xen-4.0.2-testing/xen/arch/x86/apic.c
+@@ -1001,22 +1001,11 @@ static void enable_bsp_x2apic(void)
}
else
{
++++++ 22417-vpmu-nehalem.patch -> 22408-vpmu-nehalem.patch ++++++
--- xen/22417-vpmu-nehalem.patch 2010-12-01 00:18:53.000000000 +0100
+++ /mounts/work_src_done/STABLE/xen/22408-vpmu-nehalem.patch 2011-02-04 22:14:33.000000000 +0100
@@ -2,18 +2,6 @@
# HG changeset patch
# User Keir Fraser
-# Date 1290453394 0
-# Node ID c0c1f5f0745e25af6f8b4a1006637d98a8d63581
-# Parent 0cc4ed1ce1f34ce442ed4da106e555931c895395
-x86 hvm: Fix VPMU issue on Nehalem cpus
-
-Fix an issue on Nehalem cpus where performance counter overflows may
-lead to endless interrupt loops on this cpu.
-
-Signed-off-by: Dietmar Hahn
-
-# HG changeset patch
-# User Keir Fraser
# Date 1290173202 0
# Node ID b7ed352fa6100104374000cdbd845bbfc6478f08
# Parent 437576a0f2026ded6dcc4b11558714dad1d1d042
@@ -31,93 +19,3 @@
vpmu->arch_vpmu_ops = &core2_vpmu_ops;
break;
}
---- a/xen/arch/x86/hvm/vmx/vpmu_core2.c
-+++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c
-@@ -35,6 +35,68 @@
- #include
- #include
-
-+/*
-+ * QUIRK to workaround an issue on Nehalem processors currently seen
-+ * on family 6 cpus E5520 (model 26) and X7542 (model 46).
-+ * The issue leads to endless PMC interrupt loops on the processor.
-+ * If the interrupt handler is running and a pmc reaches the value 0, this
-+ * value remains forever and it triggers immediately a new interrupt after
-+ * finishing the handler.
-+ * A workaround is to read all flagged counters and if the value is 0 write
-+ * 1 (or another value != 0) into it.
-+ * There exist no errata and the real cause of this behaviour is unknown.
-+ */
-+bool_t __read_mostly is_pmc_quirk;
-+
-+static void check_pmc_quirk(void)
-+{
-+ u8 family = current_cpu_data.x86;
-+ u8 cpu_model = current_cpu_data.x86_model;
-+ is_pmc_quirk = 0;
-+ if ( family == 6 )
-+ {
-+ if ( cpu_model == 46 || cpu_model == 26 )
-+ is_pmc_quirk = 1;
-+ }
-+}
-+
-+static int core2_get_pmc_count(void);
-+static void handle_pmc_quirk(u64 msr_content)
-+{
-+ int num_gen_pmc = core2_get_pmc_count();
-+ int num_fix_pmc = 3;
-+ int i;
-+ u64 val;
-+
-+ if ( !is_pmc_quirk )
-+ return;
-+
-+ val = msr_content;
-+ for ( i = 0; i < num_gen_pmc; i++ )
-+ {
-+ if ( val & 0x1 )
-+ {
-+ u64 cnt;
-+ rdmsrl(MSR_P6_PERFCTR0 + i, cnt);
-+ if ( cnt == 0 )
-+ wrmsrl(MSR_P6_PERFCTR0 + i, 1);
-+ }
-+ val >>= 1;
-+ }
-+ val = msr_content >> 32;
-+ for ( i = 0; i < num_fix_pmc; i++ )
-+ {
-+ if ( val & 0x1 )
-+ {
-+ u64 cnt;
-+ rdmsrl(MSR_CORE_PERF_FIXED_CTR0 + i, cnt);
-+ if ( cnt == 0 )
-+ wrmsrl(MSR_CORE_PERF_FIXED_CTR0 + i, 1);
-+ }
-+ val >>= 1;
-+ }
-+}
-+
- u32 core2_counters_msr[] = {
- MSR_CORE_PERF_FIXED_CTR0,
- MSR_CORE_PERF_FIXED_CTR1,
-@@ -497,6 +559,10 @@ static int core2_vpmu_do_interrupt(struc
- rdmsrl(MSR_CORE_PERF_GLOBAL_STATUS, msr_content);
- if ( !msr_content )
- return 0;
-+
-+ if ( is_pmc_quirk )
-+ handle_pmc_quirk(msr_content);
-+
- core2_vpmu_cxt->global_ovf_status |= msr_content;
- msr_content = 0xC000000700000000 | ((1 << core2_get_pmc_count()) - 1);
- wrmsrl(MSR_CORE_PERF_GLOBAL_OVF_CTRL, msr_content);
-@@ -518,6 +584,7 @@ static int core2_vpmu_do_interrupt(struc
-
- static void core2_vpmu_initialise(struct vcpu *v)
- {
-+ check_pmc_quirk();
- }
-
- static void core2_vpmu_destroy(struct vcpu *v)
++++++ 22431-p2m-remove-bug-check.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -9,8 +9,10 @@
Signed-off-by: Tim Deegan
---- a/xen/arch/x86/mm/p2m.c
-+++ b/xen/arch/x86/mm/p2m.c
+Index: xen-4.0.2-testing/xen/arch/x86/mm/p2m.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/mm/p2m.c
++++ xen-4.0.2-testing/xen/arch/x86/mm/p2m.c
@@ -2186,9 +2186,6 @@ guest_physmap_add_entry(struct domain *d
P2M_DEBUG("aliased! mfn=%#lx, old gfn=%#lx, new gfn=%#lx\n",
mfn + i, ogfn, gfn + i);
++++++ 22475-x2apic-cleanup.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -8,9 +8,11 @@
Signed-off-by: Keir Fraser
---- a/xen/arch/x86/apic.c
-+++ b/xen/arch/x86/apic.c
-@@ -67,12 +67,12 @@ static int enable_local_apic __initdata
+Index: xen-4.0.2-testing/xen/arch/x86/apic.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/apic.c
++++ xen-4.0.2-testing/xen/arch/x86/apic.c
+@@ -67,12 +67,12 @@ static int enable_local_apic __initdata
*/
int apic_verbosity;
@@ -26,7 +28,7 @@
/*
* The following vectors are part of the Linux architecture, there
* is no hardware IRQ pin equivalent for them, they are triggered
-@@ -944,30 +944,24 @@ no_apic:
+@@ -945,30 +945,24 @@ no_apic:
return -1;
}
@@ -68,7 +70,7 @@
{
/*
* Interrupt remapping should be also enabled by BIOS when
-@@ -977,39 +971,33 @@ static void enable_bsp_x2apic(void)
+@@ -978,39 +972,33 @@ static void enable_bsp_x2apic(void)
if ( !intremap_enabled() )
panic("Interrupt remapping is not enabled by BIOS while "
"x2APIC is already enabled by BIOS!\n");
@@ -125,7 +127,7 @@
{
printk("Allocate ioapic_entries failed\n");
goto out;
-@@ -1031,13 +1019,13 @@ static void enable_bsp_x2apic(void)
+@@ -1032,13 +1020,13 @@ static void enable_bsp_x2apic(void)
goto restore_out;
}
@@ -142,7 +144,7 @@
}
restore_out:
-@@ -1049,24 +1037,6 @@ out:
+@@ -1050,24 +1038,6 @@ out:
free_ioapic_entries(ioapic_entries);
}
@@ -167,8 +169,10 @@
void __init init_apic_mappings(void)
{
unsigned long apic_phys;
---- a/xen/arch/x86/cpu/common.c
-+++ b/xen/arch/x86/cpu/common.c
+Index: xen-4.0.2-testing/xen/arch/x86/cpu/common.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/cpu/common.c
++++ xen-4.0.2-testing/xen/arch/x86/cpu/common.c
@@ -250,8 +250,8 @@ static void __init early_cpu_detect(void
c->x86 = 4;
@@ -194,8 +198,10 @@
}
}
---- a/xen/arch/x86/genapic/x2apic.c
-+++ b/xen/arch/x86/genapic/x2apic.c
+Index: xen-4.0.2-testing/xen/arch/x86/genapic/x2apic.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/genapic/x2apic.c
++++ xen-4.0.2-testing/xen/arch/x86/genapic/x2apic.c
@@ -23,89 +23,44 @@
#include
#include
@@ -305,7 +311,7 @@
{
unsigned int cpu, cfg;
unsigned long flags;
-@@ -148,3 +103,34 @@ void send_IPI_mask_x2apic_cluster(const
+@@ -148,3 +103,34 @@ void send_IPI_mask_x2apic_cluster(const
local_irq_restore(flags);
}
@@ -340,8 +346,10 @@
+{
+ return x2apic_phys ? &apic_x2apic_phys : &apic_x2apic_cluster;
+}
---- a/xen/arch/x86/setup.c
-+++ b/xen/arch/x86/setup.c
+Index: xen-4.0.2-testing/xen/arch/x86/setup.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/setup.c
++++ xen-4.0.2-testing/xen/arch/x86/setup.c
@@ -1006,9 +1006,6 @@ void __init __start_xen(unsigned long mb
tboot_probe();
@@ -362,8 +370,10 @@
percpu_free_unused_areas();
---- a/xen/arch/x86/smpboot.c
-+++ b/xen/arch/x86/smpboot.c
+Index: xen-4.0.2-testing/xen/arch/x86/smpboot.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/smpboot.c
++++ xen-4.0.2-testing/xen/arch/x86/smpboot.c
@@ -325,8 +325,7 @@ void __devinit smp_callin(void)
*/
wait_for_init_deassert(&init_deasserted);
@@ -374,8 +384,10 @@
/*
* (This works even if the APIC is not enabled.)
---- a/xen/drivers/passthrough/vtd/intremap.c
-+++ b/xen/drivers/passthrough/vtd/intremap.c
+Index: xen-4.0.2-testing/xen/drivers/passthrough/vtd/intremap.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/drivers/passthrough/vtd/intremap.c
++++ xen-4.0.2-testing/xen/drivers/passthrough/vtd/intremap.c
@@ -129,15 +129,10 @@ int iommu_supports_eim(void)
struct acpi_drhd_unit *drhd;
int apic;
@@ -394,8 +406,10 @@
/* We MUST have a DRHD unit for each IOAPIC. */
for ( apic = 0; apic < nr_ioapics; apic++ )
if ( !ioapic_to_drhd(IO_APIC_ID(apic)) )
---- a/xen/include/asm-x86/apic.h
-+++ b/xen/include/asm-x86/apic.h
+Index: xen-4.0.2-testing/xen/include/asm-x86/apic.h
+===================================================================
+--- xen-4.0.2-testing.orig/xen/include/asm-x86/apic.h
++++ xen-4.0.2-testing/xen/include/asm-x86/apic.h
@@ -25,21 +25,8 @@ extern int apic_verbosity;
extern int x2apic_enabled;
extern int directed_eoi_enabled;
@@ -420,9 +434,11 @@
/*
* Define the default level of output to be very little
---- a/xen/include/asm-x86/genapic.h
-+++ b/xen/include/asm-x86/genapic.h
-@@ -49,8 +49,6 @@ struct genapic {
+Index: xen-4.0.2-testing/xen/include/asm-x86/genapic.h
+===================================================================
+--- xen-4.0.2-testing.orig/xen/include/asm-x86/genapic.h
++++ xen-4.0.2-testing/xen/include/asm-x86/genapic.h
+@@ -49,8 +49,6 @@ struct genapic {
APICFUNC(acpi_madt_oem_check)
extern const struct genapic *genapic;
++++++ 22484-vlapic-tmcct-periodic.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -7,8 +7,10 @@
Signed-off-by: Keir Fraser
---- a/xen/arch/x86/hvm/vlapic.c
-+++ b/xen/arch/x86/hvm/vlapic.c
+Index: xen-4.0.2-testing/xen/arch/x86/hvm/vlapic.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/hvm/vlapic.c
++++ xen-4.0.2-testing/xen/arch/x86/hvm/vlapic.c
@@ -428,12 +428,19 @@ int vlapic_ipi(
static uint32_t vlapic_get_tmcct(struct vlapic *vlapic)
{
++++++ 22504-iommu-dom0-holes.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -19,6 +19,17 @@
Signed-off-by: Jan Beulich
+--- a/xen/arch/x86/domain_build.c
++++ b/xen/arch/x86/domain_build.c
+@@ -194,7 +194,7 @@ static unsigned long __init compute_dom0
+ unsigned int s;
+
+ for ( s = 9; s < BITS_PER_LONG; s += 9 )
+- avail -= max_page >> s;
++ avail -= max_pdx >> s;
+ }
+
+ /*
--- a/xen/drivers/passthrough/amd/pci_amd_iommu.c
+++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c
@@ -239,8 +239,16 @@ static void amd_iommu_dom0_init(struct d
++++++ 22526-ept-get-entry-no-lock.patch ++++++
# HG changeset patch
# User Keir Fraser
# Date 1292410025 0
# Node ID 7a5ee380041707177ca9c78e800095d1f5f3d373
# Parent 01f3b350902385627d1fa9e8cd1c231953e7610c
ept: Remove lock in ept_get_entry, replace with access-once semantics.
This mirrors the RVI/shadow situation, where p2m read access is
lockless because it's done in the hardware (linear map of the p2m
table).
This fixes the original bug (call it bug A) without introducing bug B
(a deadlock).
Bug A was caused by a race when updating p2m entries: between testing
if it's valid, and testing if it's populate-on-demand, it may have
been changed from populate-on-demand to valid.
My original patch simply introduced a lock into ept_get_entry, but
that caused bug B, caused by circular locking order: p2m_change_type
[grabs p2m lock] -> set_p2m_entry -> ept_set_entry ->
ept_set_middle_level -> p2m_alloc [grabs hap lock] write cr4 ->
hap_update_paging_modes [grabes hap lock] -> hap_update_cr3 ->
gfn_to_mfn -> ept_get_entry -> [grabs p2m lock]
Signed-off-by: George Dunlap
--- a/xen/arch/x86/mm/hap/p2m-ept.c
+++ b/xen/arch/x86/mm/hap/p2m-ept.c
@@ -395,10 +395,6 @@ static mfn_t ept_get_entry(struct domain
int i;
int ret = 0;
mfn_t mfn = _mfn(INVALID_MFN);
- int do_locking = !p2m_locked_by_me(d->arch.p2m);
-
- if ( do_locking )
- p2m_lock(d->arch.p2m);
*t = p2m_mmio_dm;
@@ -476,8 +472,6 @@ static mfn_t ept_get_entry(struct domain
}
out:
- if ( do_locking )
- p2m_unlock(d->arch.p2m);
unmap_domain_page(table);
return mfn;
}
++++++ 22533-x86-32bit-apicid.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -21,8 +21,10 @@
Signed-off-by: Jan Beulich
---- a/xen/arch/x86/acpi/cpu_idle.c
-+++ b/xen/arch/x86/acpi/cpu_idle.c
+Index: xen-4.0.2-testing/xen/arch/x86/acpi/cpu_idle.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/acpi/cpu_idle.c
++++ xen-4.0.2-testing/xen/arch/x86/acpi/cpu_idle.c
@@ -742,7 +742,7 @@ static void set_cx(
int get_cpu_id(u8 acpi_id)
{
@@ -32,9 +34,11 @@
apic_id = x86_acpiid_to_apicid[acpi_id];
if ( apic_id == 0xff )
---- a/xen/arch/x86/mpparse.c
-+++ b/xen/arch/x86/mpparse.c
-@@ -99,7 +99,8 @@ static int mpc_record;
+Index: xen-4.0.2-testing/xen/arch/x86/mpparse.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/mpparse.c
++++ xen-4.0.2-testing/xen/arch/x86/mpparse.c
+@@ -99,7 +99,8 @@ static int mpc_record;
static struct mpc_config_translation *translation_table[MAX_MPC_ENTRY] __initdata;
/* Return xen's logical cpu_id of the new added cpu or <0 if error */
@@ -105,8 +109,10 @@
}
void mp_unregister_lapic(uint32_t apic_id, uint32_t cpu)
---- a/xen/common/sched_sedf.c
-+++ b/xen/common/sched_sedf.c
+Index: xen-4.0.2-testing/xen/common/sched_sedf.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/common/sched_sedf.c
++++ xen-4.0.2-testing/xen/common/sched_sedf.c
@@ -124,7 +124,6 @@ struct sedf_cpu_info {
#define PERIOD_BEGIN(inf) ((inf)->deadl_abs - (inf)->period)
@@ -115,8 +121,10 @@
#define DIV_UP(x,y) (((x) + (y) - 1) / y)
#define extra_runs(inf) ((inf->status) & 6)
---- a/xen/include/asm-x86/mach-generic/mach_apic.h
-+++ b/xen/include/asm-x86/mach-generic/mach_apic.h
+Index: xen-4.0.2-testing/xen/include/asm-x86/mach-generic/mach_apic.h
+===================================================================
+--- xen-4.0.2-testing.orig/xen/include/asm-x86/mach-generic/mach_apic.h
++++ xen-4.0.2-testing/xen/include/asm-x86/mach-generic/mach_apic.h
@@ -26,15 +26,15 @@ static inline void enable_apic_mode(void
extern u32 bios_cpu_apicid[];
@@ -136,8 +144,10 @@
}
static inline void setup_portio_remap(void)
---- a/xen/include/asm-x86/mpspec_def.h
-+++ b/xen/include/asm-x86/mpspec_def.h
+Index: xen-4.0.2-testing/xen/include/asm-x86/mpspec_def.h
+===================================================================
+--- xen-4.0.2-testing.orig/xen/include/asm-x86/mpspec_def.h
++++ xen-4.0.2-testing/xen/include/asm-x86/mpspec_def.h
@@ -14,7 +14,7 @@
#define SMP_MAGIC_IDENT (('_'<<24)|('P'<<16)|('M'<<8)|'_')
@@ -147,8 +157,10 @@
struct intel_mp_floating
{
---- a/xen/include/xen/kernel.h
-+++ b/xen/include/xen/kernel.h
+Index: xen-4.0.2-testing/xen/include/xen/kernel.h
+===================================================================
+--- xen-4.0.2-testing.orig/xen/include/xen/kernel.h
++++ xen-4.0.2-testing/xen/include/xen/kernel.h
@@ -33,6 +33,13 @@
#define max_t(type,x,y) \
({ type __x = (x); type __y = (y); __x > __y ? __x: __y; })
++++++ 22534-x86-max-local-apic.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -24,8 +24,10 @@
Signed-off-by: Jan Beulich
---- a/xen/arch/x86/acpi/boot.c
-+++ b/xen/arch/x86/acpi/boot.c
+Index: xen-4.0.2-testing/xen/arch/x86/acpi/boot.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/acpi/boot.c
++++ xen-4.0.2-testing/xen/arch/x86/acpi/boot.c
@@ -82,7 +82,7 @@ u8 acpi_enable_value, acpi_disable_value
#endif
@@ -59,8 +61,10 @@
- return 0xff;
+ return INVALID_ACPIID;
}
---- a/xen/arch/x86/acpi/cpu_idle.c
-+++ b/xen/arch/x86/acpi/cpu_idle.c
+Index: xen-4.0.2-testing/xen/arch/x86/acpi/cpu_idle.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/acpi/cpu_idle.c
++++ xen-4.0.2-testing/xen/arch/x86/acpi/cpu_idle.c
@@ -745,7 +745,7 @@ int get_cpu_id(u8 acpi_id)
u32 apic_id;
@@ -70,8 +74,10 @@
return -1;
for ( i = 0; i < NR_CPUS; i++ )
---- a/xen/arch/x86/smpboot.c
-+++ b/xen/arch/x86/smpboot.c
+Index: xen-4.0.2-testing/xen/arch/x86/smpboot.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/smpboot.c
++++ xen-4.0.2-testing/xen/arch/x86/smpboot.c
@@ -96,7 +96,7 @@ struct cpuinfo_x86 cpu_data[NR_CPUS];
EXPORT_SYMBOL(cpu_data);
@@ -99,8 +105,10 @@
mp_unregister_lapic(apic_id, cpu);
spin_unlock(&cpu_add_remove_lock);
return node;
---- a/xen/include/asm-x86/acpi.h
-+++ b/xen/include/asm-x86/acpi.h
+Index: xen-4.0.2-testing/xen/include/asm-x86/acpi.h
+===================================================================
+--- xen-4.0.2-testing.orig/xen/include/asm-x86/acpi.h
++++ xen-4.0.2-testing/xen/include/asm-x86/acpi.h
@@ -150,9 +150,11 @@ struct acpi_sleep_info {
#endif /* CONFIG_ACPI_SLEEP */
@@ -115,8 +123,10 @@
extern u32 pmtmr_ioport;
---- a/xen/include/asm-x86/numa.h
-+++ b/xen/include/asm-x86/numa.h
+Index: xen-4.0.2-testing/xen/include/asm-x86/numa.h
+===================================================================
+--- xen-4.0.2-testing.orig/xen/include/asm-x86/numa.h
++++ xen-4.0.2-testing/xen/include/asm-x86/numa.h
@@ -39,7 +39,7 @@ extern int setup_node(int pxm);
extern void srat_detect_node(int cpu);
@@ -126,8 +136,10 @@
#ifdef CONFIG_NUMA
extern void __init init_cpu_to_node(void);
---- a/xen/include/public/vcpu.h
-+++ b/xen/include/public/vcpu.h
+Index: xen-4.0.2-testing/xen/include/public/vcpu.h
+===================================================================
+--- xen-4.0.2-testing.orig/xen/include/public/vcpu.h
++++ xen-4.0.2-testing/xen/include/public/vcpu.h
@@ -187,8 +187,7 @@ DEFINE_XEN_GUEST_HANDLE(vcpu_register_vc
/*
* Get the physical ID information for a pinned vcpu's underlying physical
++++++ 22535-x2apic-preenabled.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -15,9 +15,11 @@
Signed-off-by: Jan Beulich
---- a/xen/arch/x86/apic.c
-+++ b/xen/arch/x86/apic.c
-@@ -963,15 +963,6 @@ void x2apic_setup(void)
+Index: xen-4.0.2-testing/xen/arch/x86/apic.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/apic.c
++++ xen-4.0.2-testing/xen/arch/x86/apic.c
+@@ -964,15 +964,6 @@ void x2apic_setup(void)
rdmsr(MSR_IA32_APICBASE, lo, hi);
if ( lo & MSR_IA32_APICBASE_EXTD )
{
@@ -33,7 +35,7 @@
printk("x2APIC mode is already enabled by BIOS.\n");
x2apic_enabled = 1;
}
-@@ -1014,6 +1005,10 @@ void x2apic_setup(void)
+@@ -1015,6 +1006,10 @@ void x2apic_setup(void)
if ( iommu_enable_IR() )
{
@@ -44,9 +46,11 @@
printk("Would not enable x2APIC due to interrupt remapping "
"cannot be enabled.\n");
goto restore_out;
---- a/xen/drivers/passthrough/vtd/intremap.c
-+++ b/xen/drivers/passthrough/vtd/intremap.c
-@@ -884,23 +884,3 @@ void iommu_disable_IR(void)
+Index: xen-4.0.2-testing/xen/drivers/passthrough/vtd/intremap.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/drivers/passthrough/vtd/intremap.c
++++ xen-4.0.2-testing/xen/drivers/passthrough/vtd/intremap.c
+@@ -892,23 +892,3 @@ void iommu_disable_IR(void)
for_each_drhd_unit ( drhd )
disable_qinval(drhd->iommu);
}
@@ -70,8 +74,10 @@
-
- return 1;
-}
---- a/xen/include/xen/iommu.h
-+++ b/xen/include/xen/iommu.h
+Index: xen-4.0.2-testing/xen/include/xen/iommu.h
+===================================================================
+--- xen-4.0.2-testing.orig/xen/include/xen/iommu.h
++++ xen-4.0.2-testing/xen/include/xen/iommu.h
@@ -62,7 +62,6 @@ int iommu_setup(void);
int iommu_supports_eim(void);
int iommu_enable_IR(void);
++++++ 22645-amd-flush-filter.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -11,8 +11,10 @@
Signed-off-by: Keir Fraser
---- a/xen/arch/x86/cpu/amd.c
-+++ b/xen/arch/x86/cpu/amd.c
+Index: xen-4.0.2-testing/xen/arch/x86/cpu/amd.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/cpu/amd.c
++++ xen-4.0.2-testing/xen/arch/x86/cpu/amd.c
@@ -237,20 +237,6 @@ int cpu_has_amd_erratum(const struct cpu
return 0;
}
++++++ 22693-fam10-mmio-conf-base-protect.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -19,9 +19,11 @@
Signed-off-by: Jan Beulich
---- a/xen/arch/x86/traps.c
-+++ b/xen/arch/x86/traps.c
-@@ -1704,6 +1704,10 @@ static int is_cpufreq_controller(struct
+Index: xen-4.0.2-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
+@@ -1716,6 +1716,10 @@ static int is_cpufreq_controller(struct
(d->domain_id == 0));
}
@@ -32,7 +34,7 @@
static int emulate_privileged_op(struct cpu_user_regs *regs)
{
struct vcpu *v = current;
-@@ -2263,7 +2267,13 @@ static int emulate_privileged_op(struct
+@@ -2275,7 +2279,13 @@ static int emulate_privileged_op(struct
goto fail;
if ( !IS_PRIV(v->domain) )
break;
@@ -47,8 +49,10 @@
(((((u64)h << 32) | l) ^ val) &
~( FAM10H_MMIO_CONF_ENABLE |
(FAM10H_MMIO_CONF_BUSRANGE_MASK <<
---- a/xen/arch/x86/x86_64/mmconfig.h
-+++ b/xen/arch/x86/x86_64/mmconfig.h
+Index: xen-4.0.2-testing/xen/arch/x86/x86_64/mmconfig.h
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/x86_64/mmconfig.h
++++ xen-4.0.2-testing/xen/arch/x86/x86_64/mmconfig.h
@@ -34,6 +34,8 @@
#define PCI_VENDOR_ID_NVIDIA 0x10de
@@ -58,8 +62,10 @@
/*
* AMD Fam10h CPUs are buggy, and cannot access MMIO config space
* on their northbrige except through the * %eax register. As such, you MUST
---- a/xen/arch/x86/x86_64/mmconfig-shared.c
-+++ b/xen/arch/x86/x86_64/mmconfig-shared.c
+Index: xen-4.0.2-testing/xen/arch/x86/x86_64/mmconfig-shared.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/x86_64/mmconfig-shared.c
++++ xen-4.0.2-testing/xen/arch/x86/x86_64/mmconfig-shared.c
@@ -24,7 +24,7 @@
#include "mmconfig.h"
++++++ 22694-x86_64-no-weak.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -22,8 +22,10 @@
Signed-off-by: Keir Fraser
---- a/xen/drivers/acpi/numa.c
-+++ b/xen/drivers/acpi/numa.c
+Index: xen-4.0.2-testing/xen/drivers/acpi/numa.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/drivers/acpi/numa.c
++++ xen-4.0.2-testing/xen/drivers/acpi/numa.c
@@ -120,14 +120,15 @@ static int __init acpi_parse_slit(struct
return 0;
}
++++++ 22707-x2apic-preenabled-check.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -17,9 +17,11 @@
Signed-off-by: Jan Beulich
---- a/xen/arch/x86/apic.c
-+++ b/xen/arch/x86/apic.c
-@@ -947,7 +947,6 @@ no_apic:
+Index: xen-4.0.2-testing/xen/arch/x86/apic.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/apic.c
++++ xen-4.0.2-testing/xen/arch/x86/apic.c
+@@ -948,7 +948,6 @@ no_apic:
void x2apic_setup(void)
{
struct IO_APIC_route_entry **ioapic_entries = NULL;
@@ -27,7 +29,7 @@
if ( smp_processor_id() != 0 )
{
-@@ -959,14 +958,6 @@ void x2apic_setup(void)
+@@ -960,14 +959,6 @@ void x2apic_setup(void)
if ( !cpu_has_x2apic )
return;
@@ -42,8 +44,10 @@
if ( !opt_x2apic )
{
if ( !x2apic_enabled )
---- a/xen/arch/x86/genapic/probe.c
-+++ b/xen/arch/x86/genapic/probe.c
+Index: xen-4.0.2-testing/xen/arch/x86/genapic/probe.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/genapic/probe.c
++++ xen-4.0.2-testing/xen/arch/x86/genapic/probe.c
@@ -59,8 +59,10 @@ custom_param("apic", genapic_apic_force)
void __init generic_apic_probe(void)
@@ -57,8 +61,10 @@
for (i = 0; !changed && apic_probe[i]; i++) {
if (apic_probe[i]->probe()) {
---- a/xen/arch/x86/genapic/x2apic.c
-+++ b/xen/arch/x86/genapic/x2apic.c
+Index: xen-4.0.2-testing/xen/arch/x86/genapic/x2apic.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/genapic/x2apic.c
++++ xen-4.0.2-testing/xen/arch/x86/genapic/x2apic.c
@@ -20,6 +20,8 @@
#include
#include
@@ -89,8 +95,10 @@
+ genapic = apic_x2apic_probe();
+ }
+}
---- a/xen/include/asm-x86/apic.h
-+++ b/xen/include/asm-x86/apic.h
+Index: xen-4.0.2-testing/xen/include/asm-x86/apic.h
+===================================================================
+--- xen-4.0.2-testing.orig/xen/include/asm-x86/apic.h
++++ xen-4.0.2-testing/xen/include/asm-x86/apic.h
@@ -25,6 +25,7 @@ extern int apic_verbosity;
extern int x2apic_enabled;
extern int directed_eoi_enabled;
++++++ 22708-xenctx-misc.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -12,8 +12,10 @@
Signed-off-by: Jan Beulich
---- a/tools/xentrace/xenctx.c
-+++ b/tools/xentrace/xenctx.c
+Index: xen-4.0.2-testing/tools/xentrace/xenctx.c
+===================================================================
+--- xen-4.0.2-testing.orig/tools/xentrace/xenctx.c
++++ xen-4.0.2-testing/tools/xentrace/xenctx.c
@@ -19,6 +19,7 @@
#include
#include
@@ -30,7 +32,7 @@
char *name;
struct symbol *next;
} *symbol_table = NULL;
-@@ -112,12 +112,12 @@ static void insert_symbol(struct symbol
+@@ -112,12 +112,12 @@ static void insert_symbol(struct symbol
/* The System.map is usually already sorted... */
if (prev
++++++ 22744-ept-pod-locking.patch ++++++
# HG changeset patch
# User Tim Deegan
# Date 1294933573 0
# Node ID b01ef59c8c805df751a8f6ae63cdd5c6a4565255
# Parent 54e91dcae649e23fd267d7afe623fbd52b1b4283
x86/mm: fix EPT PoD locking to match the normal p2m case.
This recursive-locking bug was fixed in the main p2m code in
20269:fd3d5d66c446 (in October 2009) but has lurked unseen in
the EPT side since then. Copy the fix across.
Signed-off-by: Tim Deegan
Index: xen-4.0.2-testing/xen/arch/x86/mm/hap/p2m-ept.c
===================================================================
--- xen-4.0.2-testing.orig/xen/arch/x86/mm/hap/p2m-ept.c
+++ xen-4.0.2-testing/xen/arch/x86/mm/hap/p2m-ept.c
@@ -37,19 +37,26 @@ static int ept_pod_check_and_populate(st
ept_entry_t *entry, int order,
p2m_query_t q)
{
+ /* Only take the lock if we don't already have it. Otherwise it
+ * wouldn't be safe to do p2m lookups with the p2m lock held */
+ int do_locking = !p2m_locked_by_me(d->arch.p2m);
int r;
- p2m_lock(d->arch.p2m);
+
+ if ( do_locking )
+ p2m_lock(d->arch.p2m);
/* Check to make sure this is still PoD */
if ( entry->avail1 != p2m_populate_on_demand )
{
- p2m_unlock(d->arch.p2m);
+ if ( do_locking )
+ p2m_unlock(d->arch.p2m);
return 0;
}
r = p2m_pod_demand_populate(d, gfn, order, q);
- p2m_unlock(d->arch.p2m);
+ if ( do_locking )
+ p2m_unlock(d->arch.p2m);
return r;
}
++++++ 22223-vtd-workarounds.patch -> 22749-vtd-workarounds.patch ++++++
++++ 948 lines (skipped)
++++ between xen/22223-vtd-workarounds.patch
++++ and /mounts/work_src_done/STABLE/xen/22749-vtd-workarounds.patch
++++++ 22777-vtd-ats-fixes.patch ++++++
# HG changeset patch
# User Jan Beulich
# Date 1295353690 0
# Node ID 1e7594758b28706c2b72358598ecf632ddda247b
# Parent 78e2e5a50daa1702e3fd9dbceada700cdaefd511
VT-d/ATS: misc fixes
First of all there were three places potentially de-referencing NULL
(two after an allocation failure, and one after a failed lookup).
Second, if ATS_ENABLE was already set, the device would not have got
added to the ats_devices list, potentially resulting in
dev_invalidate_iotlb() doing an incomplete job.
Signed-off-by: Jan Beulich
Index: xen-4.0.2-testing/xen/drivers/passthrough/vtd/x86/ats.c
===================================================================
--- xen-4.0.2-testing.orig/xen/drivers/passthrough/vtd/x86/ats.c
+++ xen-4.0.2-testing/xen/drivers/passthrough/vtd/x86/ats.c
@@ -91,6 +91,9 @@ int ats_device(int seg, int bus, int dev
return 0;
pdev = pci_get_pdev(bus, devfn);
+ if ( !pdev )
+ return 0;
+
drhd = acpi_find_matched_drhd_unit(pdev);
if ( !drhd )
return 0;
@@ -108,6 +111,8 @@ int ats_device(int seg, int bus, int dev
if ( pos && (ats_drhd == NULL) )
{
new_drhd = xmalloc(struct acpi_drhd_unit);
+ if ( !new_drhd )
+ return 0;
memcpy(new_drhd, drhd, sizeof(struct acpi_drhd_unit));
list_add_tail(&new_drhd->list, &ats_dev_drhd_units);
}
@@ -116,9 +121,8 @@ int ats_device(int seg, int bus, int dev
int enable_ats_device(int seg, int bus, int devfn)
{
- struct pci_ats_dev *pdev;
+ struct pci_ats_dev *pdev = NULL;
u32 value;
- u16 queue_depth;
int pos;
if ( !acpi_find_matched_atsr_unit(bus, devfn) )
@@ -142,26 +146,43 @@ int enable_ats_device(int seg, int bus,
/* BUGBUG: add back seg when multi-seg platform support is enabled */
value = pci_conf_read16(bus, PCI_SLOT(devfn),
- PCI_FUNC(devfn), pos + ATS_REG_CAP);
- queue_depth = value & ATS_QUEUE_DEPTH_MASK;
-
- value = pci_conf_read16(bus, PCI_SLOT(devfn),
PCI_FUNC(devfn), pos + ATS_REG_CTL);
if ( value & ATS_ENABLE )
- return 0;
+ {
+ list_for_each_entry ( pdev, &ats_devices, list )
+ {
+ if ( pdev->bus == bus && pdev->devfn == devfn )
+ {
+ pos = 0;
+ break;
+ }
+ }
+ }
+ if ( pos )
+ pdev = xmalloc(struct pci_ats_dev);
+ if ( !pdev )
+ return -ENOMEM;
+
+ if ( !(value & ATS_ENABLE) )
+ {
+ value |= ATS_ENABLE;
+ pci_conf_write16(bus, PCI_SLOT(devfn), PCI_FUNC(devfn),
+ pos + ATS_REG_CTL, value);
+ }
+
+ if ( pos )
+ {
+ pdev->bus = bus;
+ pdev->devfn = devfn;
+ value = pci_conf_read16(bus, PCI_SLOT(devfn),
+ PCI_FUNC(devfn), pos + ATS_REG_CAP);
+ pdev->ats_queue_depth = value & ATS_QUEUE_DEPTH_MASK;
+ list_add(&pdev->list, &ats_devices);
+ }
- value |= ATS_ENABLE;
- pci_conf_write16(bus, PCI_SLOT(devfn), PCI_FUNC(devfn),
- pos + ATS_REG_CTL, value);
-
- pdev = xmalloc(struct pci_ats_dev);
- pdev->bus = bus;
- pdev->devfn = devfn;
- pdev->ats_queue_depth = queue_depth;
- list_add(&(pdev->list), &ats_devices);
if ( iommu_verbose )
- dprintk(XENLOG_INFO VTDPREFIX, "%x:%x.%x: ATS is enabled\n",
- bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
+ dprintk(XENLOG_INFO VTDPREFIX, "%x:%x.%x: ATS %s enabled\n",
+ bus, PCI_SLOT(devfn), PCI_FUNC(devfn), pos ? "is" : "was");
return pos;
}
++++++ 22781-pod-hap-logdirty.patch ++++++
# HG changeset patch
# User George Dunlap
# Date 1295274541 0
# Node ID 3decd02e0b18ae21fb926c6bad96a4cd02c48272
# Parent 97ab84aca65cdcbce2ddccc51629fb24adb056cf
PoD,hap: Fix logdirty mode when using hardware assisted paging
When writing a writable p2m entry for a pfn, we need to mark the pfn
dirty to avoid corruption when doing live migration.
Marking the page dirty exposes another issue, where there are
excessive sweeps for zero pages if there's a mismatch between PoD
entries and cache entries. Only sweep for zero pages if we actually
need more memory.
Signed-off-by: George Dunlap
Acked-by: Tim Deegan
Index: xen-4.0.2-testing/xen/arch/x86/mm/p2m.c
===================================================================
--- xen-4.0.2-testing.orig/xen/arch/x86/mm/p2m.c
+++ xen-4.0.2-testing/xen/arch/x86/mm/p2m.c
@@ -1064,14 +1064,22 @@ p2m_pod_demand_populate(struct domain *d
if ( unlikely(d->is_dying) )
goto out_fail;
- /* If we're low, start a sweep */
- if ( order == 9 && page_list_empty(&p2md->pod.super) )
- p2m_pod_emergency_sweep_super(d);
-
- if ( page_list_empty(&p2md->pod.single) &&
- ( ( order == 0 )
- || (order == 9 && page_list_empty(&p2md->pod.super) ) ) )
- p2m_pod_emergency_sweep(d);
+ /* Once we've ballooned down enough that we can fill the remaining
+ * PoD entries from the cache, don't sweep even if the particular
+ * list we want to use is empty: that can lead to thrashing zero pages
+ * through the cache for no good reason. */
+ if ( p2md->pod.entry_count > p2md->pod.count )
+ {
+
+ /* If we're low, start a sweep */
+ if ( order == 9 && page_list_empty(&p2md->pod.super) )
+ p2m_pod_emergency_sweep_super(d);
+
+ if ( page_list_empty(&p2md->pod.single) &&
+ ( ( order == 0 )
+ || (order == 9 && page_list_empty(&p2md->pod.super) ) ) )
+ p2m_pod_emergency_sweep(d);
+ }
/* Keep track of the highest gfn demand-populated by a guest fault */
if ( q == p2m_guest && gfn > p2md->pod.max_guest )
@@ -1098,7 +1106,10 @@ p2m_pod_demand_populate(struct domain *d
set_p2m_entry(d, gfn_aligned, mfn, order, p2m_ram_rw);
for( i = 0 ; i < (1UL << order) ; i++ )
+ {
set_gpfn_from_mfn(mfn_x(mfn) + i, gfn_aligned + i);
+ paging_mark_dirty(d, mfn_x(mfn) + i);
+ }
p2md->pod.entry_count -= (1 << order); /* Lock: p2m */
BUG_ON(p2md->pod.entry_count < 0);
++++++ 22789-i386-no-x2apic.patch ++++++
# HG changeset patch
# User Keir Fraser
# Date 1295625507 0
# Node ID 9bd5f65050f8014de7d0fcf9d89ed8c441f261fa
# Parent 5852612cd4c461e5219db73cc52de0c643c414e8
x86:x2apic: Disable x2apic on x86-32 permanently
x2apic initialization on x86_32 uses vcpu pointer before it is
initialized. As x2apic is unlikely to be used on x86_32, this patch
disables x2apic permanently on x86_32. It also asserts the sanity of
vcpu pointer before dereference to prevent further misuse.
Signed-off-by: Fengzhe Zhang
jb: Moved logic into check_x2apic_preenabled(), disabled dead code on
x86_32.
Index: xen-4.0.2-testing/xen/arch/x86/apic.c
===================================================================
--- xen-4.0.2-testing.orig/xen/arch/x86/apic.c
+++ xen-4.0.2-testing/xen/arch/x86/apic.c
@@ -959,6 +959,10 @@ void x2apic_setup(void)
if ( !cpu_has_x2apic )
return;
+#ifdef __i386__
+ BUG();
+#else
+
if ( !opt_x2apic )
{
if ( !x2apic_enabled )
@@ -1020,6 +1024,7 @@ restore_out:
unmask_8259A();
out:
+#endif /* !__i386__ */
if ( ioapic_entries )
free_ioapic_entries(ioapic_entries);
}
Index: xen-4.0.2-testing/xen/arch/x86/genapic/x2apic.c
===================================================================
--- xen-4.0.2-testing.orig/xen/arch/x86/genapic/x2apic.c
+++ xen-4.0.2-testing/xen/arch/x86/genapic/x2apic.c
@@ -25,6 +25,8 @@
#include
#include
+#ifndef __i386__
+
static int x2apic_phys; /* By default we use logical cluster mode. */
boolean_param("x2apic_phys", x2apic_phys);
@@ -137,6 +139,8 @@ const struct genapic *apic_x2apic_probe(
return x2apic_phys ? &apic_x2apic_phys : &apic_x2apic_cluster;
}
+#endif /* !__i386__ */
+
void __init check_x2apic_preenabled(void)
{
u32 lo, hi;
@@ -149,7 +153,19 @@ void __init check_x2apic_preenabled(void
if ( lo & MSR_IA32_APICBASE_EXTD )
{
printk("x2APIC mode is already enabled by BIOS.\n");
+#ifndef __i386__
x2apic_enabled = 1;
genapic = apic_x2apic_probe();
+#else
+ lo &= ~(MSR_IA32_APICBASE_ENABLE | MSR_IA32_APICBASE_EXTD);
+ wrmsr(MSR_IA32_APICBASE, lo, hi);
+ lo |= MSR_IA32_APICBASE_ENABLE;
+ wrmsr(MSR_IA32_APICBASE, lo, hi);
+ printk("x2APIC disabled permanently on x86_32.\n");
+#endif
}
+
+#ifdef __i386__
+ clear_bit(X86_FEATURE_X2APIC, boot_cpu_data.x86_capability);
+#endif
}
++++++ 22790-svm-resume-migrate-pirqs.patch ++++++
# HG changeset patch
# User Keir Fraser
# Date 1295625605 0
# Node ID 43592043cefc8357e6e6a0ab9ba85ca480968cb1
# Parent 9bd5f65050f8014de7d0fcf9d89ed8c441f261fa
svm: migrate pirq with vcpu
hvm_migrate_pirqs() is missing in svm_do_resume().
Signed-off-by: Wei Wang
Index: xen-4.0.2-testing/xen/arch/x86/hvm/svm/svm.c
===================================================================
--- xen-4.0.2-testing.orig/xen/arch/x86/hvm/svm/svm.c
+++ xen-4.0.2-testing/xen/arch/x86/hvm/svm/svm.c
@@ -704,7 +704,7 @@ static void svm_do_resume(struct vcpu *v
{
v->arch.hvm_svm.launch_core = smp_processor_id();
hvm_migrate_timers(v);
-
+ hvm_migrate_pirqs(v);
/* Migrating to another ASID domain. Request a new ASID. */
hvm_asid_flush_vcpu(v);
}
++++++ 32on64-extra-mem.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.1-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:
self.guest_bitsize = self.image.getBitSize()
++++++ 7410-qemu-alt-gr.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -20,10 +20,11 @@
committer: Ian Jackson
git-commit-id: f95d202ed6444dacb15fbea4dee185eb0e048d9a
-diff -r 080b5a094d4e -r f71a4c18e34e keymaps.c
---- a/tools/ioemu-qemu-xen/keymaps.c Wed Sep 08 16:38:09 2010 +0100
-+++ b//tools/ioemu-qemu-xen/keymaps.c Tue Sep 14 17:31:43 2010 +0100
-@@ -51,6 +51,7 @@
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/keymaps.c
+===================================================================
+--- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/keymaps.c
++++ xen-4.0.2-testing/tools/ioemu-qemu-xen/keymaps.c
+@@ -51,6 +51,7 @@ typedef struct {
struct key_range *numlock_range;
struct key_range *shift_range;
struct key_range *localstate_range;
@@ -31,20 +32,18 @@
} kbd_layout_t;
static void add_to_key_range(struct key_range **krp, int code) {
-@@ -133,7 +134,11 @@
+@@ -133,6 +134,10 @@ static kbd_layout_t *parse_keyboard_layo
add_to_key_range(&k->localstate_range, keycode);
//fprintf(stderr, "localstate keysym %04x keycode %d\n", keysym, keycode);
}
--
+ if (rest && strstr(rest, "altgr")) {
+ add_to_key_range(&k->altgr_range, keysym);
+ //fprintf(stderr, "altgr keysym %04x keycode %d\n", keysym, keycode);
+ }
-+
+
/* if(keycode&0x80)
keycode=(keycode<<8)^0x80e0; */
- if (keysym < MAX_NORMAL_KEYCODE) {
-@@ -233,3 +238,16 @@
+@@ -233,3 +238,16 @@ static inline int keycode_is_shiftable(v
return 0;
return 1;
}
@@ -61,10 +60,11 @@
+ return 0;
+}
+
-diff -r 080b5a094d4e -r f71a4c18e34e vnc.c
---- a/tools/ioemu-qemu-xen/vnc.c Wed Sep 08 16:38:09 2010 +0100
-+++ b/tools/ioemu-qemu-xen/vnc.c Tue Sep 14 17:31:43 2010 +0100
-@@ -1274,12 +1274,27 @@
+Index: xen-4.0.2-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
+@@ -1274,12 +1274,27 @@ static void press_key_shift_up(VncState
}
}
@@ -92,7 +92,7 @@
if (is_graphic_console()) {
if (sym >= 'A' && sym <= 'Z') {
-@@ -1289,8 +1304,11 @@
+@@ -1289,8 +1304,11 @@ static void do_key_event(VncState *vs, i
else {
shift = keysym_is_shift(vs->kbd_layout, sym & 0xFFFF);
}
@@ -104,7 +104,7 @@
keycode = keysym2scancode(vs->kbd_layout, sym & 0xFFFF);
if (keycode == 0) {
-@@ -1357,6 +1375,11 @@
+@@ -1357,6 +1375,11 @@ static void do_key_event(VncState *vs, i
}
if (is_graphic_console()) {
++++++ 7426-xenfb-depth.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xenfb.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xenfb.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xenfb.c
-+++ xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xenfb.c
+--- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/hw/xenfb.c
++++ xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xenfb.c
@@ -622,6 +622,18 @@ static void xenfb_guest_copy(struct XenF
oops = 1;
}
++++++ 7433-qemu-altgr.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -1,38 +1,97 @@
---- a/tools/ioemu-qemu-xen/keymaps.c Wed Jan 05 23:16:54 2011 +0000
-+++ b/tools/ioemu-qemu-xen/keymaps.c Wed Jan 05 23:48:36 2011 +0000
-@@ -53,6 +53,20 @@ typedef struct {
- struct key_range *localstate_range;
+# HG changeset patch
+# User Chun Yan Liu
+# Date 1294271316 0
+# Node ID a283996796c91dd29ecff444b78798e0ce902047
+# Parent 39df13908a3ad54e79dd3b53ed307e57f12f6d3d
+fix '|' key display problem in en-us with altgr processing
+
+Commit f95d202ed644 handles altgr-insert problem. Unfortunately, with
+that patch, there is a problem in En-us keyboard: '|' (bar) cannot be
+displayed. After checking keymap files, we found there are two
+definitions to "bar" in en-us: bar 0x56 altgr (in "common") bar 0x2b
+shift (in "en-us") First line is actually invalid in en-us
+lanuage. The 2nd definition will cover the 1st one.
+
+The previous change in didn't consider multi-definition case. It scans
+keymap files, if keysym needs altgr, it will records that, after that,
+if keysym is pressed but altgr not pressed, it will add an altgr press
+opeartion. It is correct if all keysyms are unique and valid. But in
+the above multi-definition case, there is problem: when reading bar
+0x56 altgr (in "common") it will record altgr needed, but in fact,
+that definition won't be used, it always use the 2nd definition and
+won't need altgr. Then if the keysym is pressed, the code will still
+add an altgr press operation, that will cause problem.
+
+So, if we cannot avoid multi-definition in keymap files, the altgr
+flag (whether altgr needed or not) should also be refreshed according
+to the 2nd defintion. In the above case, when reading the 1st line, it
+records altgr needed; then reading 2nd line, 2nd definition will cover
+the 1st, meanwhile the altgr flag should be reset (the 2nd definition
+doesn't need altgr, so altgr flag should be removed.)
+
+Following patch supplements f95d202ed644, and solve the
+problem.
+
+Signed-off-by: Chun Yan Liu
+Signed-off-by: Ian Jackson
+
+committer: Ian Jackson
+git-commit-id: 99d53fbb69d3e03be61ae10506a304a3d08d792f
+
+# HG changeset patch
+# User Jan Beulich
+# Date 1295287237 0
+# Node ID b47bf8f7a5e1959d6f5c62febaef9e81dc3231a0
+# Parent b6bbe8be0afa54774a19ef43767a029ebddb2666
+keymaps.c: fix use after free in del_key_range
+
+Commit 99d53fbb69d3e03be61ae10506a304a3d08d792f introduced this, and
+the compiler indirectly warned about it.
+
+The patch is only compile tested (I don't even know how to reproduce
+the original problem), but I suppose worth applying regardless.
+
+Signed-off-by: Jan Beulich
+Cc: Chun Yan Liu
+
+committer: Ian Jackson
+git-commit-id: fdb22f24bc8adb3455b771d804496e11b4570085
+
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/keymaps.c
+===================================================================
+--- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/keymaps.c
++++ xen-4.0.2-testing/tools/ioemu-qemu-xen/keymaps.c
+@@ -54,6 +54,17 @@ typedef struct {
struct key_range *altgr_range;
} kbd_layout_t;
-+
+
+static void del_key_range(struct key_range **krp, int code) {
+ struct key_range *kr;
-+ struct key_range *kr_pr;
-+ for (kr = *krp; kr; kr_pr = kr, kr = kr->next) {
++ while ((kr = *krp) != NULL) {
+ if (code >= kr->start && code <= kr->end) {
-+ if (kr == *krp)
-+ *krp = kr->next;
-+ else
-+ kr_pr->next = kr->next;
++ *krp = kr->next;
+ qemu_free(kr);
-+ }
++ } else
++ krp = &kr->next;
+ }
+}
-
++
static void add_to_key_range(struct key_range **krp, int code) {
struct key_range *kr;
-@@ -137,6 +151,8 @@ static kbd_layout_t *parse_keyboard_layo
+ for (kr = *krp; kr; kr = kr->next) {
+@@ -137,6 +148,8 @@ static kbd_layout_t *parse_keyboard_layo
if (rest && strstr(rest, "altgr")) {
add_to_key_range(&k->altgr_range, keysym);
//fprintf(stderr, "altgr keysym %04x keycode %d\n", keysym, keycode);
+ } else {
+ del_key_range(&k->altgr_range, keysym);
}
-
+
/* if(keycode&0x80)
-
---- a/tools/ioemu-qemu-xen/vnc.c Wed Jan 05 23:16:54 2011 +0000
-+++ b/tools/ioemu-qemu-xen/vnc.c Wed Jan 05 23:48:36 2011 +0000
+Index: xen-4.0.2-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
@@ -1279,11 +1279,9 @@ static void press_key_altgr_down(VncStat
kbd_put_keycode(0xe0);
if (down){
@@ -44,3 +103,4 @@
- vs->modifiers_state[0xb8] = 0;
}
}
+
++++++ 7434-qemu-rlimit-as.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -16,8 +16,10 @@
git-commit-id: 2aa36d470e97f4baa219f78df82e2d3fe3d9f96d
---- a/tools/ioemu-qemu-xen/vl.c
-+++ b/tools/ioemu-qemu-xen/vl.c
+Index: xen-4.0.2-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
@@ -4845,6 +4845,13 @@ int main(int argc, char **argv, char **e
rl.rlim_cur = rl.rlim_max;
if (setrlimit(RLIMIT_DATA, &rl) != 0)
++++++ altgr_2.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -29,10 +29,10 @@
Signed-off by Chunyan Liu (cyliu@novell.com)
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/vnc.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/vnc.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/vnc.c
-+++ xen-4.0.1-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
@@ -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.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -1,10 +1,10 @@
Subject: modify default read/write flag in bdrv_init.
Signed-off by Chunyan Liu
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/vl.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/vl.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/vl.c
-+++ xen-4.0.1-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
strncpy(drives_table[nb_drives].serial, serial, sizeof(serial));
nb_drives++;
++++++ bdrv_open2_fix_flags.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/block.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/block.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/block.c
-+++ xen-4.0.1-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
@@ -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.1-testing/tools/ioemu-qemu-xen/hw/usb-msd.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/usb-msd.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/usb-msd.c
-+++ xen-4.0.1-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
@@ -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.1-testing/tools/ioemu-qemu-xen/qemu-img.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-img.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/qemu-img.c
-+++ xen-4.0.1-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
@@ -32,7 +32,7 @@
#endif
++++++ bdrv_open2_flags_2.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
-+++ xen-4.0.1-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
@@ -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.1-testing/tools/ioemu-qemu-xen/xenstore.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/xenstore.c
-+++ xen-4.0.1-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
@@ -136,7 +136,8 @@ static void insert_media(void *opaque)
else
format = &bdrv_raw;
++++++ blktap-pv-cdrom.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/blktap/drivers/block-cdrom.c
+Index: xen-4.0.2-testing/tools/blktap/drivers/block-cdrom.c
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/blktap/drivers/block-cdrom.c
++++ xen-4.0.2-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.1-testing/xen/include/public/io/cdromif.h
+Index: xen-4.0.2-testing/xen/include/public/io/cdromif.h
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/xen/include/public/io/cdromif.h
++++ xen-4.0.2-testing/xen/include/public/io/cdromif.h
@@ -0,0 +1,122 @@
+/******************************************************************************
+ * cdromif.h
@@ -665,10 +665,10 @@
+ sizeof(struct vcd_generic_command) - sizeof(struct request_sense))
+
+#endif
-Index: xen-4.0.1-testing/tools/blktap/drivers/Makefile
+Index: xen-4.0.2-testing/tools/blktap/drivers/Makefile
===================================================================
---- xen-4.0.1-testing.orig/tools/blktap/drivers/Makefile
-+++ xen-4.0.1-testing/tools/blktap/drivers/Makefile
+--- xen-4.0.2-testing.orig/tools/blktap/drivers/Makefile
++++ xen-4.0.2-testing/tools/blktap/drivers/Makefile
@@ -28,8 +28,9 @@ CFLAGS += -DMEMSHR
MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a
endif
@@ -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.1-testing/tools/blktap/drivers/tapdisk.h
+Index: xen-4.0.2-testing/tools/blktap/drivers/tapdisk.h
===================================================================
---- xen-4.0.1-testing.orig/tools/blktap/drivers/tapdisk.h
-+++ xen-4.0.1-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
@@ -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.1-testing/tools/blktap/lib/blktaplib.h
+Index: xen-4.0.2-testing/tools/blktap/lib/blktaplib.h
===================================================================
---- xen-4.0.1-testing.orig/tools/blktap/lib/blktaplib.h
-+++ xen-4.0.1-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
@@ -225,6 +225,7 @@ typedef struct msg_pid {
#define DISK_TYPE_RAM 3
#define DISK_TYPE_QCOW 4
@@ -749,10 +749,10 @@
/* xenstore/xenbus: */
#define DOMNAME "Domain-0"
-Index: xen-4.0.1-testing/xen/include/public/io/blkif.h
+Index: xen-4.0.2-testing/xen/include/public/io/blkif.h
===================================================================
---- xen-4.0.1-testing.orig/xen/include/public/io/blkif.h
-+++ xen-4.0.1-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!
*/
@@ -764,10 +764,10 @@
/*
* Maximum scatter/gather segments per request.
-Index: xen-4.0.1-testing/tools/blktap/drivers/tapdisk.c
+Index: xen-4.0.2-testing/tools/blktap/drivers/tapdisk.c
===================================================================
---- xen-4.0.1-testing.orig/tools/blktap/drivers/tapdisk.c
-+++ xen-4.0.1-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
@@ -735,6 +735,22 @@ static void get_io_request(struct td_sta
goto out;
}
@@ -791,10 +791,10 @@
default:
DPRINTF("Unknown block operation\n");
break;
-Index: xen-4.0.1-testing/tools/python/xen/xend/server/BlktapController.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/server/BlktapController.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/server/BlktapController.py
-+++ xen-4.0.1-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 = [
'ram',
'qcow',
++++++ blktap.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -1,11 +1,11 @@
bug #239173
bug #242953
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
-@@ -3290,7 +3290,7 @@ class XendDomainInfo:
+--- 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:
(fn, BOOTLOADER_LOOPBACK_DEVICE))
vbd = {
@@ -14,10 +14,10 @@
'device': BOOTLOADER_LOOPBACK_DEVICE,
}
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/xenstore.c
-+++ xen-4.0.1-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
{
char **e_danger = NULL;
++++++ blktap2.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -3,10 +3,10 @@
Signed-off-by ChunyanLiu
-Index: xen-4.0.1-testing/tools/python/xen/xend/server/BlktapController.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/server/BlktapController.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/server/BlktapController.py
-+++ xen-4.0.1-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
@@ -4,6 +4,7 @@ import string, re
from xen.xend.server.blkif import BlkifController
from xen.xend.XendLogging import log
++++++ blktapctrl-default-to-ioemu.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/blktap/drivers/tapdisk.h
+Index: xen-4.0.2-testing/tools/blktap/drivers/tapdisk.h
===================================================================
---- xen-4.0.1-testing.orig/tools/blktap/drivers/tapdisk.h
-+++ xen-4.0.1-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
@@ -168,7 +168,7 @@ static disk_info_t aio_disk = {
"raw image (aio)",
"aio",
++++++ bridge-bonding.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/hotplug/Linux/network-bridge
+Index: xen-4.0.2-testing/tools/hotplug/Linux/network-bridge
===================================================================
---- xen-4.0.1-testing.orig/tools/hotplug/Linux/network-bridge
-+++ xen-4.0.1-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 () {
claim_lock "network-bridge"
++++++ bridge-opensuse.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/hotplug/Linux/network-bridge
+Index: xen-4.0.2-testing/tools/hotplug/Linux/network-bridge
===================================================================
---- xen-4.0.1-testing.orig/tools/hotplug/Linux/network-bridge
-+++ xen-4.0.1-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 () {
transfer_addrs ${bridge} ${pdev}
if ! ifdown ${bridge}; then
++++++ bridge-record-creation.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/hotplug/Linux/network-bridge
+Index: xen-4.0.2-testing/tools/hotplug/Linux/network-bridge
===================================================================
---- xen-4.0.1-testing.orig/tools/hotplug/Linux/network-bridge
-+++ xen-4.0.1-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 () {
create_bridge ${tdev}
++++++ bridge-vlan.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/hotplug/Linux/network-bridge
+Index: xen-4.0.2-testing/tools/hotplug/Linux/network-bridge
===================================================================
---- xen-4.0.1-testing.orig/tools/hotplug/Linux/network-bridge
-+++ xen-4.0.1-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
@@ -193,6 +193,28 @@ antispoofing () {
iptables -A FORWARD -m physdev --physdev-in ${pdev} -j ACCEPT
}
++++++ build-tapdisk-ioemu.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -15,10 +15,10 @@
tapdisk-ioemu.c | 17 -----------------
4 files changed, 17 insertions(+), 26 deletions(-)
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/Makefile
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/Makefile
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/Makefile
-+++ xen-4.0.1-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
@@ -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.1-testing/tools/ioemu-qemu-xen/configure
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/configure
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/configure
-+++ xen-4.0.1-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
@@ -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.1-testing/tools/ioemu-qemu-xen/qemu-tool.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-tool.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/qemu-tool.c
-+++ xen-4.0.1-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
@@ -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.1-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/tapdisk-ioemu.c
-+++ xen-4.0.1-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
@@ -12,34 +12,12 @@
extern void qemu_aio_init(void);
++++++ capslock_enable.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/vnc.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/vnc.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/vnc.c
-+++ xen-4.0.1-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
@@ -1342,6 +1342,11 @@ static void do_key_event(VncState *vs, i
}
break;
++++++ cdrom-removable.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/python/xen/xend/server/HalDaemon.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/server/HalDaemon.py
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/python/xen/xend/server/HalDaemon.py
++++ xen-4.0.2-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.1-testing/tools/python/xen/xend/server/Hald.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/server/Hald.py
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/python/xen/xend/server/Hald.py
++++ xen-4.0.2-testing/tools/python/xen/xend/server/Hald.py
@@ -0,0 +1,125 @@
+#============================================================================
+# This library is free software; you can redistribute it and/or
@@ -376,10 +376,10 @@
+ watcher.run()
+ time.sleep(10)
+ watcher.shutdown()
-Index: xen-4.0.1-testing/tools/python/xen/xend/server/SrvServer.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/server/SrvServer.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/server/SrvServer.py
-+++ xen-4.0.1-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
from SrvRoot import SrvRoot
@@ -397,10 +397,10 @@
def create():
root = SrvDir()
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/xenstore.c
-+++ xen-4.0.1-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
@@ -18,6 +18,7 @@
#include "exec-all.h"
#include "sysemu.h"
++++++ change_home_server.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:19.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:19.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.1-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:
self._cleanup_phantom_devs(paths)
self._cleanupVm()
++++++ checkpoint-rename.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendCheckpoint.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendCheckpoint.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendCheckpoint.py
-+++ xen-4.0.1-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
dominfo.destroy()
dominfo.testDeviceComplete()
++++++ cpu-pools-docs.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/docs/xen-api/coversheet.tex
+Index: xen-4.0.2-testing/docs/xen-api/coversheet.tex
===================================================================
---- xen-4.0.1-testing.orig/docs/xen-api/coversheet.tex
-+++ xen-4.0.1-testing/docs/xen-api/coversheet.tex
+--- xen-4.0.2-testing.orig/docs/xen-api/coversheet.tex
++++ xen-4.0.2-testing/docs/xen-api/coversheet.tex
@@ -52,6 +52,7 @@ Mike Day, IBM & Daniel Veillard, Red Hat
Jim Fehlig, Novell & Tom Wilkie, University of Cambridge \\
Jon Harrop, XenSource & Yosuke Iwamatsu, NEC \\
@@ -10,10 +10,10 @@
\end{tabular}
\end{large}
-Index: xen-4.0.1-testing/docs/xen-api/revision-history.tex
+Index: xen-4.0.2-testing/docs/xen-api/revision-history.tex
===================================================================
---- xen-4.0.1-testing.orig/docs/xen-api/revision-history.tex
-+++ xen-4.0.1-testing/docs/xen-api/revision-history.tex
+--- xen-4.0.2-testing.orig/docs/xen-api/revision-history.tex
++++ xen-4.0.2-testing/docs/xen-api/revision-history.tex
@@ -50,6 +50,12 @@
between classes. Added host.PSCSI\_HBAs and VM.DSCSI\_HBAs
fields.\tabularnewline
@@ -27,10 +27,10 @@
\end{tabular}
\end{center}
\end{flushleft}
-Index: xen-4.0.1-testing/docs/xen-api/xenapi-coversheet.tex
+Index: xen-4.0.2-testing/docs/xen-api/xenapi-coversheet.tex
===================================================================
---- xen-4.0.1-testing.orig/docs/xen-api/xenapi-coversheet.tex
-+++ xen-4.0.1-testing/docs/xen-api/xenapi-coversheet.tex
+--- xen-4.0.2-testing.orig/docs/xen-api/xenapi-coversheet.tex
++++ xen-4.0.2-testing/docs/xen-api/xenapi-coversheet.tex
@@ -17,12 +17,12 @@
\newcommand{\coversheetlogo}{xen.eps}
@@ -46,10 +46,10 @@
%% Document authors
\newcommand{\docauthors}{
-Index: xen-4.0.1-testing/docs/xen-api/xenapi-datamodel-graph.dot
+Index: xen-4.0.2-testing/docs/xen-api/xenapi-datamodel-graph.dot
===================================================================
---- xen-4.0.1-testing.orig/docs/xen-api/xenapi-datamodel-graph.dot
-+++ xen-4.0.1-testing/docs/xen-api/xenapi-datamodel-graph.dot
+--- xen-4.0.2-testing.orig/docs/xen-api/xenapi-datamodel-graph.dot
++++ xen-4.0.2-testing/docs/xen-api/xenapi-datamodel-graph.dot
@@ -14,7 +14,7 @@ fontname="Verdana";
node [ shape=box ]; session VM host network VIF PIF SR VDI VBD PBD user;
@@ -67,10 +67,10 @@
+cpu_pool -> VM [ arrowhead="crow", arrowtail="none" ]
+host -> cpu_pool [ arrowhead="crow", arrowtail="none" ]
}
-Index: xen-4.0.1-testing/docs/xen-api/xenapi-datamodel.tex
+Index: xen-4.0.2-testing/docs/xen-api/xenapi-datamodel.tex
===================================================================
---- xen-4.0.1-testing.orig/docs/xen-api/xenapi-datamodel.tex
-+++ xen-4.0.1-testing/docs/xen-api/xenapi-datamodel.tex
+--- xen-4.0.2-testing.orig/docs/xen-api/xenapi-datamodel.tex
++++ xen-4.0.2-testing/docs/xen-api/xenapi-datamodel.tex
@@ -56,6 +56,7 @@ Name & Description \\
{\tt debug} & A basic class for testing \\
{\tt XSPolicy} & A class for handling Xen Security Policies \\
++++++ cpu-pools-libxc.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/libxc/Makefile
+Index: xen-4.0.2-testing/tools/libxc/Makefile
===================================================================
---- xen-4.0.1-testing.orig/tools/libxc/Makefile
-+++ xen-4.0.1-testing/tools/libxc/Makefile
+--- xen-4.0.2-testing.orig/tools/libxc/Makefile
++++ xen-4.0.2-testing/tools/libxc/Makefile
@@ -8,6 +8,7 @@ CTRL_SRCS-y :=
CTRL_SRCS-y += xc_core.c
CTRL_SRCS-$(CONFIG_X86) += xc_core_x86.c
@@ -10,10 +10,10 @@
CTRL_SRCS-y += xc_domain.c
CTRL_SRCS-y += xc_evtchn.c
CTRL_SRCS-y += xc_misc.c
-Index: xen-4.0.1-testing/tools/libxc/xc_cpupool.c
+Index: xen-4.0.2-testing/tools/libxc/xc_cpupool.c
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/libxc/xc_cpupool.c
++++ xen-4.0.2-testing/tools/libxc/xc_cpupool.c
@@ -0,0 +1,165 @@
+/******************************************************************************
+ * xc_cpupool.c
@@ -180,10 +180,10 @@
+
+ return 0;
+}
-Index: xen-4.0.1-testing/tools/libxc/xc_domain.c
+Index: xen-4.0.2-testing/tools/libxc/xc_domain.c
===================================================================
---- xen-4.0.1-testing.orig/tools/libxc/xc_domain.c
-+++ xen-4.0.1-testing/tools/libxc/xc_domain.c
+--- xen-4.0.2-testing.orig/tools/libxc/xc_domain.c
++++ xen-4.0.2-testing/tools/libxc/xc_domain.c
@@ -220,6 +220,7 @@ int xc_domain_getinfo(int xc_handle,
info->cpu_time = domctl.u.getdomaininfo.cpu_time;
info->nr_online_vcpus = domctl.u.getdomaininfo.nr_online_vcpus;
@@ -192,10 +192,10 @@
memcpy(info->handle, domctl.u.getdomaininfo.handle,
sizeof(xen_domain_handle_t));
-Index: xen-4.0.1-testing/tools/libxc/xenctrl.h
+Index: xen-4.0.2-testing/tools/libxc/xenctrl.h
===================================================================
---- xen-4.0.1-testing.orig/tools/libxc/xenctrl.h
-+++ xen-4.0.1-testing/tools/libxc/xenctrl.h
+--- xen-4.0.2-testing.orig/tools/libxc/xenctrl.h
++++ xen-4.0.2-testing/tools/libxc/xenctrl.h
@@ -161,6 +161,7 @@ typedef struct xc_dominfo {
unsigned int nr_online_vcpus;
unsigned int max_vcpu_id;
++++++ cpu-pools-libxen.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,17 +1,17 @@
-Index: xen-4.0.1-testing/tools/libxen/include/xen/api/xen_all.h
+Index: xen-4.0.2-testing/tools/libxen/include/xen/api/xen_all.h
===================================================================
---- xen-4.0.1-testing.orig/tools/libxen/include/xen/api/xen_all.h
-+++ xen-4.0.1-testing/tools/libxen/include/xen/api/xen_all.h
+--- xen-4.0.2-testing.orig/tools/libxen/include/xen/api/xen_all.h
++++ xen-4.0.2-testing/tools/libxen/include/xen/api/xen_all.h
@@ -37,4 +37,5 @@
#include
#include
#include
+#include
#endif
-Index: xen-4.0.1-testing/tools/libxen/include/xen/api/xen_cpu_pool.h
+Index: xen-4.0.2-testing/tools/libxen/include/xen/api/xen_cpu_pool.h
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/libxen/include/xen/api/xen_cpu_pool.h
++++ xen-4.0.2-testing/tools/libxen/include/xen/api/xen_cpu_pool.h
@@ -0,0 +1,424 @@
+/*
+ * Copyright (c) 2006-2007, XenSource Inc.
@@ -437,10 +437,10 @@
+
+
+#endif
-Index: xen-4.0.1-testing/tools/libxen/include/xen/api/xen_cpu_pool_decl.h
+Index: xen-4.0.2-testing/tools/libxen/include/xen/api/xen_cpu_pool_decl.h
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/libxen/include/xen/api/xen_cpu_pool_decl.h
++++ xen-4.0.2-testing/tools/libxen/include/xen/api/xen_cpu_pool_decl.h
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2006-2007, XenSource Inc.
@@ -472,10 +472,10 @@
+struct xen_cpu_pool_record_opt_set;
+
+#endif
-Index: xen-4.0.1-testing/tools/libxen/include/xen/api/xen_host.h
+Index: xen-4.0.2-testing/tools/libxen/include/xen/api/xen_host.h
===================================================================
---- xen-4.0.1-testing.orig/tools/libxen/include/xen/api/xen_host.h
-+++ xen-4.0.1-testing/tools/libxen/include/xen/api/xen_host.h
+--- xen-4.0.2-testing.orig/tools/libxen/include/xen/api/xen_host.h
++++ xen-4.0.2-testing/tools/libxen/include/xen/api/xen_host.h
@@ -29,7 +29,7 @@
#include
#include
@@ -505,10 +505,10 @@
+ xen_host host);
+
#endif
-Index: xen-4.0.1-testing/tools/libxen/include/xen/api/xen_host_cpu.h
+Index: xen-4.0.2-testing/tools/libxen/include/xen/api/xen_host_cpu.h
===================================================================
---- xen-4.0.1-testing.orig/tools/libxen/include/xen/api/xen_host_cpu.h
-+++ xen-4.0.1-testing/tools/libxen/include/xen/api/xen_host_cpu.h
+--- xen-4.0.2-testing.orig/tools/libxen/include/xen/api/xen_host_cpu.h
++++ xen-4.0.2-testing/tools/libxen/include/xen/api/xen_host_cpu.h
@@ -22,6 +22,7 @@
#include
#include
@@ -544,10 +544,10 @@
+
+
#endif
-Index: xen-4.0.1-testing/tools/libxen/include/xen/api/xen_vm.h
+Index: xen-4.0.2-testing/tools/libxen/include/xen/api/xen_vm.h
===================================================================
---- xen-4.0.1-testing.orig/tools/libxen/include/xen/api/xen_vm.h
-+++ xen-4.0.1-testing/tools/libxen/include/xen/api/xen_vm.h
+--- xen-4.0.2-testing.orig/tools/libxen/include/xen/api/xen_vm.h
++++ xen-4.0.2-testing/tools/libxen/include/xen/api/xen_vm.h
@@ -34,6 +34,7 @@
#include
#include
@@ -599,10 +599,10 @@
+xen_vm_cpu_pool_migrate(xen_session *session, xen_vm vm, xen_cpu_pool cpu_pool);
+
#endif
-Index: xen-4.0.1-testing/tools/libxen/src/xen_cpu_pool.c
+Index: xen-4.0.2-testing/tools/libxen/src/xen_cpu_pool.c
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/libxen/src/xen_cpu_pool.c
++++ xen-4.0.2-testing/tools/libxen/src/xen_cpu_pool.c
@@ -0,0 +1,671 @@
+/*
+ * Copyright (c) 2006-2007, XenSource Inc.
@@ -1275,10 +1275,10 @@
+ return session->ok;
+}
+
-Index: xen-4.0.1-testing/tools/libxen/src/xen_host.c
+Index: xen-4.0.2-testing/tools/libxen/src/xen_host.c
===================================================================
---- xen-4.0.1-testing.orig/tools/libxen/src/xen_host.c
-+++ xen-4.0.1-testing/tools/libxen/src/xen_host.c
+--- xen-4.0.2-testing.orig/tools/libxen/src/xen_host.c
++++ xen-4.0.2-testing/tools/libxen/src/xen_host.c
@@ -30,6 +30,7 @@
#include
#include
@@ -1330,10 +1330,10 @@
+ return session->ok;
+}
+
-Index: xen-4.0.1-testing/tools/libxen/src/xen_host_cpu.c
+Index: xen-4.0.2-testing/tools/libxen/src/xen_host_cpu.c
===================================================================
---- xen-4.0.1-testing.orig/tools/libxen/src/xen_host_cpu.c
-+++ xen-4.0.1-testing/tools/libxen/src/xen_host_cpu.c
+--- xen-4.0.2-testing.orig/tools/libxen/src/xen_host_cpu.c
++++ xen-4.0.2-testing/tools/libxen/src/xen_host_cpu.c
@@ -24,6 +24,7 @@
#include
#include
@@ -1397,10 +1397,10 @@
+
+
+
-Index: xen-4.0.1-testing/tools/libxen/src/xen_vm.c
+Index: xen-4.0.2-testing/tools/libxen/src/xen_vm.c
===================================================================
---- xen-4.0.1-testing.orig/tools/libxen/src/xen_vm.c
-+++ xen-4.0.1-testing/tools/libxen/src/xen_vm.c
+--- xen-4.0.2-testing.orig/tools/libxen/src/xen_vm.c
++++ xen-4.0.2-testing/tools/libxen/src/xen_vm.c
@@ -36,6 +36,7 @@
#include
#include
@@ -1504,10 +1504,10 @@
+}
+
+
-Index: xen-4.0.1-testing/tools/libxen/test/test_bindings.c
+Index: xen-4.0.2-testing/tools/libxen/test/test_bindings.c
===================================================================
---- xen-4.0.1-testing.orig/tools/libxen/test/test_bindings.c
-+++ xen-4.0.1-testing/tools/libxen/test/test_bindings.c
+--- xen-4.0.2-testing.orig/tools/libxen/test/test_bindings.c
++++ xen-4.0.2-testing/tools/libxen/test/test_bindings.c
@@ -28,6 +28,7 @@
#include
++++++ cpu-pools-python.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/python/xen/lowlevel/xc/xc.c
+Index: xen-4.0.2-testing/tools/python/xen/lowlevel/xc/xc.c
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/lowlevel/xc/xc.c
-+++ xen-4.0.1-testing/tools/python/xen/lowlevel/xc/xc.c
+--- xen-4.0.2-testing.orig/tools/python/xen/lowlevel/xc/xc.c
++++ xen-4.0.2-testing/tools/python/xen/lowlevel/xc/xc.c
@@ -106,8 +106,8 @@ static PyObject *pyxc_domain_create(XcOb
static char *kwd_list[] = { "domid", "ssidref", "handle", "flags", "target", NULL };
@@ -289,10 +289,10 @@
{ NULL, NULL, 0, NULL }
};
-Index: xen-4.0.1-testing/tools/python/xen/util/sxputils.py
+Index: xen-4.0.2-testing/tools/python/xen/util/sxputils.py
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/python/xen/util/sxputils.py
++++ xen-4.0.2-testing/tools/python/xen/util/sxputils.py
@@ -0,0 +1,64 @@
+#============================================================================
+# This library is free software; you can redistribute it and/or
@@ -358,10 +358,10 @@
+ return sxphash
+
+
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendAPI.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendAPI.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendAPI.py
-+++ xen-4.0.1-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
@@ -51,6 +51,7 @@ from XendDPCI import XendDPCI
from XendPSCSI import XendPSCSI, XendPSCSI_HBA
from XendDSCSI import XendDSCSI, XendDSCSI_HBA
@@ -553,10 +553,10 @@
# Xen API: Class VBD
# ----------------------------------------------------------------
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendCPUPool.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendCPUPool.py
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/python/xen/xend/XendCPUPool.py
++++ xen-4.0.2-testing/tools/python/xen/xend/XendCPUPool.py
@@ -0,0 +1,903 @@
+#============================================================================
+# This library is free software; you can redistribute it and/or
@@ -1461,10 +1461,10 @@
+
+ unbound_cpus = classmethod(unbound_cpus)
+
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendConfig.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendConfig.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendConfig.py
-+++ xen-4.0.1-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
@@ -134,6 +134,7 @@ XENAPI_CFG_TO_LEGACY_CFG = {
'PV_bootloader': 'bootloader',
'PV_bootloader_args': 'bootloader_args',
@@ -1505,10 +1505,10 @@
'superpages': 0,
'description': '',
}
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendConstants.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendConstants.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendConstants.py
-+++ xen-4.0.1-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
@@ -133,6 +133,8 @@ VTPM_DELETE_SCRIPT = auxbin.scripts_dir(
XS_VMROOT = "/vm/"
@@ -1518,10 +1518,10 @@
NR_PCI_FUNC = 8
NR_PCI_DEV = 32
NR_PCI_DEVFN = NR_PCI_FUNC * NR_PCI_DEV
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.1-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
@@ -60,6 +60,7 @@ from xen.xend.xenstore.xsutil import Get
from xen.xend.xenstore.xswatch import xswatch
from xen.xend.XendConstants import *
@@ -1562,7 +1562,7 @@
self.dompath = GetDomainPath(self.domid)
self._recreateDom()
-@@ -3617,6 +3636,11 @@ class XendDomainInfo:
+@@ -3618,6 +3637,11 @@ class XendDomainInfo:
retval = xc.sched_credit_domain_get(self.getDomid())
return retval
@@ -1574,10 +1574,10 @@
def get_power_state(self):
return XEN_API_VM_POWER_STATE[self._stateGet()]
def get_platform(self):
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendError.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendError.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendError.py
-+++ xen-4.0.1-testing/tools/python/xen/xend/XendError.py
+--- xen-4.0.2-testing.orig/tools/python/xen/xend/XendError.py
++++ xen-4.0.2-testing/tools/python/xen/xend/XendError.py
@@ -18,6 +18,7 @@
from xmlrpclib import Fault
@@ -1613,10 +1613,10 @@
class VDIError(XendAPIError):
def __init__(self, error, vdi):
XendAPIError.__init__(self)
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendNode.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendNode.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendNode.py
-+++ xen-4.0.1-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
@@ -43,6 +43,7 @@ from XendStateStore import XendStateStor
from XendMonitor import XendMonitor
from XendPPCI import XendPPCI
@@ -1690,10 +1690,10 @@
'max_free_memory',
'max_para_memory',
'max_hvm_memory',
-Index: xen-4.0.1-testing/tools/python/xen/xend/server/SrvServer.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/server/SrvServer.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/server/SrvServer.py
-+++ xen-4.0.1-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
@@ -52,6 +52,7 @@ from xen.xend import XendNode, XendOptio
from xen.xend.XendLogging import log
from xen.xend.XendClient import XEN_API_SOCKET
@@ -1715,10 +1715,10 @@
# Reaching this point means we can auto start domains
try:
xenddomain().autostart_domains()
-Index: xen-4.0.1-testing/tools/python/xen/xend/server/XMLRPCServer.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/server/XMLRPCServer.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/server/XMLRPCServer.py
-+++ xen-4.0.1-testing/tools/python/xen/xend/server/XMLRPCServer.py
+--- xen-4.0.2-testing.orig/tools/python/xen/xend/server/XMLRPCServer.py
++++ xen-4.0.2-testing/tools/python/xen/xend/server/XMLRPCServer.py
@@ -33,6 +33,7 @@ from xen.xend.XendClient import XML_RPC_
from xen.xend.XendConstants import DOM_STATE_RUNNING
from xen.xend.XendLogging import log
@@ -1750,10 +1750,10 @@
# Functions in XendNode and XendDmesg
for type, lst, n in [(XendNode,
['info', 'pciinfo', 'send_debug_keys',
-Index: xen-4.0.1-testing/tools/python/xen/xm/create.dtd
+Index: xen-4.0.2-testing/tools/python/xen/xm/create.dtd
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xm/create.dtd
-+++ xen-4.0.1-testing/tools/python/xen/xm/create.dtd
+--- xen-4.0.2-testing.orig/tools/python/xen/xm/create.dtd
++++ xen-4.0.2-testing/tools/python/xen/xm/create.dtd
@@ -50,6 +50,7 @@
s3_integrity CDATA #REQUIRED
vcpus_max CDATA #REQUIRED
@@ -1762,10 +1762,10 @@
actions_after_shutdown %NORMAL_EXIT; #REQUIRED
actions_after_reboot %NORMAL_EXIT; #REQUIRED
actions_after_crash %CRASH_BEHAVIOUR; #REQUIRED
-Index: xen-4.0.1-testing/tools/python/xen/xm/create.py
+Index: xen-4.0.2-testing/tools/python/xen/xm/create.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xm/create.py
-+++ xen-4.0.1-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
@@ -659,6 +659,10 @@ gopts.var('suppress_spurious_page_faults
fn=set_bool, default=None,
use="""Do not inject spurious page faults into this guest""")
@@ -1786,10 +1786,10 @@
config_image = configure_image(vals)
if vals.bootloader:
-Index: xen-4.0.1-testing/tools/python/xen/xm/main.py
+Index: xen-4.0.2-testing/tools/python/xen/xm/main.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xm/main.py
-+++ xen-4.0.1-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
@@ -56,6 +56,7 @@ from xen.util.xmlrpcclient import Server
import xen.util.xsm.xsm as security
from xen.util.xsm.xsm import XSMError
@@ -2155,10 +2155,10 @@
]
for c in IMPORTED_COMMANDS:
-Index: xen-4.0.1-testing/tools/python/xen/xm/pool-create.py
+Index: xen-4.0.2-testing/tools/python/xen/xm/pool-create.py
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/python/xen/xm/pool-create.py
++++ xen-4.0.2-testing/tools/python/xen/xm/pool-create.py
@@ -0,0 +1,51 @@
+#============================================================================
+# This library is free software; you can redistribute it and/or
@@ -2211,10 +2211,10 @@
+if __name__ == '__main__':
+ main(sys.argv)
+
-Index: xen-4.0.1-testing/tools/python/xen/xm/pool-new.py
+Index: xen-4.0.2-testing/tools/python/xen/xm/pool-new.py
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/python/xen/xm/pool-new.py
++++ xen-4.0.2-testing/tools/python/xen/xm/pool-new.py
@@ -0,0 +1,50 @@
+#============================================================================
+# This library is free software; you can redistribute it and/or
@@ -2266,10 +2266,10 @@
+if __name__ == '__main__':
+ main(sys.argv)
+
-Index: xen-4.0.1-testing/tools/python/xen/xm/pool.py
+Index: xen-4.0.2-testing/tools/python/xen/xm/pool.py
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/python/xen/xm/pool.py
++++ xen-4.0.2-testing/tools/python/xen/xm/pool.py
@@ -0,0 +1,236 @@
+#============================================================================
+# This library is free software; you can redistribute it and/or
@@ -2507,10 +2507,10 @@
+def help():
+ return str(GOPTS)
+
-Index: xen-4.0.1-testing/tools/python/xen/xm/xenapi_create.py
+Index: xen-4.0.2-testing/tools/python/xen/xm/xenapi_create.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xm/xenapi_create.py
-+++ xen-4.0.1-testing/tools/python/xen/xm/xenapi_create.py
+--- xen-4.0.2-testing.orig/tools/python/xen/xm/xenapi_create.py
++++ xen-4.0.2-testing/tools/python/xen/xm/xenapi_create.py
@@ -309,6 +309,8 @@ class xenapi_create:
get_child_nodes_as_dict(vm, "platform", "key", "value"),
"other_config":
++++++ cpu-pools-xmtest.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/xm-test/configure.ac
+Index: xen-4.0.2-testing/tools/xm-test/configure.ac
===================================================================
---- xen-4.0.1-testing.orig/tools/xm-test/configure.ac
-+++ xen-4.0.1-testing/tools/xm-test/configure.ac
+--- xen-4.0.2-testing.orig/tools/xm-test/configure.ac
++++ xen-4.0.2-testing/tools/xm-test/configure.ac
@@ -161,6 +161,7 @@ AC_CONFIG_FILES([
tests/vtpm/Makefile
tests/xapi/Makefile
@@ -10,16 +10,16 @@
lib/XmTestReport/xmtest.py
lib/XmTestLib/config.py
])
-Index: xen-4.0.1-testing/tools/xm-test/grouptest/cpupool
+Index: xen-4.0.2-testing/tools/xm-test/grouptest/cpupool
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xm-test/grouptest/cpupool
++++ xen-4.0.2-testing/tools/xm-test/grouptest/cpupool
@@ -0,0 +1 @@
+cpupool
-Index: xen-4.0.1-testing/tools/xm-test/lib/XmTestLib/NetConfig.py
+Index: xen-4.0.2-testing/tools/xm-test/lib/XmTestLib/NetConfig.py
===================================================================
---- xen-4.0.1-testing.orig/tools/xm-test/lib/XmTestLib/NetConfig.py
-+++ xen-4.0.1-testing/tools/xm-test/lib/XmTestLib/NetConfig.py
+--- xen-4.0.2-testing.orig/tools/xm-test/lib/XmTestLib/NetConfig.py
++++ xen-4.0.2-testing/tools/xm-test/lib/XmTestLib/NetConfig.py
@@ -56,17 +56,21 @@ def getXendNetConfig():
val = pin.get_val()
while val[0] != 'network-script':
@@ -51,10 +51,10 @@
configfile.close()
return netenv
-Index: xen-4.0.1-testing/tools/xm-test/lib/XmTestLib/XenDomain.py
+Index: xen-4.0.2-testing/tools/xm-test/lib/XmTestLib/XenDomain.py
===================================================================
---- xen-4.0.1-testing.orig/tools/xm-test/lib/XmTestLib/XenDomain.py
-+++ xen-4.0.1-testing/tools/xm-test/lib/XmTestLib/XenDomain.py
+--- xen-4.0.2-testing.orig/tools/xm-test/lib/XmTestLib/XenDomain.py
++++ xen-4.0.2-testing/tools/xm-test/lib/XmTestLib/XenDomain.py
@@ -181,6 +181,7 @@ class XenDomain:
if not self.isManaged:
@@ -63,10 +63,10 @@
else:
ret, output = traceCommand("xm new %s" % self.config)
if ret != 0:
-Index: xen-4.0.1-testing/tools/xm-test/runtest.sh
+Index: xen-4.0.2-testing/tools/xm-test/runtest.sh
===================================================================
---- xen-4.0.1-testing.orig/tools/xm-test/runtest.sh
-+++ xen-4.0.1-testing/tools/xm-test/runtest.sh
+--- xen-4.0.2-testing.orig/tools/xm-test/runtest.sh
++++ xen-4.0.2-testing/tools/xm-test/runtest.sh
@@ -91,7 +91,7 @@ runnable_tests() {
echo "Error: ramdisk/initrd.img is from an old version, or is not for this "
echo "architecture ($ARCH)."
@@ -76,10 +76,10 @@
fi
# See if xend is running
-Index: xen-4.0.1-testing/tools/xm-test/tests/Makefile.am
+Index: xen-4.0.2-testing/tools/xm-test/tests/Makefile.am
===================================================================
---- xen-4.0.1-testing.orig/tools/xm-test/tests/Makefile.am
-+++ xen-4.0.1-testing/tools/xm-test/tests/Makefile.am
+--- xen-4.0.2-testing.orig/tools/xm-test/tests/Makefile.am
++++ xen-4.0.2-testing/tools/xm-test/tests/Makefile.am
@@ -28,7 +28,8 @@ SUBDIRS = \
vcpu-pin \
vtpm \
@@ -90,10 +90,10 @@
EXTRA_DIST = $(SUBDIRS) Makefile.am.template
-Index: xen-4.0.1-testing/tools/xm-test/tests/cpupool/01_cpupool_basic_pos.py
+Index: xen-4.0.2-testing/tools/xm-test/tests/cpupool/01_cpupool_basic_pos.py
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xm-test/tests/cpupool/01_cpupool_basic_pos.py
++++ xen-4.0.2-testing/tools/xm-test/tests/cpupool/01_cpupool_basic_pos.py
@@ -0,0 +1,72 @@
+#!/usr/bin/python
+
@@ -167,10 +167,10 @@
+destroyAllDomUs()
+
+
-Index: xen-4.0.1-testing/tools/xm-test/tests/cpupool/02_cpupool_manage_pos.py
+Index: xen-4.0.2-testing/tools/xm-test/tests/cpupool/02_cpupool_manage_pos.py
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xm-test/tests/cpupool/02_cpupool_manage_pos.py
++++ xen-4.0.2-testing/tools/xm-test/tests/cpupool/02_cpupool_manage_pos.py
@@ -0,0 +1,152 @@
+#!/usr/bin/python
+
@@ -324,10 +324,10 @@
+ FAIL("'Pool-1' not deleted")
+
+
-Index: xen-4.0.1-testing/tools/xm-test/tests/cpupool/03_cpupool_domain.py
+Index: xen-4.0.2-testing/tools/xm-test/tests/cpupool/03_cpupool_domain.py
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xm-test/tests/cpupool/03_cpupool_domain.py
++++ xen-4.0.2-testing/tools/xm-test/tests/cpupool/03_cpupool_domain.py
@@ -0,0 +1,126 @@
+#!/usr/bin/python
+
@@ -455,10 +455,10 @@
+for pool in pool_names:
+ destroyPool(pool, True)
+
-Index: xen-4.0.1-testing/tools/xm-test/tests/cpupool/04_cpupool_migrate.py
+Index: xen-4.0.2-testing/tools/xm-test/tests/cpupool/04_cpupool_migrate.py
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xm-test/tests/cpupool/04_cpupool_migrate.py
++++ xen-4.0.2-testing/tools/xm-test/tests/cpupool/04_cpupool_migrate.py
@@ -0,0 +1,84 @@
+#!/usr/bin/python
+
@@ -544,10 +544,10 @@
+#
+cleanupPoolsDomains()
+
-Index: xen-4.0.1-testing/tools/xm-test/tests/cpupool/Makefile.am
+Index: xen-4.0.2-testing/tools/xm-test/tests/cpupool/Makefile.am
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xm-test/tests/cpupool/Makefile.am
++++ xen-4.0.2-testing/tools/xm-test/tests/cpupool/Makefile.am
@@ -0,0 +1,22 @@
+SUBDIRS =
+
@@ -571,16 +571,16 @@
+ rm -f *log
+ rm -f *~
+
-Index: xen-4.0.1-testing/tools/xm-test/tests/cpupool/pool1.cfg
+Index: xen-4.0.2-testing/tools/xm-test/tests/cpupool/pool1.cfg
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xm-test/tests/cpupool/pool1.cfg
++++ xen-4.0.2-testing/tools/xm-test/tests/cpupool/pool1.cfg
@@ -0,0 +1 @@
+name="Pool-1"
-Index: xen-4.0.1-testing/tools/xm-test/tests/cpupool/pools.py
+Index: xen-4.0.2-testing/tools/xm-test/tests/cpupool/pools.py
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xm-test/tests/cpupool/pools.py
++++ xen-4.0.2-testing/tools/xm-test/tests/cpupool/pools.py
@@ -0,0 +1,78 @@
+#!/usr/bin/python
+
@@ -660,10 +660,10 @@
+ break
+ time.sleep(1)
+
-Index: xen-4.0.1-testing/tools/xm-test/tests/xapi/20_xapi-cpu_pool_basic.py
+Index: xen-4.0.2-testing/tools/xm-test/tests/xapi/20_xapi-cpu_pool_basic.py
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xm-test/tests/xapi/20_xapi-cpu_pool_basic.py
++++ xen-4.0.2-testing/tools/xm-test/tests/xapi/20_xapi-cpu_pool_basic.py
@@ -0,0 +1,157 @@
+#!/usr/bin/python
+
@@ -822,10 +822,10 @@
+if pool1 in session.xenapi.cpu_pool.get_all():
+ FAIL("cpu_pool.destroy() has not removed pool")
+
-Index: xen-4.0.1-testing/tools/xm-test/tests/xapi/Makefile.am
+Index: xen-4.0.2-testing/tools/xm-test/tests/xapi/Makefile.am
===================================================================
---- xen-4.0.1-testing.orig/tools/xm-test/tests/xapi/Makefile.am
-+++ xen-4.0.1-testing/tools/xm-test/tests/xapi/Makefile.am
+--- xen-4.0.2-testing.orig/tools/xm-test/tests/xapi/Makefile.am
++++ xen-4.0.2-testing/tools/xm-test/tests/xapi/Makefile.am
@@ -3,7 +3,8 @@ SUBDIRS =
TESTS = 01_xapi-vm_basic.test \
02_xapi-vbd_basic.test \
++++++ cpupools-core-fixup.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -9,10 +9,10 @@
missing adjustments get detected at build time)
- remove boot time per-CPU pool assignment messages (bnc#572146)
-Index: xen-4.0.1-testing/xen/arch/x86/domain.c
+Index: xen-4.0.2-testing/xen/arch/x86/domain.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/domain.c
-+++ xen-4.0.1-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
@@ -1585,6 +1585,7 @@ int continue_hypercall_on_cpu(int cpu, v
v->arch.schedule_tail = continue_hypercall_on_cpu_helper;
@@ -31,10 +31,10 @@
raise_softirq(SCHEDULE_SOFTIRQ);
/* Dummy return value will be overwritten by new schedule_tail. */
-Index: xen-4.0.1-testing/xen/common/sched_credit.c
+Index: xen-4.0.2-testing/xen/common/sched_credit.c
===================================================================
---- xen-4.0.1-testing.orig/xen/common/sched_credit.c
-+++ xen-4.0.1-testing/xen/common/sched_credit.c
+--- xen-4.0.2-testing.orig/xen/common/sched_credit.c
++++ xen-4.0.2-testing/xen/common/sched_credit.c
@@ -176,7 +176,6 @@ struct csched_private {
/*
* Global variables
@@ -43,7 +43,7 @@
static struct csched_private *csched_priv0 = NULL;
static void csched_tick(void *_cpu);
-@@ -1517,11 +1516,13 @@ static void csched_tick_resume(struct sc
+@@ -1527,11 +1526,13 @@ static void csched_tick_resume(struct sc
}
}
@@ -58,10 +58,10 @@
.init_domain = csched_dom_init,
.destroy_domain = csched_dom_destroy,
-Index: xen-4.0.1-testing/xen/common/softirq.c
+Index: xen-4.0.2-testing/xen/common/softirq.c
===================================================================
---- xen-4.0.1-testing.orig/xen/common/softirq.c
-+++ xen-4.0.1-testing/xen/common/softirq.c
+--- xen-4.0.2-testing.orig/xen/common/softirq.c
++++ xen-4.0.2-testing/xen/common/softirq.c
@@ -114,12 +114,15 @@ static void tasklet_schedule_list(struct
{
BUG_ON(!list_empty(&t->list));
@@ -105,10 +105,10 @@
}
/*
-Index: xen-4.0.1-testing/xen/include/public/domctl.h
+Index: xen-4.0.2-testing/xen/include/public/domctl.h
===================================================================
---- xen-4.0.1-testing.orig/xen/include/public/domctl.h
-+++ xen-4.0.1-testing/xen/include/public/domctl.h
+--- xen-4.0.2-testing.orig/xen/include/public/domctl.h
++++ xen-4.0.2-testing/xen/include/public/domctl.h
@@ -35,7 +35,7 @@
#include "xen.h"
#include "grant_table.h"
@@ -118,10 +118,10 @@
struct xenctl_cpumap {
XEN_GUEST_HANDLE_64(uint8) bitmap;
-Index: xen-4.0.1-testing/xen/include/xen/softirq.h
+Index: xen-4.0.2-testing/xen/include/xen/softirq.h
===================================================================
---- xen-4.0.1-testing.orig/xen/include/xen/softirq.h
-+++ xen-4.0.1-testing/xen/include/xen/softirq.h
+--- xen-4.0.2-testing.orig/xen/include/xen/softirq.h
++++ xen-4.0.2-testing/xen/include/xen/softirq.h
@@ -52,15 +52,17 @@ struct tasklet
bool_t is_scheduled;
bool_t is_running;
++++++ cpupools-core.patch ++++++
++++ 876 lines (skipped)
++++ between xen/cpupools-core.patch
++++ and /mounts/work_src_done/STABLE/xen/cpupools-core.patch
++++++ del_usb_xend_entry.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.1-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:
frontpath = self.getDeviceController(deviceClass).frontendPath(dev)
backpath = xstransact.Read(frontpath, "backend")
++++++ disable_emulated_device.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.0.1-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
+Index: xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
===================================================================
---- xen-4.0.1-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
-+++ xen-4.0.1-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
-@@ -401,6 +401,11 @@ static int __devinit platform_pci_init(s
+--- 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
platform_mmio = mmio_addr;
platform_mmiolen = mmio_len;
++++++ dom-print.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/xen/arch/x86/domain.c
+Index: xen-4.0.2-testing/xen/arch/x86/domain.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/domain.c
-+++ xen-4.0.1-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 *
printk("Memory pages belonging to domain %u:\n", d->domain_id);
++++++ domu-usb-controller.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendConfig.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendConfig.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendConfig.py
-+++ xen-4.0.1-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):
ports = sxp.child(dev_sxp, 'port')
for port in ports[1:]:
++++++ dump-exec-state.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/xen/arch/ia64/linux-xen/smp.c
+Index: xen-4.0.2-testing/xen/arch/ia64/linux-xen/smp.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/ia64/linux-xen/smp.c
-+++ xen-4.0.1-testing/xen/arch/ia64/linux-xen/smp.c
+--- xen-4.0.2-testing.orig/xen/arch/ia64/linux-xen/smp.c
++++ xen-4.0.2-testing/xen/arch/ia64/linux-xen/smp.c
@@ -94,6 +94,7 @@ static volatile struct call_data_struct
#define IPI_CALL_FUNC 0
@@ -34,10 +34,10 @@
int __init
setup_profiling_timer (unsigned int multiplier)
{
-Index: xen-4.0.1-testing/xen/arch/x86/smp.c
+Index: xen-4.0.2-testing/xen/arch/x86/smp.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/smp.c
-+++ xen-4.0.1-testing/xen/arch/x86/smp.c
+--- xen-4.0.2-testing.orig/xen/arch/x86/smp.c
++++ xen-4.0.2-testing/xen/arch/x86/smp.c
@@ -375,11 +375,24 @@ void smp_send_nmi_allbutself(void)
send_IPI_mask(&cpu_online_map, APIC_DM_NMI);
}
@@ -63,10 +63,10 @@
set_irq_regs(old_regs);
}
-Index: xen-4.0.1-testing/xen/common/keyhandler.c
+Index: xen-4.0.2-testing/xen/common/keyhandler.c
===================================================================
---- xen-4.0.1-testing.orig/xen/common/keyhandler.c
-+++ xen-4.0.1-testing/xen/common/keyhandler.c
+--- xen-4.0.2-testing.orig/xen/common/keyhandler.c
++++ xen-4.0.2-testing/xen/common/keyhandler.c
@@ -71,19 +71,52 @@ static struct keyhandler show_handlers_k
.desc = "show this message"
};
@@ -157,10 +157,10 @@
printk("\n");
-Index: xen-4.0.1-testing/xen/include/asm-ia64/linux-xen/asm/ptrace.h
+Index: xen-4.0.2-testing/xen/include/asm-ia64/linux-xen/asm/ptrace.h
===================================================================
---- xen-4.0.1-testing.orig/xen/include/asm-ia64/linux-xen/asm/ptrace.h
-+++ xen-4.0.1-testing/xen/include/asm-ia64/linux-xen/asm/ptrace.h
+--- xen-4.0.2-testing.orig/xen/include/asm-ia64/linux-xen/asm/ptrace.h
++++ xen-4.0.2-testing/xen/include/asm-ia64/linux-xen/asm/ptrace.h
@@ -278,7 +278,7 @@ struct switch_stack {
# define ia64_task_regs(t) (((struct pt_regs *) ((char *) (t) + IA64_STK_OFFSET)) - 1)
# define ia64_psr(regs) ((struct ia64_psr *) &(regs)->cr_ipsr)
@@ -170,10 +170,10 @@
# define guest_kernel_mode(regs) (ia64_psr(regs)->cpl == CONFIG_CPL0_EMUL)
# define vmx_guest_kernel_mode(regs) (ia64_psr(regs)->cpl == 0)
# define regs_increment_iip(regs) \
-Index: xen-4.0.1-testing/xen/include/asm-x86/hardirq.h
+Index: xen-4.0.2-testing/xen/include/asm-x86/hardirq.h
===================================================================
---- xen-4.0.1-testing.orig/xen/include/asm-x86/hardirq.h
-+++ xen-4.0.1-testing/xen/include/asm-x86/hardirq.h
+--- xen-4.0.2-testing.orig/xen/include/asm-x86/hardirq.h
++++ xen-4.0.2-testing/xen/include/asm-x86/hardirq.h
@@ -8,6 +8,7 @@ typedef struct {
unsigned long __softirq_pending;
unsigned int __local_irq_count;
@@ -182,10 +182,10 @@
} __cacheline_aligned irq_cpustat_t;
#include /* Standard mappings for irq_cpustat_t above */
-Index: xen-4.0.1-testing/xen/include/xen/irq_cpustat.h
+Index: xen-4.0.2-testing/xen/include/xen/irq_cpustat.h
===================================================================
---- xen-4.0.1-testing.orig/xen/include/xen/irq_cpustat.h
-+++ xen-4.0.1-testing/xen/include/xen/irq_cpustat.h
+--- xen-4.0.2-testing.orig/xen/include/xen/irq_cpustat.h
++++ xen-4.0.2-testing/xen/include/xen/irq_cpustat.h
@@ -26,5 +26,6 @@ extern irq_cpustat_t irq_stat[];
#define softirq_pending(cpu) __IRQ_STAT((cpu), __softirq_pending)
#define local_irq_count(cpu) __IRQ_STAT((cpu), __local_irq_count)
@@ -193,10 +193,10 @@
+#define state_dump_pending(cpu) __IRQ_STAT((cpu), __state_dump_pending)
#endif /* __irq_cpustat_h */
-Index: xen-4.0.1-testing/xen/include/xen/lib.h
+Index: xen-4.0.2-testing/xen/include/xen/lib.h
===================================================================
---- xen-4.0.1-testing.orig/xen/include/xen/lib.h
-+++ xen-4.0.1-testing/xen/include/xen/lib.h
+--- xen-4.0.2-testing.orig/xen/include/xen/lib.h
++++ xen-4.0.2-testing/xen/include/xen/lib.h
@@ -116,4 +116,7 @@ extern int tainted;
extern char *print_tainted(char *str);
extern void add_taint(unsigned);
@@ -205,10 +205,10 @@
+void dump_execstate(struct cpu_user_regs *);
+
#endif /* __LIB_H__ */
-Index: xen-4.0.1-testing/xen/include/xen/smp.h
+Index: xen-4.0.2-testing/xen/include/xen/smp.h
===================================================================
---- xen-4.0.1-testing.orig/xen/include/xen/smp.h
-+++ xen-4.0.1-testing/xen/include/xen/smp.h
+--- xen-4.0.2-testing.orig/xen/include/xen/smp.h
++++ xen-4.0.2-testing/xen/include/xen/smp.h
@@ -13,6 +13,8 @@ extern void smp_send_event_check_mask(co
#define smp_send_event_check_cpu(cpu) \
smp_send_event_check_mask(cpumask_of(cpu))
++++++ enable_more_nic_pxe.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/firmware/etherboot/Config
+Index: xen-4.0.2-testing/tools/firmware/etherboot/Config
===================================================================
---- xen-4.0.1-testing.orig/tools/firmware/etherboot/Config
-+++ xen-4.0.1-testing/tools/firmware/etherboot/Config
+--- xen-4.0.2-testing.orig/tools/firmware/etherboot/Config
++++ xen-4.0.2-testing/tools/firmware/etherboot/Config
@@ -1,5 +1,5 @@
-NICS = rtl8139 eepro100
@@ -9,10 +9,10 @@
CFLAGS += -UPXE_DHCP_STRICT
CFLAGS += -DPXE_DHCP_STRICT
-Index: xen-4.0.1-testing/tools/firmware/etherboot/eb-roms.h
+Index: xen-4.0.2-testing/tools/firmware/etherboot/eb-roms.h
===================================================================
---- xen-4.0.1-testing.orig/tools/firmware/etherboot/eb-roms.h
-+++ xen-4.0.1-testing/tools/firmware/etherboot/eb-roms.h
+--- xen-4.0.2-testing.orig/tools/firmware/etherboot/eb-roms.h
++++ xen-4.0.2-testing/tools/firmware/etherboot/eb-roms.h
@@ -6367,5 +6367,6149 @@ unsigned etherboot[] = {
0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
++++++ hibernate.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/firmware/hvmloader/acpi/dsdt.asl
+Index: xen-4.0.2-testing/tools/firmware/hvmloader/acpi/dsdt.asl
===================================================================
---- xen-4.0.1-testing.orig/tools/firmware/hvmloader/acpi/dsdt.asl
-+++ xen-4.0.1-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
@@ -30,21 +30,9 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2,
/*
* S3 (suspend-to-ram), S4 (suspend-to-disc) and S5 (power-off) type codes:
++++++ hotplug-block-losetup-a.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -17,8 +17,10 @@
tools/hotplug/Linux/block | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---- xen-4.0.1-testing.orig/tools/hotplug/Linux/block
-+++ xen-4.0.1-testing/tools/hotplug/Linux/block
+Index: xen-4.0.2-testing/tools/hotplug/Linux/block
+===================================================================
+--- xen-4.0.2-testing.orig/tools/hotplug/Linux/block
++++ xen-4.0.2-testing/tools/hotplug/Linux/block
@@ -279,8 +279,8 @@ mount it read-write in a guest domain."
fatal "Unable to lookup $file: dev: $dev inode: $inode"
fi
++++++ hv_extid_compatibility.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendConfig.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendConfig.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendConfig.py
-+++ xen-4.0.1-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 = {
'nographic': int,
'nomigrate': int,
@@ -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.1-testing/tools/python/xen/xend/image.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/image.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/image.py
-+++ xen-4.0.1-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
@@ -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.1-testing/tools/python/xen/xm/create.py
+Index: xen-4.0.2-testing/tools/python/xen/xm/create.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xm/create.py
-+++ xen-4.0.1-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
@@ -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.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -17,10 +17,10 @@
Signed-off-by: Kevin Wolf
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/block-qcow2.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/block-qcow2.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/block-qcow2.c
-+++ xen-4.0.1-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
@@ -916,7 +916,7 @@ static int alloc_cluster_link_l2(BlockDr
goto err;
++++++ ioemu-bdrv-open-CACHE_WB.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
-+++ xen-4.0.1-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
@@ -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.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
-+++ xen-4.0.1-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
@@ -360,6 +360,15 @@ static void qemu_send_responses(void* op
}
++++++ ioemu-blktap-fv-init.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_machine_fv.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_machine_fv.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_machine_fv.c
-+++ xen-4.0.1-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
#endif /* defined(MAPCACHE) */
++++++ ioemu-blktap-image-format.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -15,10 +15,10 @@
hw/xen_blktap.h | 14 ++++++++++++++
2 files changed, 33 insertions(+), 3 deletions(-)
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
-+++ xen-4.0.1-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
@@ -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.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.h
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.h
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.h
-+++ xen-4.0.1-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
@@ -53,4 +53,18 @@ typedef struct fd_list_entry {
int init_blktap(void);
++++++ ioemu-blktap-zero-size.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -12,10 +12,10 @@
hw/xen_blktap.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
-+++ xen-4.0.1-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
@@ -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.1-testing/tools/python/xen/xend/server/DevController.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/server/DevController.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/server/DevController.py
-+++ xen-4.0.1-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
@@ -155,7 +155,7 @@ class DevController:
(devid, self.deviceClass))
++++++ ioemu-debuginfo.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/Makefile
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/Makefile
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/Makefile
-+++ xen-4.0.1-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
@@ -243,7 +243,7 @@ endif
install: all $(if $(BUILD_DOCS),install-doc)
mkdir -p "$(DESTDIR)$(bindir)"
@@ -11,10 +11,10 @@
endif
ifneq ($(BLOBS),)
mkdir -p "$(DESTDIR)$(datadir)"
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/Makefile.target
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/Makefile.target
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/Makefile.target
-+++ xen-4.0.1-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:
install: all install-hook
++++++ ioemu-disable-emulated-ide-if-pv.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/qemu-xen.h
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-xen.h
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h
-+++ xen-4.0.1-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
@@ -1,6 +1,8 @@
#ifndef QEMU_XEN_H
#define QEMU_XEN_H
@@ -20,10 +20,10 @@
int xenstore_parse_disable_pf_config(void);
int xenstore_fd(void);
void xenstore_process_event(void *opaque);
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/vl.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/vl.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/vl.c
-+++ xen-4.0.1-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
if ((msg = xenbus_read(XBT_NIL, "domid", &domid_s)))
fprintf(stderr,"Can not read our own domid: %s\n", msg);
@@ -37,10 +37,10 @@
#endif /* CONFIG_STUBDOM */
/* we always create the cdrom drive, even if no disk is there */
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/xenstore.c
-+++ xen-4.0.1-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;
++++++ ioemu-disable-scsi.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_platform.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_platform.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_platform.c
-+++ xen-4.0.1-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
@@ -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.1-testing/tools/ioemu-qemu-xen/qemu-xen.h
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-xen.h
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h
-+++ xen-4.0.1-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
@@ -57,6 +57,7 @@ void unset_vram_mapping(void *opaque);
#endif
@@ -23,10 +23,10 @@
void destroy_hvm_domain(void);
void unregister_iomem(target_phys_addr_t start);
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/pci.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/pci.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/pci.c
-+++ xen-4.0.1-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)
}
}
++++++ ioemu-vnc-resize.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/vnc.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/vnc.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/vnc.c
-+++ xen-4.0.1-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
@@ -1734,6 +1734,25 @@ static int protocol_client_msg(VncState
}
++++++ libxen_permissive.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/libxen/src/xen_common.c
+Index: xen-4.0.2-testing/tools/libxen/src/xen_common.c
===================================================================
---- xen-4.0.1-testing.orig/tools/libxen/src/xen_common.c
-+++ xen-4.0.1-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
@@ -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.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -2,10 +2,10 @@
Signed-off-by: K. Y. Srinivasan
-Index: xen-4.0.1-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
+Index: xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
===================================================================
---- xen-4.0.1-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
-+++ xen-4.0.1-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
if (magic != XEN_IOPORT_MAGIC_VAL) {
++++++ minios-fixups.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/extras/mini-os/netfront.c
+Index: xen-4.0.2-testing/extras/mini-os/netfront.c
===================================================================
---- xen-4.0.1-testing.orig/extras/mini-os/netfront.c
-+++ xen-4.0.1-testing/extras/mini-os/netfront.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);
@@ -13,10 +13,10 @@
#define GRANT_INVALID_REF 0
-Index: xen-4.0.1-testing/extras/mini-os/lib/math.c
+Index: xen-4.0.2-testing/extras/mini-os/lib/math.c
===================================================================
---- xen-4.0.1-testing.orig/extras/mini-os/lib/math.c
-+++ xen-4.0.1-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
* and thus
* m = 4 - n <= 2
@@ -25,10 +25,10 @@
tmp.uq = uq;
u[0] = 0;
u[1] = HHALF(tmp.ul[H]);
-Index: xen-4.0.1-testing/extras/mini-os/arch/x86/mm.c
+Index: xen-4.0.2-testing/extras/mini-os/arch/x86/mm.c
===================================================================
---- xen-4.0.1-testing.orig/extras/mini-os/arch/x86/mm.c
-+++ xen-4.0.1-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.
++++++ multi-xvdp.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -5,10 +5,10 @@
loopback devices so more than one instance of bootloader can be run
concurrently.
-Index: xen-4.0.1-testing/tools/python/xen/util/blkif.py
+Index: xen-4.0.2-testing/tools/python/xen/util/blkif.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/util/blkif.py
-+++ xen-4.0.1-testing/tools/python/xen/util/blkif.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
@@ -21,10 +21,10 @@
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.1-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.1-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
from xen.xend.XendDSCSI import XendDSCSI, XendDSCSI_HBA
@@ -34,7 +34,7 @@
xc = xen.lowlevel.xc.xc()
xoptions = XendOptions.instance()
-@@ -3304,20 +3304,27 @@ class XendDomainInfo:
+@@ -3305,33 +3305,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.
@@ -49,9 +49,11 @@
-
- from xen.xend import XendDomain
- dom0 = XendDomain.instance().privilegedDomain()
+- mounted_vbd_uuid = dom0.create_vbd(vbd, disk);
- vbd_uuid = dom0.create_vbd(vbd, disk)
- dom0._waitForDeviceFrontUUID(vbd_uuid)
- fn = BOOTLOADER_LOOPBACK_DEVICE
+-
+ # Try all possible loopback_devices
+ for loopback_device in BOOTLOADER_LOOPBACK_DEVICES:
+ log.info("Mounting %s on %s." % (fn, loopback_device))
@@ -73,10 +75,9 @@
+ raise
+ else:
+ raise
-
try:
blcfg = bootloader(blexec, fn, self, False,
-@@ -3325,11 +3332,11 @@ class XendDomainInfo:
+ bootloader_args, kernel, ramdisk, args)
finally:
if mounted:
log.info("Unmounting %s from %s." %
@@ -88,6 +89,6 @@
else:
- dom0.destroyDevice('vbd', BOOTLOADER_LOOPBACK_DEVICE, rm_cfg = True)
+ dom0.destroyDevice('vbd', loopback_device, rm_cfg = True)
-
if blcfg is None:
msg = "Had a bootloader specified, but can't find disk"
+ log.error(msg)
++++++ network-nat-open-SuSEfirewall2-FORWARD.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,9 +1,9 @@
Open SuSEfirewall2 FORWARD rule when use xen nat
-Index: xen-4.0.1-testing/tools/hotplug/Linux/network-nat
+Index: xen-4.0.2-testing/tools/hotplug/Linux/network-nat
===================================================================
---- xen-4.0.1-testing.orig/tools/hotplug/Linux/network-nat
-+++ xen-4.0.1-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
@@ -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.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/hotplug/Linux/network-nat
+Index: xen-4.0.2-testing/tools/hotplug/Linux/network-nat
===================================================================
---- xen-4.0.1-testing.orig/tools/hotplug/Linux/network-nat
-+++ xen-4.0.1-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
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
++++++ network-route.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/hotplug/Linux/network-route
+Index: xen-4.0.2-testing/tools/hotplug/Linux/network-route
===================================================================
---- xen-4.0.1-testing.orig/tools/hotplug/Linux/network-route
-+++ xen-4.0.1-testing/tools/hotplug/Linux/network-route
+--- xen-4.0.2-testing.orig/tools/hotplug/Linux/network-route
++++ xen-4.0.2-testing/tools/hotplug/Linux/network-route
@@ -22,7 +22,7 @@ dir=$(dirname "$0")
evalVariables "$@"
++++++ popen2-argument-fix.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/python/xen/util/blkif.py
+Index: xen-4.0.2-testing/tools/python/xen/util/blkif.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/util/blkif.py
-+++ xen-4.0.1-testing/tools/python/xen/util/blkif.py
+--- xen-4.0.2-testing.orig/tools/python/xen/util/blkif.py
++++ xen-4.0.2-testing/tools/python/xen/util/blkif.py
@@ -81,7 +81,7 @@ def parse_uname(uname):
if typ == "drbd":
++++++ pv-driver-build.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild
+Index: xen-4.0.2-testing/unmodified_drivers/linux-2.6/blkfront/Kbuild
===================================================================
---- xen-4.0.1-testing.orig/unmodified_drivers/linux-2.6/blkfront/Kbuild
-+++ xen-4.0.1-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
@@ -3,3 +3,4 @@ include $(M)/overrides.mk
obj-m += xen-vbd.o
++++++ pvdrv-import-shared-info.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
+Index: xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
===================================================================
---- xen-4.0.1-testing.orig/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
-+++ xen-4.0.1-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
@@ -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.1-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
+Index: xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
===================================================================
---- xen-4.0.1-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
-+++ xen-4.0.1-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
@@ -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.1-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h
+Index: xen-4.0.2-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h
===================================================================
---- xen-4.0.1-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.h
-+++ xen-4.0.1-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
@@ -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.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_platform.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_platform.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_platform.c
-+++ xen-4.0.1-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
@@ -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.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/ide.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/ide.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/ide.c
-+++ xen-4.0.1-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
@@ -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.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/ne2000.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/ne2000.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/ne2000.c
-+++ xen-4.0.1-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
@@ -218,7 +218,7 @@ static int ne2000_can_receive(void *opaq
NE2000State *s = opaque;
@@ -11,10 +11,10 @@
return !ne2000_buffer_full(s);
}
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/pc.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/pc.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/pc.c
-+++ xen-4.0.1-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
case 0x400:
case 0x401:
++++++ serial-split.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/misc/serial-split/Makefile
+Index: xen-4.0.2-testing/tools/misc/serial-split/Makefile
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/misc/serial-split/Makefile
++++ xen-4.0.2-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.1-testing/tools/misc/serial-split/serial-split.c
+Index: xen-4.0.2-testing/tools/misc/serial-split/serial-split.c
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/misc/serial-split/serial-split.c
++++ xen-4.0.2-testing/tools/misc/serial-split/serial-split.c
@@ -0,0 +1,422 @@
+/*
+ * serial-split.c
++++++ snapshot-ioemu-delete.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/xenstore.c
-+++ xen-4.0.1-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_
}
@@ -21,10 +21,10 @@
} else if (!strncmp(command, "continue", len)) {
fprintf(logfile, "dm-command: continue after state save\n");
xen_pause_requested = 0;
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/savevm.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/savevm.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/savevm.c
-+++ xen-4.0.1-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:
return ret;
}
@@ -61,10 +61,10 @@
#ifndef CONFIG_DM
void do_savevm(const char *name)
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/qemu-xen.h
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-xen.h
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h
-+++ xen-4.0.1-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
@@ -42,6 +42,7 @@ enum {
/* xen-vl-extra.c */
++++++ snapshot-ioemu-restore.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/xenstore.c
-+++ xen-4.0.1-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
@@ -103,6 +103,8 @@ int xenstore_watch_new_callback(const ch
}
++++++ snapshot-ioemu-save.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/savevm.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/savevm.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/savevm.c
-+++ xen-4.0.1-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
@@ -28,6 +28,7 @@
#include "sysemu.h"
#include "qemu-timer.h"
@@ -97,10 +97,10 @@
#ifndef CONFIG_DM
void do_savevm(const char *name)
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/i386-dm/helper2.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/i386-dm/helper2.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/i386-dm/helper2.c
-+++ xen-4.0.1-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
@@ -112,6 +112,9 @@ int send_vcpu = 0;
//the evtchn port for polling the notification,
evtchn_port_t *ioreq_local_port;
@@ -167,10 +167,10 @@
/* Wait to be allowed to continue */
while (xen_pause_requested) {
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/qemu-xen.h
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/qemu-xen.h
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/qemu-xen.h
-+++ xen-4.0.1-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
@@ -34,6 +34,15 @@ void qemu_invalidate_map_cache(void)
#define mapcache_lock() ((void)0)
#define mapcache_unlock() ((void)0)
@@ -195,10 +195,10 @@
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.1-testing/tools/ioemu-qemu-xen/xenstore.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/xenstore.c
-+++ xen-4.0.1-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
@@ -17,6 +17,7 @@
#include "exec-all.h"
++++++ snapshot-without-pv-fix.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.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.1-testing/tools/blktap/drivers/blktapctrl.c
+Index: xen-4.0.2-testing/tools/blktap/drivers/blktapctrl.c
===================================================================
---- xen-4.0.1-testing.orig/tools/blktap/drivers/blktapctrl.c
-+++ xen-4.0.1-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
@@ -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.1-testing/tools/blktap/lib/blkif.c
+Index: xen-4.0.2-testing/tools/blktap/lib/blkif.c
===================================================================
---- xen-4.0.1-testing.orig/tools/blktap/lib/blkif.c
-+++ xen-4.0.1-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
@@ -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.1-testing/tools/blktap/lib/blktaplib.h
+Index: xen-4.0.2-testing/tools/blktap/lib/blktaplib.h
===================================================================
---- xen-4.0.1-testing.orig/tools/blktap/lib/blktaplib.h
-+++ xen-4.0.1-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
@@ -38,6 +38,7 @@
#include
#include
@@ -197,10 +197,10 @@
/* disk driver types */
#define MAX_DISK_TYPES 20
-Index: xen-4.0.1-testing/tools/blktap/lib/xenbus.c
+Index: xen-4.0.2-testing/tools/blktap/lib/xenbus.c
===================================================================
---- xen-4.0.1-testing.orig/tools/blktap/lib/xenbus.c
-+++ xen-4.0.1-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
@@ -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.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
-+++ xen-4.0.1-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
@@ -35,6 +35,8 @@
#ifndef QEMU_TOOL
#include "qemu-common.h"
@@ -378,10 +378,10 @@
default:
break;
}
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.h
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.h
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.h
-+++ xen-4.0.1-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
@@ -40,7 +40,8 @@ struct td_state {
void *fd_entry;
uint64_t sector_size;
++++++ snapshot-xend.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/python/xen/xend/image.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/image.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/image.py
-+++ xen-4.0.1-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
@@ -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.1-testing/tools/python/xen/xend/server/blkif.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/server/blkif.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/server/blkif.py
-+++ xen-4.0.1-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
@@ -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.1-testing/tools/python/xen/xend/server/SrvDomain.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/server/SrvDomain.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/server/SrvDomain.py
-+++ xen-4.0.1-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
@@ -95,6 +95,31 @@ class SrvDomain(SrvDir):
def do_save(self, _, req):
return self.xd.domain_save(self.dom.domid, req.args['file'][0])
@@ -103,10 +103,10 @@
return self.perform(req)
#
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendCheckpoint.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendCheckpoint.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendCheckpoint.py
-+++ xen-4.0.1-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
@@ -65,7 +65,7 @@ def insert_after(list, pred, value):
return
@@ -331,10 +331,10 @@
if not paused:
dominfo.unpause()
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendConfig.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendConfig.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendConfig.py
-+++ xen-4.0.1-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 = {
'memory_sharing': int,
'Description': str,
@@ -343,10 +343,10 @@
}
# List of legacy configuration keys that have no equivalent in the
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomain.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomain.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomain.py
-+++ xen-4.0.1-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
@@ -53,6 +53,7 @@ from xen.xend.xenstore.xstransact import
from xen.xend.xenstore.xswatch import xswatch
from xen.util import mkdir, rwlock
@@ -561,10 +561,10 @@
def domain_pincpu(self, domid, vcpu, cpumap):
"""Set which cpus vcpu can use
-Index: xen-4.0.1-testing/tools/python/xen/xm/main.py
+Index: xen-4.0.2-testing/tools/python/xen/xm/main.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xm/main.py
-+++ xen-4.0.1-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
@@ -123,6 +123,14 @@ SUBCOMMAND_HELP = {
'Restore a domain from a saved state.'),
'save' : ('[-c|-f] <Domain> <CheckpointFile>',
@@ -686,10 +686,10 @@
"shutdown": xm_shutdown,
"start": xm_start,
"sysrq": xm_sysrq,
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.1-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:
self._setSchedParams()
self._storeVmDetails()
++++++ stdvga-cache.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:20.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:20.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/xen/arch/x86/hvm/stdvga.c
+Index: xen-4.0.2-testing/xen/arch/x86/hvm/stdvga.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/hvm/stdvga.c
-+++ xen-4.0.1-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
@@ -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.fJ9m6Q/_old 2011-02-07 12:20:21.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:21.000000000 +0100
@@ -2,10 +2,10 @@
Signed-off-by: K. Y. Srinivasan
-Index: xen-4.0.1-testing/unmodified_drivers/linux-2.6/Module.supported
+Index: xen-4.0.2-testing/unmodified_drivers/linux-2.6/Module.supported
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/unmodified_drivers/linux-2.6/Module.supported
++++ xen-4.0.2-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.fJ9m6Q/_old 2011-02-07 12:20:21.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:21.000000000 +0100
@@ -11,10 +11,10 @@
tapdisk-ioemu.c | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/tapdisk-ioemu.c
-+++ xen-4.0.1-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
@@ -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.fJ9m6Q/_old 2011-02-07 12:20:21.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:21.000000000 +0100
@@ -16,10 +16,10 @@
tapdisk-ioemu.c | 13 ++++++++++---
2 files changed, 14 insertions(+), 4 deletions(-)
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_blktap.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_blktap.c
-+++ xen-4.0.1-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
@@ -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.1-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/tapdisk-ioemu.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/tapdisk-ioemu.c
-+++ xen-4.0.1-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
@@ -14,6 +14,7 @@ extern void qemu_aio_init(void);
extern void qemu_aio_poll(void);
++++++ tmp_build.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:21.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:21.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/xenstore/Makefile
+Index: xen-4.0.2-testing/tools/xenstore/Makefile
===================================================================
---- xen-4.0.1-testing.orig/tools/xenstore/Makefile
-+++ xen-4.0.1-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
xenstore: xenstore_client.o $(LIBXENSTORE)
++++++ tools-gdbserver-build.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:21.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:21.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in
+Index: xen-4.0.2-testing/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in
===================================================================
---- xen-4.0.1-testing.orig/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in
-+++ xen-4.0.1-testing/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in
+--- xen-4.0.2-testing.orig/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in
++++ xen-4.0.2-testing/tools/debugger/gdb/gdb-6.2.1-xen-sparse/gdb/gdbserver/Makefile.in
@@ -90,7 +90,7 @@ INCLUDE_CFLAGS = -I. -I${srcdir} -I$(src
GLOBAL_CFLAGS = ${MT_CFLAGS} ${MH_CFLAGS}
#PROFILE_CFLAGS = -pg
++++++ tools-kboot.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:21.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:21.000000000 +0100
@@ -13,10 +13,10 @@
tools/kboot/select-kernel | 59 +
9 files changed, 2111 insertions(+)
-Index: xen-4.0.1-testing/buildconfigs/linux-defconfig_xenUboot_x86_32
+Index: xen-4.0.2-testing/buildconfigs/linux-defconfig_xenUboot_x86_32
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/buildconfigs/linux-defconfig_xenUboot_x86_32
++++ xen-4.0.2-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.1-testing/buildconfigs/linux-defconfig_xenUboot_x86_64
+Index: xen-4.0.2-testing/buildconfigs/linux-defconfig_xenUboot_x86_64
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/buildconfigs/linux-defconfig_xenUboot_x86_64
++++ xen-4.0.2-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.1-testing/buildconfigs/mk.linux-2.6-xenUboot
+Index: xen-4.0.2-testing/buildconfigs/mk.linux-2.6-xenUboot
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/buildconfigs/mk.linux-2.6-xenUboot
++++ xen-4.0.2-testing/buildconfigs/mk.linux-2.6-xenUboot
@@ -0,0 +1,2 @@
+EXTRAVERSION = xenUboot
+include buildconfigs/mk.linux-2.6-xen
-Index: xen-4.0.1-testing/tools/kboot/Makefile
+Index: xen-4.0.2-testing/tools/kboot/Makefile
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/kboot/Makefile
++++ xen-4.0.2-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.1-testing/tools/kboot/README
+Index: xen-4.0.2-testing/tools/kboot/README
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/kboot/README
++++ xen-4.0.2-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.1-testing/tools/kboot/init
+Index: xen-4.0.2-testing/tools/kboot/init
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/kboot/init
++++ xen-4.0.2-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.1-testing/tools/kboot/mkinitramfs
+Index: xen-4.0.2-testing/tools/kboot/mkinitramfs
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/kboot/mkinitramfs
++++ xen-4.0.2-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.1-testing/tools/kboot/select-kernel
+Index: xen-4.0.2-testing/tools/kboot/select-kernel
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/kboot/select-kernel
++++ xen-4.0.2-testing/tools/kboot/select-kernel
@@ -0,0 +1,59 @@
+#!/bin/sh
+
@@ -2127,10 +2127,10 @@
+msg "using $kernelname"
+echo "$kernelname"
+
-Index: xen-4.0.1-testing/make-kboot
+Index: xen-4.0.2-testing/make-kboot
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/make-kboot
++++ xen-4.0.2-testing/make-kboot
@@ -0,0 +1,37 @@
+#!/bin/sh
+
++++++ tools-xc_kexec.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:21.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:21.000000000 +0100
@@ -23,10 +23,10 @@
tools/xcutils/xc_kexec.c | 503 +++++++++++++++
19 files changed, 4988 insertions(+), 2 deletions(-)
-Index: xen-4.0.1-testing/tools/xcutils/Makefile
+Index: xen-4.0.2-testing/tools/xcutils/Makefile
===================================================================
---- xen-4.0.1-testing.orig/tools/xcutils/Makefile
-+++ xen-4.0.1-testing/tools/xcutils/Makefile
+--- xen-4.0.2-testing.orig/tools/xcutils/Makefile
++++ xen-4.0.2-testing/tools/xcutils/Makefile
@@ -14,7 +14,7 @@ include $(XEN_ROOT)/tools/Rules.mk
CFLAGS += -Werror
CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
@@ -55,10 +55,10 @@
+ make -C helper clean
-include $(DEPS)
-Index: xen-4.0.1-testing/tools/xcutils/helper/Makefile
+Index: xen-4.0.2-testing/tools/xcutils/helper/Makefile
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xcutils/helper/Makefile
++++ xen-4.0.2-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.1-testing/tools/xcutils/helper/console.c
+Index: xen-4.0.2-testing/tools/xcutils/helper/console.c
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xcutils/helper/console.c
++++ xen-4.0.2-testing/tools/xcutils/helper/console.c
@@ -0,0 +1,69 @@
+#include
+
@@ -173,10 +173,10 @@
+
+ return printed_len;
+}
-Index: xen-4.0.1-testing/tools/xcutils/helper/ctype.c
+Index: xen-4.0.2-testing/tools/xcutils/helper/ctype.c
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xcutils/helper/ctype.c
++++ xen-4.0.2-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.1-testing/tools/xcutils/helper/ctype.h
+Index: xen-4.0.2-testing/tools/xcutils/helper/ctype.h
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xcutils/helper/ctype.h
++++ xen-4.0.2-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.1-testing/tools/xcutils/helper/helper.h
+Index: xen-4.0.2-testing/tools/xcutils/helper/helper.h
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xcutils/helper/helper.h
++++ xen-4.0.2-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.1-testing/tools/xcutils/helper/main.c
+Index: xen-4.0.2-testing/tools/xcutils/helper/main.c
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xcutils/helper/main.c
++++ xen-4.0.2-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.1-testing/tools/xcutils/helper/make-offsets.c
+Index: xen-4.0.2-testing/tools/xcutils/helper/make-offsets.c
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xcutils/helper/make-offsets.c
++++ xen-4.0.2-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.1-testing/tools/xcutils/helper/printk.c
+Index: xen-4.0.2-testing/tools/xcutils/helper/printk.c
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xcutils/helper/printk.c
++++ xen-4.0.2-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.1-testing/tools/xcutils/helper/string.c
+Index: xen-4.0.2-testing/tools/xcutils/helper/string.c
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xcutils/helper/string.c
++++ xen-4.0.2-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.1-testing/tools/xcutils/helper/vsprintf.c
+Index: xen-4.0.2-testing/tools/xcutils/helper/vsprintf.c
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xcutils/helper/vsprintf.c
++++ xen-4.0.2-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.1-testing/tools/xcutils/helper/x86_32/div64.h
+Index: xen-4.0.2-testing/tools/xcutils/helper/x86_32/div64.h
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xcutils/helper/x86_32/div64.h
++++ xen-4.0.2-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.1-testing/tools/xcutils/helper/x86_32/entry.S
+Index: xen-4.0.2-testing/tools/xcutils/helper/x86_32/entry.S
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xcutils/helper/x86_32/entry.S
++++ xen-4.0.2-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.1-testing/tools/xcutils/helper/x86_32/hypercall.h
+Index: xen-4.0.2-testing/tools/xcutils/helper/x86_32/hypercall.h
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xcutils/helper/x86_32/hypercall.h
++++ xen-4.0.2-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.1-testing/tools/xcutils/helper/x86_64/div64.h
+Index: xen-4.0.2-testing/tools/xcutils/helper/x86_64/div64.h
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xcutils/helper/x86_64/div64.h
++++ xen-4.0.2-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.1-testing/tools/xcutils/helper/x86_64/entry.S
+Index: xen-4.0.2-testing/tools/xcutils/helper/x86_64/entry.S
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xcutils/helper/x86_64/entry.S
++++ xen-4.0.2-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.1-testing/tools/xcutils/helper/x86_64/hypercall.h
+Index: xen-4.0.2-testing/tools/xcutils/helper/x86_64/hypercall.h
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xcutils/helper/x86_64/hypercall.h
++++ xen-4.0.2-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.1-testing/tools/xcutils/kexec-syscall.h
+Index: xen-4.0.2-testing/tools/xcutils/kexec-syscall.h
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xcutils/kexec-syscall.h
++++ xen-4.0.2-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.1-testing/tools/xcutils/xc_kexec.c
+Index: xen-4.0.2-testing/tools/xcutils/xc_kexec.c
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/xcutils/xc_kexec.c
++++ xen-4.0.2-testing/tools/xcutils/xc_kexec.c
@@ -0,0 +1,503 @@
+#include
+#include
++++++ udev-rules.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:21.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:21.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/hotplug/Linux/xen-backend.rules
+Index: xen-4.0.2-testing/tools/hotplug/Linux/xen-backend.rules
===================================================================
---- xen-4.0.1-testing.orig/tools/hotplug/Linux/xen-backend.rules
-+++ xen-4.0.1-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"
++++++ usb-list.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:21.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:21.000000000 +0100
@@ -15,10 +15,10 @@
http://www.gossamer-threads.com/lists/xen/devel/181021?search_string=usb-lis...
-Index: xen-4.0.1-testing/tools/python/xen/xm/main.py
+Index: xen-4.0.2-testing/tools/python/xen/xm/main.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xm/main.py
-+++ xen-4.0.1-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):
ni = parse_dev_info(x[1])
ni['idx'] = int(x[0])
++++++ vif-bridge-no-iptables.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:21.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:21.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/hotplug/Linux/vif-bridge
+Index: xen-4.0.2-testing/tools/hotplug/Linux/vif-bridge
===================================================================
---- xen-4.0.1-testing.orig/tools/hotplug/Linux/vif-bridge
-+++ xen-4.0.1-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
;;
esac
++++++ vif-route-ifup.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:21.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:21.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/hotplug/Linux/vif-route-ifup
+Index: xen-4.0.2-testing/tools/hotplug/Linux/vif-route-ifup
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/hotplug/Linux/vif-route-ifup
++++ xen-4.0.2-testing/tools/hotplug/Linux/vif-route-ifup
@@ -0,0 +1,34 @@
+#!/bin/bash
+#============================================================================
@@ -37,10 +37,10 @@
+then
+ success
+fi
-Index: xen-4.0.1-testing/tools/examples/xend-config.sxp
+Index: xen-4.0.2-testing/tools/examples/xend-config.sxp
===================================================================
---- xen-4.0.1-testing.orig/tools/examples/xend-config.sxp
-+++ xen-4.0.1-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 @@
#(network-script network-route)
#(vif-script vif-route)
@@ -68,10 +68,10 @@
## 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.1-testing/tools/hotplug/Linux/Makefile
+Index: xen-4.0.2-testing/tools/hotplug/Linux/Makefile
===================================================================
---- xen-4.0.1-testing.orig/tools/hotplug/Linux/Makefile
-+++ xen-4.0.1-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 script dir and scripts to go there.
++++++ x86-cpufreq-report.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:21.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:21.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/xen/arch/x86/platform_hypercall.c
+Index: xen-4.0.2-testing/xen/arch/x86/platform_hypercall.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/platform_hypercall.c
-+++ xen-4.0.1-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
#include
@@ -19,7 +19,7 @@
struct xen_platform_op curop, *op = &curop;
if ( !IS_PRIV(current->domain) )
-@@ -489,6 +490,24 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe
+@@ -488,6 +489,24 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xe
op->u.mem_add.epfn,
op->u.mem_add.pxm);
break;
@@ -44,10 +44,10 @@
default:
ret = -ENOSYS;
break;
-Index: xen-4.0.1-testing/xen/include/public/platform.h
+Index: xen-4.0.2-testing/xen/include/public/platform.h
===================================================================
---- xen-4.0.1-testing.orig/xen/include/public/platform.h
-+++ xen-4.0.1-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
@@ -355,6 +355,14 @@ struct xenpf_mem_hotadd
uint32_t flags;
};
++++++ x86-extra-trap-info.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:21.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:21.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/xen/arch/x86/x86_32/entry.S
+Index: xen-4.0.2-testing/xen/arch/x86/x86_32/entry.S
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/x86_32/entry.S
-+++ xen-4.0.1-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
movl %eax,UREGS_eip+4(%esp)
ret
@@ -46,10 +46,10 @@
domain_crash_synchronous:
pushl $domain_crash_synchronous_string
call printk
-Index: xen-4.0.1-testing/xen/arch/x86/x86_64/entry.S
+Index: xen-4.0.2-testing/xen/arch/x86/x86_64/entry.S
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/x86_64/entry.S
-+++ xen-4.0.1-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:
movq %rax,UREGS_rip+8(%rsp)
ret
++++++ x86-ioapic-ack-default.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:21.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:21.000000000 +0100
@@ -1,10 +1,10 @@
Change default IO-APIC ack mode for single IO-APIC systems to old-style.
-Index: xen-4.0.1-testing/xen/arch/x86/io_apic.c
+Index: xen-4.0.2-testing/xen/arch/x86/io_apic.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/io_apic.c
-+++ xen-4.0.1-testing/xen/arch/x86/io_apic.c
-@@ -1559,7 +1559,7 @@ static unsigned int startup_level_ioapic
+--- 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
return 0; /* don't check for pending */
}
@@ -13,7 +13,7 @@
static void setup_ioapic_ack(char *s)
{
if ( !strcmp(s, "old") )
-@@ -2075,6 +2075,8 @@ void __init setup_IO_APIC(void)
+@@ -2067,6 +2067,8 @@ void __init setup_IO_APIC(void)
else
io_apic_irqs = ~PIC_IRQS;
++++++ x86-show-page-walk-early.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:21.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:21.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/xen/arch/x86/mm.c
+Index: xen-4.0.2-testing/xen/arch/x86/mm.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/mm.c
-+++ xen-4.0.1-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);
@@ -11,11 +11,11 @@
#define l1_disallow_mask(d) \
((d != dom_io) && \
(rangeset_is_empty((d)->iomem_caps) && \
-Index: xen-4.0.1-testing/xen/arch/x86/traps.c
+Index: xen-4.0.2-testing/xen/arch/x86/traps.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/traps.c
-+++ xen-4.0.1-testing/xen/arch/x86/traps.c
-@@ -1342,6 +1342,7 @@ asmlinkage void do_early_page_fault(stru
+--- 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
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,10 +23,10 @@
printk("Stack dump: ");
while ( ((long)stk & ((PAGE_SIZE - 1) & ~(BYTES_PER_LONG - 1))) != 0 )
printk("%p ", _p(*stk++));
-Index: xen-4.0.1-testing/xen/arch/x86/x86_32/mm.c
+Index: xen-4.0.2-testing/xen/arch/x86/x86_32/mm.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/x86_32/mm.c
-+++ xen-4.0.1-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)
#undef CNT
#undef MFN
@@ -36,10 +36,10 @@
/* Create page tables for ioremap()/map_domain_page_global(). */
for ( i = 0; i < (IOREMAP_MBYTES >> (L2_PAGETABLE_SHIFT - 20)); i++ )
{
-Index: xen-4.0.1-testing/xen/arch/x86/x86_32/traps.c
+Index: xen-4.0.2-testing/xen/arch/x86/x86_32/traps.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/x86_32/traps.c
-+++ xen-4.0.1-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)
l3t += (cr3 & 0xFE0UL) >> 3;
l3e = l3t[l3_table_offset(addr)];
@@ -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.1-testing/xen/arch/x86/x86_64/mm.c
+Index: xen-4.0.2-testing/xen/arch/x86/x86_64/mm.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/x86_64/mm.c
-+++ xen-4.0.1-testing/xen/arch/x86/x86_64/mm.c
-@@ -725,6 +725,8 @@ void __init paging_init(void)
+--- 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)
#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.1-testing/xen/arch/x86/x86_64/traps.c
+Index: xen-4.0.2-testing/xen/arch/x86/x86_64/traps.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/x86_64/traps.c
-+++ xen-4.0.1-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
@@ -176,7 +176,8 @@ void show_page_walk(unsigned long addr)
l4t = mfn_to_virt(mfn);
l4e = l4t[l4_table_offset(addr)];
@@ -127,10 +127,10 @@
printk(" L1[0x%03lx] = %"PRIpte" %016lx\n",
l1_table_offset(addr), l1e_get_intpte(l1e), pfn);
}
-Index: xen-4.0.1-testing/xen/include/asm-x86/mm.h
+Index: xen-4.0.2-testing/xen/include/asm-x86/mm.h
===================================================================
---- xen-4.0.1-testing.orig/xen/include/asm-x86/mm.h
-+++ xen-4.0.1-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);
#define SHARED_M2P_ENTRY (~0UL - 1UL)
#define SHARED_M2P(_e) ((_e) == SHARED_M2P_ENTRY)
++++++ xen-4.0.1-testing-src.tar.bz2 -> xen-4.0.2-testing-src.tar.bz2 ++++++
xen/xen-4.0.1-testing-src.tar.bz2 /mounts/work_src_done/STABLE/xen/xen-4.0.2-testing-src.tar.bz2 differ: char 11, line 1
++++++ xen-api-auth.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:21.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:21.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendAuthSessions.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendAuthSessions.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendAuthSessions.py
-+++ xen-4.0.1-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
@@ -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.fJ9m6Q/_old 2011-02-07 12:20:21.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:21.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/xen/Makefile
+Index: xen-4.0.2-testing/xen/Makefile
===================================================================
---- xen-4.0.1-testing.orig/xen/Makefile
-+++ xen-4.0.1-testing/xen/Makefile
+--- xen-4.0.2-testing.orig/xen/Makefile
++++ xen-4.0.2-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.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,8 +1,17 @@
-Index: xen-4.0.1-testing/Config.mk
+Index: xen-4.0.2-testing/Config.mk
===================================================================
---- xen-4.0.1-testing.orig/Config.mk
-+++ xen-4.0.1-testing/Config.mk
-@@ -182,9 +182,9 @@ CONFIG_OCAML_XENSTORED ?= n
+--- xen-4.0.2-testing.orig/Config.mk
++++ xen-4.0.2-testing/Config.mk
+@@ -165,7 +165,7 @@ endif
+ # Specify which qemu-dm to use. This may be `ioemu' to use the old
+ # Mercurial in-tree version, or a local directory, or a git URL.
+ # CONFIG_QEMU ?= ../qemu-xen.git
+-CONFIG_QEMU ?= $(QEMU_REMOTE)
++CONFIG_QEMU ?= ioemu-qemu-xen
+
+ QEMU_TAG := xen-4.0.2-rc1
+ #QEMU_TAG ?= 6d5b7ee3acfe8cc10681d2583a38398f7470ec2a
+@@ -181,9 +181,9 @@ CONFIG_OCAML_XENSTORED ?= n
# Optional components
XENSTAT_XENTOP ?= y
VTPM_TOOLS ?= n
@@ -14,10 +23,10 @@
--include $(XEN_ROOT)/.config
+#-include $(XEN_ROOT)/.config
-Index: xen-4.0.1-testing/tools/libxc/Makefile
+Index: xen-4.0.2-testing/tools/libxc/Makefile
===================================================================
---- xen-4.0.1-testing.orig/tools/libxc/Makefile
-+++ xen-4.0.1-testing/tools/libxc/Makefile
+--- xen-4.0.2-testing.orig/tools/libxc/Makefile
++++ xen-4.0.2-testing/tools/libxc/Makefile
@@ -169,10 +169,10 @@ zlib-options = $(shell \
fi) | grep $(1))
endif
++++++ xen-destdir.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/docs/Makefile
+Index: xen-4.0.2-testing/docs/Makefile
===================================================================
---- xen-4.0.1-testing.orig/docs/Makefile
-+++ xen-4.0.1-testing/docs/Makefile
+--- xen-4.0.2-testing.orig/docs/Makefile
++++ xen-4.0.2-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.1-testing/tools/security/Makefile
+Index: xen-4.0.2-testing/tools/security/Makefile
===================================================================
---- xen-4.0.1-testing.orig/tools/security/Makefile
-+++ xen-4.0.1-testing/tools/security/Makefile
+--- xen-4.0.2-testing.orig/tools/security/Makefile
++++ xen-4.0.2-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.1-testing/tools/pygrub/Makefile
+Index: xen-4.0.2-testing/tools/pygrub/Makefile
===================================================================
---- xen-4.0.1-testing.orig/tools/pygrub/Makefile
-+++ xen-4.0.1-testing/tools/pygrub/Makefile
+--- xen-4.0.2-testing.orig/tools/pygrub/Makefile
++++ xen-4.0.2-testing/tools/pygrub/Makefile
@@ -11,7 +11,7 @@ build:
.PHONY: install
install: all
@@ -50,10 +50,10 @@
$(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(BINDIR)/pygrub
$(INSTALL_DIR) $(DESTDIR)/var/run/xend/boot
-Index: xen-4.0.1-testing/tools/python/Makefile
+Index: xen-4.0.2-testing/tools/python/Makefile
===================================================================
---- xen-4.0.1-testing.orig/tools/python/Makefile
-+++ xen-4.0.1-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)
.PHONY: install
install: install-messages install-dtd
@@ -63,10 +63,10 @@
install-dtd: all
$(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/xen
-Index: xen-4.0.1-testing/tools/xenstore/Makefile
+Index: xen-4.0.2-testing/tools/xenstore/Makefile
===================================================================
---- xen-4.0.1-testing.orig/tools/xenstore/Makefile
-+++ xen-4.0.1-testing/tools/xenstore/Makefile
+--- xen-4.0.2-testing.orig/tools/xenstore/Makefile
++++ xen-4.0.2-testing/tools/xenstore/Makefile
@@ -10,6 +10,7 @@ CFLAGS += $(CFLAGS_libxenctrl)
CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm xenstore-chmod
@@ -121,10 +121,10 @@
$(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.1-testing/tools/hotplug/Linux/Makefile
+Index: xen-4.0.2-testing/tools/hotplug/Linux/Makefile
===================================================================
---- xen-4.0.1-testing.orig/tools/hotplug/Linux/Makefile
-+++ xen-4.0.1-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
UDEV_RULES_DIR = $(CONFIG_DIR)/udev
UDEV_RULES = xen-backend.rules xend.rules
++++++ xen-disable-qemu-monitor.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -5,10 +5,10 @@
commands that can read/write dom0's state.
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/monitor.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/monitor.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/monitor.c
-+++ xen-4.0.1-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
@@ -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.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/python/xen/util/blkif.py
+Index: xen-4.0.2-testing/tools/python/xen/util/blkif.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/util/blkif.py
-+++ xen-4.0.1-testing/tools/python/xen/util/blkif.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
@@ -35,10 +35,10 @@
def mount_mode(name):
mode = None
-Index: xen-4.0.1-testing/tools/python/xen/xend/server/DevController.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/server/DevController.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/server/DevController.py
-+++ xen-4.0.1-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
@@ -592,6 +592,31 @@ class DevController:
return (Missing, None)
@@ -71,10 +71,10 @@
def backendPath(self, backdom, devid):
"""Construct backend path given the backend domain and device id.
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendBootloader.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendBootloader.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendBootloader.py
-+++ xen-4.0.1-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
@@ -12,7 +12,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
@@ -112,10 +112,10 @@
log.error(msg)
raise VmError(msg)
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.1-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
@@ -145,12 +145,13 @@
# If this is a drbd volume, check if we need to activate it
if disk.find(":") != -1:
-@@ -3245,8 +3249,17 @@ class XendDomainInfo:
+@@ -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
@@ -165,26 +166,28 @@
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
-@@ -3262,7 +3275,8 @@ class XendDomainInfo:
-
+@@ -3264,7 +3277,8 @@ class XendDomainInfo:
from xen.xend import XendDomain
dom0 = XendDomain.instance().privilegedDomain()
-- dom0._waitForDeviceUUID(dom0.create_vbd(vbd, disk))
+ mounted_vbd_uuid = dom0.create_vbd(vbd, disk);
+- dom0._waitForDeviceUUID(mounted_vbd_uuid)
+ vbd_uuid = dom0.create_vbd(vbd, disk)
+ dom0._waitForDeviceFrontUUID(vbd_uuid)
fn = BOOTLOADER_LOOPBACK_DEVICE
try:
-@@ -3272,8 +3286,10 @@ class XendDomainInfo:
+@@ -3274,10 +3288,10 @@ class XendDomainInfo:
if mounted:
log.info("Unmounting %s from %s." %
(fn, BOOTLOADER_LOOPBACK_DEVICE))
+- _, vbd_info = dom0.info['devices'][mounted_vbd_uuid]
+- dom0.destroyDevice(dom0.getBlockDeviceClass(vbd_info['devid']),
+- BOOTLOADER_LOOPBACK_DEVICE, force = True)
-
-- dom0.destroyDevice('tap', BOOTLOADER_LOOPBACK_DEVICE)
+ if devtype in ['tap', 'tap2']:
+ dom0.destroyDevice('tap', BOOTLOADER_LOOPBACK_DEVICE, rm_cfg = True)
+ else:
+ dom0.destroyDevice('vbd', BOOTLOADER_LOOPBACK_DEVICE, rm_cfg = True)
-
if blcfg is None:
msg = "Had a bootloader specified, but can't find disk"
+ log.error(msg)
++++++ xen-extra-fixes.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/block-vvfat.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/block-vvfat.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/block-vvfat.c
-+++ xen-4.0.1-testing/tools/ioemu-qemu-xen/block-vvfat.c
+--- xen-4.0.2-testing.orig/tools/ioemu-qemu-xen/block-vvfat.c
++++ xen-4.0.2-testing/tools/ioemu-qemu-xen/block-vvfat.c
@@ -865,7 +865,8 @@ static int init_directories(BDRVVVFATSta
{
direntry_t* entry=array_get_next(&(s->directory));
++++++ xen-fixme-doc.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/docs/man/xmdomain.cfg.pod.5
+Index: xen-4.0.2-testing/docs/man/xmdomain.cfg.pod.5
===================================================================
---- xen-4.0.1-testing.orig/docs/man/xmdomain.cfg.pod.5
-+++ xen-4.0.1-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
@@ -335,16 +335,10 @@ at hda1, which is the root filesystem.
=item I<NFS Root>
@@ -19,10 +19,10 @@
=back
=head1 SEE ALSO
-Index: xen-4.0.1-testing/docs/man/xm.pod.1
+Index: xen-4.0.2-testing/docs/man/xm.pod.1
===================================================================
---- xen-4.0.1-testing.orig/docs/man/xm.pod.1
-+++ xen-4.0.1-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.
=item B
++++++ xen-hvm-default-bridge.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/net.h
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/net.h
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/net.h
-+++ xen-4.0.1-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
@@ -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.1-testing/tools/ioemu-qemu-xen/net.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/net.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/net.c
-+++ xen-4.0.1-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
@@ -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.1-testing/tools/python/xen/xend/image.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/image.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/image.py
-+++ xen-4.0.1-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
@@ -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.1-testing/tools/ioemu-qemu-xen/i386-dm/qemu-ifup-Linux
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/i386-dm/qemu-ifup-Linux
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/i386-dm/qemu-ifup-Linux
-+++ xen-4.0.1-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
@@ -1,36 +1,22 @@
#!/bin/sh
@@ -103,4 +103,4 @@
+ exit 0
fi
- ifconfig $1 0.0.0.0 up
+ # We have to change mac address of tap device to not change bridge mac
++++++ xen-hvm-default-pae.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,9 +1,9 @@
PAE must be on for 64-on-64 to work at all.
-Index: xen-4.0.1-testing/tools/python/xen/xend/image.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/image.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/image.py
-+++ xen-4.0.1-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
@@ -1030,7 +1030,7 @@ class X86_HVM_ImageHandler(HVMImageHandl
def configure(self, vmConfig):
++++++ xen-ioemu-hvm-pv-support.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/hw/xen_platform.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/hw/xen_platform.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/hw/xen_platform.c
-+++ xen-4.0.1-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
@@ -30,6 +30,8 @@
#include "qemu-xen.h"
#include "net.h"
++++++ xen-max-free-mem.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendNode.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendNode.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendNode.py
-+++ xen-4.0.1-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:
info['cpu_mhz'] = info['cpu_khz'] / 1000
@@ -57,10 +57,10 @@
'node_to_cpu',
'node_to_memory',
'node_to_dma32_mem',
-Index: xen-4.0.1-testing/tools/python/xen/xend/balloon.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/balloon.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/balloon.py
-+++ xen-4.0.1-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
@@ -43,6 +43,8 @@ SLEEP_TIME_GROWTH = 0.1
# label actually shown in the PROC_XEN_BALLOON file.
#labels = { 'current' : 'Current allocation',
@@ -94,10 +94,10 @@
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.1-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.1-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:
pci_conf = self.info['devices'][dev_uuid][1]
return map(pci_dict_to_bdf_str, pci_conf['devs'])
@@ -126,10 +126,10 @@
def setMemoryTarget(self, target):
"""Set the memory target of this domain.
@param target: In MiB.
-Index: xen-4.0.1-testing/tools/python/xen/xend/server/SrvDomain.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/server/SrvDomain.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/server/SrvDomain.py
-+++ xen-4.0.1-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-minimum-restart-time.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,9 +1,9 @@
References: bnc#661298
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendConstants.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendConstants.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendConstants.py
-+++ xen-4.0.1-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
@@ -92,7 +92,7 @@ DOM_STATES_OLD = [
SHUTDOWN_TIMEOUT = (60.0 * 5)
++++++ xen-no-dummy-nfs-ip.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/python/xen/xm/create.py
+Index: xen-4.0.2-testing/tools/python/xen/xm/create.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xm/create.py
-+++ xen-4.0.1-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):
def preprocess_ip(vals):
++++++ xen-paths.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/python/xen/xm/create.py
+Index: xen-4.0.2-testing/tools/python/xen/xm/create.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xm/create.py
-+++ xen-4.0.1-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
@@ -73,7 +73,7 @@ gopts.opt('quiet', short='q',
use="Quiet.")
@@ -11,10 +11,10 @@
use="Search path for configuration scripts. "
"The value of PATH is a colon-separated directory list.")
-Index: xen-4.0.1-testing/docs/man/xm.pod.1
+Index: xen-4.0.2-testing/docs/man/xm.pod.1
===================================================================
---- xen-4.0.1-testing.orig/docs/man/xm.pod.1
-+++ xen-4.0.1-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
format, and possible options used in either the configfile or for I<vars>.
@@ -33,10 +33,10 @@
soon as it is run.
=item I<without config file>
-Index: xen-4.0.1-testing/docs/man/xmdomain.cfg.pod.5
+Index: xen-4.0.2-testing/docs/man/xmdomain.cfg.pod.5
===================================================================
---- xen-4.0.1-testing.orig/docs/man/xmdomain.cfg.pod.5
-+++ xen-4.0.1-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
@@ -4,9 +4,9 @@ xmdomain.cfg - xm domain config file for
=head1 SYNOPSIS
++++++ xen-qemu-iscsi-fix.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/xenstore.c
-+++ xen-4.0.1-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
char *buf = NULL;
char *fpath = NULL, *bpath = NULL, *btype = NULL,
++++++ xen-rpmoptflags.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/blktap/drivers/Makefile
+Index: xen-4.0.2-testing/tools/blktap/drivers/Makefile
===================================================================
---- xen-4.0.1-testing.orig/tools/blktap/drivers/Makefile
-+++ xen-4.0.1-testing/tools/blktap/drivers/Makefile
+--- xen-4.0.2-testing.orig/tools/blktap/drivers/Makefile
++++ xen-4.0.2-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.1-testing/Config.mk
+Index: xen-4.0.2-testing/Config.mk
===================================================================
---- xen-4.0.1-testing.orig/Config.mk
-+++ xen-4.0.1-testing/Config.mk
+--- xen-4.0.2-testing.orig/Config.mk
++++ xen-4.0.2-testing/Config.mk
@@ -14,7 +14,7 @@ SHELL ?= /bin/sh
# Tools to run on system hosting the build
++++++ xen-warnings.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/misc/miniterm/miniterm.c
+Index: xen-4.0.2-testing/tools/misc/miniterm/miniterm.c
===================================================================
---- xen-4.0.1-testing.orig/tools/misc/miniterm/miniterm.c
-+++ xen-4.0.1-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
@@ -157,7 +157,7 @@ int main(int argc, char **argv)
case 0:
close(1); /* stdout not needed */
@@ -35,10 +35,10 @@
break;
}
-Index: xen-4.0.1-testing/tools/libxc/xc_dom_elfloader.c
+Index: xen-4.0.2-testing/tools/libxc/xc_dom_elfloader.c
===================================================================
---- xen-4.0.1-testing.orig/tools/libxc/xc_dom_elfloader.c
-+++ xen-4.0.1-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
if ( load )
@@ -50,10 +50,10 @@
elf_section_start(elf, shdr2),
size);
}
-Index: xen-4.0.1-testing/tools/xenstore/Makefile
+Index: xen-4.0.2-testing/tools/xenstore/Makefile
===================================================================
---- xen-4.0.1-testing.orig/tools/xenstore/Makefile
-+++ xen-4.0.1-testing/tools/xenstore/Makefile
+--- xen-4.0.2-testing.orig/tools/xenstore/Makefile
++++ xen-4.0.2-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.1-testing/tools/xenstore/xenstored_core.c
+Index: xen-4.0.2-testing/tools/xenstore/xenstored_core.c
===================================================================
---- xen-4.0.1-testing.orig/tools/xenstore/xenstored_core.c
-+++ xen-4.0.1-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
@@ -77,8 +77,8 @@ static void check_store(void);
int quota_nb_entry_per_domain = 1000;
@@ -91,10 +91,10 @@
break;
case 'T':
tracefile = optarg;
-Index: xen-4.0.1-testing/tools/xenstore/xenstored_domain.c
+Index: xen-4.0.2-testing/tools/xenstore/xenstored_domain.c
===================================================================
---- xen-4.0.1-testing.orig/tools/xenstore/xenstored_domain.c
-+++ xen-4.0.1-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)
{
evtchn_port_t port;
@@ -113,10 +113,10 @@
return -1;
dom0 = new_domain(NULL, 0, port);
-Index: xen-4.0.1-testing/tools/xenstore/xenstored_transaction.c
+Index: xen-4.0.2-testing/tools/xenstore/xenstored_transaction.c
===================================================================
---- xen-4.0.1-testing.orig/tools/xenstore/xenstored_transaction.c
-+++ xen-4.0.1-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
@@ -82,7 +82,7 @@ struct transaction
struct list_head changed_domains;
};
@@ -126,10 +126,10 @@
static unsigned int generation;
/* Return tdb context to use for this connection. */
-Index: xen-4.0.1-testing/tools/xenstore/xenstore_client.c
+Index: xen-4.0.2-testing/tools/xenstore/xenstore_client.c
===================================================================
---- xen-4.0.1-testing.orig/tools/xenstore/xenstore_client.c
-+++ xen-4.0.1-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
char **xsval = xs_directory(xsh, xth, path, &xsval_n);
@@ -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.1-testing/tools/libxen/src/xen_common.c
+Index: xen-4.0.2-testing/tools/libxen/src/xen_common.c
===================================================================
---- xen-4.0.1-testing.orig/tools/libxen/src/xen_common.c
-+++ xen-4.0.1-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
@@ -1057,6 +1057,8 @@ static size_t size_of_member(const abstr
default:
assert(false);
@@ -161,10 +161,10 @@
}
-Index: xen-4.0.1-testing/tools/blktap2/drivers/block-remus.c
+Index: xen-4.0.2-testing/tools/blktap2/drivers/block-remus.c
===================================================================
---- xen-4.0.1-testing.orig/tools/blktap2/drivers/block-remus.c
-+++ xen-4.0.1-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
@@ -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.1-testing/tools/blktap/lib/blktaplib.h
+Index: xen-4.0.2-testing/tools/blktap/lib/blktaplib.h
===================================================================
---- xen-4.0.1-testing.orig/tools/blktap/lib/blktaplib.h
-+++ xen-4.0.1-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
@@ -196,6 +196,7 @@ typedef struct msg_pid {
} msg_pid_t;
@@ -186,10 +186,10 @@
#define WRITE 1
/*Control Messages between manager and tapdev*/
-Index: xen-4.0.1-testing/tools/blktap2/include/blktaplib.h
+Index: xen-4.0.2-testing/tools/blktap2/include/blktaplib.h
===================================================================
---- xen-4.0.1-testing.orig/tools/blktap2/include/blktaplib.h
-+++ xen-4.0.1-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 {
} msg_lock_t;
++++++ xen-xm-top-needs-root.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,10 +1,10 @@
From: Charles Coffing
Upstream: no
-Index: xen-4.0.1-testing/tools/python/xen/xm/main.py
+Index: xen-4.0.2-testing/tools/python/xen/xm/main.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xm/main.py
-+++ xen-4.0.1-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):
def xm_top(args):
arg_check(args, "top", 0)
++++++ xen-xmexample-vti.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/examples/Makefile
+Index: xen-4.0.2-testing/tools/examples/Makefile
===================================================================
---- xen-4.0.1-testing.orig/tools/examples/Makefile
-+++ xen-4.0.1-testing/tools/examples/Makefile
+--- xen-4.0.2-testing.orig/tools/examples/Makefile
++++ xen-4.0.2-testing/tools/examples/Makefile
@@ -18,7 +18,6 @@ XEN_CONFIGS += xmexample.hvm
XEN_CONFIGS += xmexample.hvm-stubdom
XEN_CONFIGS += xmexample.pv-grub
++++++ xen-xmexample.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,9 +1,9 @@
Change various example paths in the config files to match SUSE.
-Index: xen-4.0.1-testing/tools/examples/xmexample1
+Index: xen-4.0.2-testing/tools/examples/xmexample1
===================================================================
---- xen-4.0.1-testing.orig/tools/examples/xmexample1
-+++ xen-4.0.1-testing/tools/examples/xmexample1
+--- xen-4.0.2-testing.orig/tools/examples/xmexample1
++++ xen-4.0.2-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.1-testing/tools/examples/xmexample2
+Index: xen-4.0.2-testing/tools/examples/xmexample2
===================================================================
---- xen-4.0.1-testing.orig/tools/examples/xmexample2
-+++ xen-4.0.1-testing/tools/examples/xmexample2
+--- xen-4.0.2-testing.orig/tools/examples/xmexample2
++++ xen-4.0.2-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.1-testing/tools/examples/xmexample3
+Index: xen-4.0.2-testing/tools/examples/xmexample3
===================================================================
---- xen-4.0.1-testing.orig/tools/examples/xmexample3
-+++ xen-4.0.1-testing/tools/examples/xmexample3
+--- xen-4.0.2-testing.orig/tools/examples/xmexample3
++++ xen-4.0.2-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.1-testing/tools/examples/xmexample.hvm
+Index: xen-4.0.2-testing/tools/examples/xmexample.hvm
===================================================================
---- xen-4.0.1-testing.orig/tools/examples/xmexample.hvm
-+++ xen-4.0.1-testing/tools/examples/xmexample.hvm
+--- xen-4.0.2-testing.orig/tools/examples/xmexample.hvm
++++ xen-4.0.2-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.1-testing/docs/man/xmdomain.cfg.pod.5
+Index: xen-4.0.2-testing/docs/man/xmdomain.cfg.pod.5
===================================================================
---- xen-4.0.1-testing.orig/docs/man/xmdomain.cfg.pod.5
-+++ xen-4.0.1-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
@@ -38,13 +38,13 @@ file.
The kernel image for the domain. The format of the parameter is the
@@ -160,10 +160,10 @@
at hda1, which is the root filesystem.
=item I<NFS Root>
-Index: xen-4.0.1-testing/docs/man/xm.pod.1
+Index: xen-4.0.2-testing/docs/man/xm.pod.1
===================================================================
---- xen-4.0.1-testing.orig/docs/man/xm.pod.1
-+++ xen-4.0.1-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.
=item I<without config file>
++++++ xenalyze.64bit.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -9,8 +9,10 @@
xenalyze.hg/xenalyze.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---- xen-4.0.1-testing.orig/xenalyze.hg/xenalyze.c
-+++ xen-4.0.1-testing/xenalyze.hg/xenalyze.c
+Index: xen-4.0.2-testing/xenalyze.hg/xenalyze.c
+===================================================================
+--- xen-4.0.2-testing.orig/xenalyze.hg/xenalyze.c
++++ xen-4.0.2-testing/xenalyze.hg/xenalyze.c
@@ -3588,12 +3588,12 @@ void hvm_mmio_assist_process(struct reco
if(mevt.x64) {
e->gpa = r->x64.gpa;
++++++ xenapi-console-protocol.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
-@@ -3924,6 +3924,14 @@ class XendDomainInfo:
+--- 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:
if not config.has_key('backend'):
config['backend'] = "00000000-0000-0000-0000-000000000000"
++++++ xend-config.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/hotplug/Linux/init.d/sysconfig.xendomains
+Index: xen-4.0.2-testing/tools/hotplug/Linux/init.d/sysconfig.xendomains
===================================================================
---- xen-4.0.1-testing.orig/tools/hotplug/Linux/init.d/sysconfig.xendomains
-+++ xen-4.0.1-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
@@ -1,4 +1,4 @@
-## Path: System/xen
+## Path: System/Virtualization
@@ -27,10 +27,10 @@
## Type: integer
## Default: 300
-Index: xen-4.0.1-testing/tools/examples/xend-config.sxp
+Index: xen-4.0.2-testing/tools/examples/xend-config.sxp
===================================================================
---- xen-4.0.1-testing.orig/tools/examples/xend-config.sxp
-+++ xen-4.0.1-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
@@ -58,11 +58,12 @@
++++++ xend-core-dump-loc.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.1-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:
# To prohibit directory traversal
based_name = os.path.basename(self.info['name_label'])
++++++ xend-devid-or-name.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -11,10 +11,10 @@
Signed-off-by: Jim Fehlig
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.1-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:
except ValueError:
pass
++++++ xend-domain-lock.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/examples/xend-config.sxp
+Index: xen-4.0.2-testing/tools/examples/xend-config.sxp
===================================================================
---- xen-4.0.1-testing.orig/tools/examples/xend-config.sxp
-+++ xen-4.0.1-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 @@
# device assignment could really work properly even after we do this.
#(pci-passthrough-strict-check yes)
@@ -68,10 +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.1-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.1-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
@@ -32,11 +32,12 @@ import re
import copy
import os
@@ -106,7 +106,7 @@
finally:
self.refresh_shutdown_lock.release()
-@@ -4498,6 +4505,74 @@ class XendDomainInfo:
+@@ -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()])
@@ -181,10 +181,10 @@
def __str__(self):
return '<domain id=%s name=%s memory=%s state=%s>' % \
(str(self.domid), self.info['name_label'],
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendOptions.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendOptions.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendOptions.py
-+++ xen-4.0.1-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
@@ -154,6 +154,17 @@ class XendOptions:
use loose check automatically if necessary."""
pci_dev_assign_strict_check_default = True
@@ -228,10 +228,10 @@
def get_vnc_tls(self):
return self.get_config_string('vnc-tls', self.xend_vnc_tls)
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendCheckpoint.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendCheckpoint.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendCheckpoint.py
-+++ xen-4.0.1-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
@@ -133,6 +133,8 @@ def save(fd, dominfo, network, live, dst
dominfo.shutdown('suspend')
dominfo.waitForSuspend()
@@ -249,10 +249,10 @@
return dominfo
except Exception, exn:
dominfo.destroy()
-Index: xen-4.0.1-testing/tools/hotplug/Linux/Makefile
+Index: xen-4.0.2-testing/tools/hotplug/Linux/Makefile
===================================================================
---- xen-4.0.1-testing.orig/tools/hotplug/Linux/Makefile
-+++ xen-4.0.1-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_SCRIPTS += xen-hotplug-cleanup
XEN_SCRIPTS += external-device-migrate
@@ -261,10 +261,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.1-testing/tools/hotplug/Linux/domain-lock
+Index: xen-4.0.2-testing/tools/hotplug/Linux/domain-lock
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/hotplug/Linux/domain-lock
++++ xen-4.0.2-testing/tools/hotplug/Linux/domain-lock
@@ -0,0 +1,83 @@
+#!/bin/bash
+
@@ -349,10 +349,10 @@
+ get_status $vm_path
+ ;;
+esac
-Index: xen-4.0.1-testing/tools/hotplug/Linux/vm-monitor
+Index: xen-4.0.2-testing/tools/hotplug/Linux/vm-monitor
===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/tools/hotplug/Linux/vm-monitor
++++ xen-4.0.2-testing/tools/hotplug/Linux/vm-monitor
@@ -0,0 +1,41 @@
+#!/bin/bash
+
++++++ xend-sysconfig.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/hotplug/Linux/init.d/sysconfig.xend
+Index: xen-4.0.2-testing/tools/hotplug/Linux/init.d/sysconfig.xend
===================================================================
---- xen-4.0.1-testing.orig/tools/hotplug/Linux/init.d/sysconfig.xend
-+++ xen-4.0.1-testing/tools/hotplug/Linux/init.d/sysconfig.xend
+--- 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 @@
+## Path: System/Virtualization
+## Type: string(none,guest,hv,all)
++++++ xenpaging.HVMCOPY_gfn_paged_out.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -16,10 +16,10 @@
xen/common/memory.c | 39 ++++++++++++++++++++++++++++++++++-----
2 files changed, 38 insertions(+), 5 deletions(-)
-Index: xen-4.0.1-testing/xen/arch/x86/hvm/hvm.c
+Index: xen-4.0.2-testing/xen/arch/x86/hvm/hvm.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/hvm/hvm.c
-+++ xen-4.0.1-testing/xen/arch/x86/hvm/hvm.c
+--- xen-4.0.2-testing.orig/xen/arch/x86/hvm/hvm.c
++++ xen-4.0.2-testing/xen/arch/x86/hvm/hvm.c
@@ -1843,6 +1843,8 @@ unsigned long copy_to_user_hvm(void *to,
rc = hvm_copy_to_guest_virt_nofault((unsigned long)to, (void *)from,
@@ -38,10 +38,10 @@
return rc ? len : 0; /* fake a copy_from_user() return code */
}
-Index: xen-4.0.1-testing/xen/common/memory.c
+Index: xen-4.0.2-testing/xen/common/memory.c
===================================================================
---- xen-4.0.1-testing.orig/xen/common/memory.c
-+++ xen-4.0.1-testing/xen/common/memory.c
+--- xen-4.0.2-testing.orig/xen/common/memory.c
++++ xen-4.0.2-testing/xen/common/memory.c
@@ -47,6 +47,7 @@ static void increase_reservation(struct
{
struct page_info *page;
++++++ xenpaging.MRU_SIZE.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -12,8 +12,10 @@
tools/xenpaging/policy_default.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- xen-4.0.1-testing.orig/tools/xenpaging/policy_default.c
-+++ xen-4.0.1-testing/tools/xenpaging/policy_default.c
+Index: xen-4.0.2-testing/tools/xenpaging/policy_default.c
+===================================================================
+--- xen-4.0.2-testing.orig/tools/xenpaging/policy_default.c
++++ xen-4.0.2-testing/tools/xenpaging/policy_default.c
@@ -26,7 +26,7 @@
#include "policy.h"
++++++ xenpaging.autostart.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -23,10 +23,10 @@
tools/python/xen/xm/xenapi_create.py | 1
8 files changed, 111 insertions(+)
-Index: xen-4.0.1-testing/tools/examples/xmexample.hvm
+Index: xen-4.0.2-testing/tools/examples/xmexample.hvm
===================================================================
---- xen-4.0.1-testing.orig/tools/examples/xmexample.hvm
-+++ xen-4.0.1-testing/tools/examples/xmexample.hvm
+--- xen-4.0.2-testing.orig/tools/examples/xmexample.hvm
++++ xen-4.0.2-testing/tools/examples/xmexample.hvm
@@ -127,6 +127,9 @@ disk = [ 'file:/var/lib/xen/images/disk.
# Device Model to be used
device_model = 'qemu-dm'
@@ -37,10 +37,10 @@
#-----------------------------------------------------------------------------
# boot on floppy (a), hard disk (c), Network (n) or CD-ROM (d)
# default: hard disk, cd-rom, floppy
-Index: xen-4.0.1-testing/tools/python/README.XendConfig
+Index: xen-4.0.2-testing/tools/python/README.XendConfig
===================================================================
---- xen-4.0.1-testing.orig/tools/python/README.XendConfig
-+++ xen-4.0.1-testing/tools/python/README.XendConfig
+--- xen-4.0.2-testing.orig/tools/python/README.XendConfig
++++ xen-4.0.2-testing/tools/python/README.XendConfig
@@ -120,6 +120,7 @@ otherConfig
image.vncdisplay
image.vncunused
@@ -49,10 +49,10 @@
image.hvm.display
image.hvm.xauthority
image.hvm.vncconsole
-Index: xen-4.0.1-testing/tools/python/README.sxpcfg
+Index: xen-4.0.2-testing/tools/python/README.sxpcfg
===================================================================
---- xen-4.0.1-testing.orig/tools/python/README.sxpcfg
-+++ xen-4.0.1-testing/tools/python/README.sxpcfg
+--- xen-4.0.2-testing.orig/tools/python/README.sxpcfg
++++ xen-4.0.2-testing/tools/python/README.sxpcfg
@@ -51,6 +51,7 @@ image
- vncunused
(HVM)
@@ -61,10 +61,10 @@
- display
- xauthority
- vncconsole
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendConfig.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendConfig.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendConfig.py
-+++ xen-4.0.1-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
@@ -145,6 +145,7 @@ XENAPI_PLATFORM_CFG_TYPES = {
'apic': int,
'boot': str,
@@ -82,10 +82,10 @@
if 'timer_mode' not in self['platform']:
self['platform']['timer_mode'] = 1
if 'extid' in self['platform'] and int(self['platform']['extid']) == 1:
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomainInfo.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
-+++ xen-4.0.1-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
@@ -2441,6 +2441,7 @@ class XendDomainInfo:
if self.image:
@@ -106,10 +106,10 @@
else:
log.debug("No device model")
-Index: xen-4.0.1-testing/tools/python/xen/xend/image.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/image.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/image.py
-+++ xen-4.0.1-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
@@ -122,12 +122,14 @@ class ImageHandler:
self.vm.permissionsVm("image/cmdline", { 'dom': self.vm.getDomid(), 'read': True } )
@@ -221,10 +221,10 @@
def createDeviceModel(self, restore = False):
if self.device_model is None:
return
-Index: xen-4.0.1-testing/tools/python/xen/xm/create.py
+Index: xen-4.0.2-testing/tools/python/xen/xm/create.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xm/create.py
-+++ xen-4.0.1-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
@@ -495,6 +495,10 @@ gopts.var('nfs_root', val="PATH",
fn=set_value, default=None,
use="Set the path of the root NFS directory.")
@@ -244,10 +244,10 @@
'device_model', 'display',
'fda', 'fdb',
'gfx_passthru', 'guest_os_type',
-Index: xen-4.0.1-testing/tools/python/xen/xm/xenapi_create.py
+Index: xen-4.0.2-testing/tools/python/xen/xm/xenapi_create.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xm/xenapi_create.py
-+++ xen-4.0.1-testing/tools/python/xen/xm/xenapi_create.py
+--- xen-4.0.2-testing.orig/tools/python/xen/xm/xenapi_create.py
++++ xen-4.0.2-testing/tools/python/xen/xm/xenapi_create.py
@@ -1085,6 +1085,7 @@ class sxp2xml:
'acpi',
'apic',
++++++ xenpaging.autostart_delay.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -14,8 +14,10 @@
tools/python/xen/xend/image.py | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
---- xen-4.0.1-testing.orig/tools/python/xen/xend/image.py
-+++ xen-4.0.1-testing/tools/python/xen/xend/image.py
+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')
++++++ xenpaging.blacklist.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -11,8 +11,10 @@
tools/xenpaging/policy_default.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---- xen-4.0.1-testing.orig/tools/xenpaging/policy_default.c
-+++ xen-4.0.1-testing/tools/xenpaging/policy_default.c
+Index: xen-4.0.2-testing/tools/xenpaging/policy_default.c
+===================================================================
+--- xen-4.0.2-testing.orig/tools/xenpaging/policy_default.c
++++ xen-4.0.2-testing/tools/xenpaging/policy_default.c
@@ -60,8 +60,9 @@ int policy_init(xenpaging_t *paging)
for ( i = 0; i < MRU_SIZE; i++ )
mru[i] = INVALID_MFN;
++++++ xenpaging.doc.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -8,8 +8,10 @@
docs/misc/xenpaging.txt | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
+Index: xen-4.0.2-testing/docs/misc/xenpaging.txt
+===================================================================
--- /dev/null
-+++ xen-4.0.1-testing/docs/misc/xenpaging.txt
++++ xen-4.0.2-testing/docs/misc/xenpaging.txt
@@ -0,0 +1,48 @@
+Warning:
+
++++++ xenpaging.get_paged_frame.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -15,8 +15,10 @@
xen/common/grant_table.c | 94 ++++++++++++++++++++++++++++++-----------------
1 file changed, 60 insertions(+), 34 deletions(-)
---- xen-4.0.1-testing.orig/xen/common/grant_table.c
-+++ xen-4.0.1-testing/xen/common/grant_table.c
+Index: xen-4.0.2-testing/xen/common/grant_table.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/common/grant_table.c
++++ xen-4.0.2-testing/xen/common/grant_table.c
@@ -139,6 +139,37 @@ shared_entry_header(struct grant_table *
#define active_entry(t, e) \
((t)->active[(e)/ACGNT_PER_PAGE][(e)%ACGNT_PER_PAGE])
++++++ xenpaging.guest_remove_page.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -15,11 +15,11 @@
xen/include/public/mem_event.h | 1
5 files changed, 73 insertions(+), 20 deletions(-)
-Index: xen-4.0.1-testing/tools/xenpaging/xenpaging.c
+Index: xen-4.0.2-testing/tools/xenpaging/xenpaging.c
===================================================================
---- xen-4.0.1-testing.orig/tools/xenpaging/xenpaging.c
-+++ xen-4.0.1-testing/tools/xenpaging/xenpaging.c
-@@ -600,12 +600,19 @@ int main(int argc, char *argv[])
+--- xen-4.0.2-testing.orig/tools/xenpaging/xenpaging.c
++++ xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+@@ -601,12 +601,19 @@ int main(int argc, char *argv[])
goto out;
}
@@ -44,11 +44,11 @@
}
/* Prepare the response */
-Index: xen-4.0.1-testing/xen/arch/x86/mm/p2m.c
+Index: xen-4.0.2-testing/xen/arch/x86/mm/p2m.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/mm/p2m.c
-+++ xen-4.0.1-testing/xen/arch/x86/mm/p2m.c
-@@ -2000,12 +2000,15 @@ p2m_remove_page(struct domain *d, unsign
+--- xen-4.0.2-testing.orig/xen/arch/x86/mm/p2m.c
++++ xen-4.0.2-testing/xen/arch/x86/mm/p2m.c
+@@ -2011,12 +2011,15 @@ p2m_remove_page(struct domain *d, unsign
P2M_DEBUG("removing gfn=%#lx mfn=%#lx\n", gfn, mfn);
@@ -69,7 +69,7 @@
}
set_p2m_entry(d, gfn, _mfn(INVALID_MFN), page_order, p2m_invalid);
}
-@@ -2529,6 +2532,35 @@ int p2m_mem_paging_evict(struct domain *
+@@ -2540,6 +2543,35 @@ int p2m_mem_paging_evict(struct domain *
return 0;
}
@@ -105,7 +105,7 @@
void p2m_mem_paging_populate(struct domain *d, unsigned long gfn)
{
struct vcpu *v = current;
-@@ -2593,17 +2625,20 @@ void p2m_mem_paging_resume(struct domain
+@@ -2604,17 +2636,20 @@ void p2m_mem_paging_resume(struct domain
/* Pull the response off the ring */
mem_event_get_response(d, &rsp);
@@ -136,10 +136,10 @@
}
/* Unpause domain */
-Index: xen-4.0.1-testing/xen/common/memory.c
+Index: xen-4.0.2-testing/xen/common/memory.c
===================================================================
---- xen-4.0.1-testing.orig/xen/common/memory.c
-+++ xen-4.0.1-testing/xen/common/memory.c
+--- xen-4.0.2-testing.orig/xen/common/memory.c
++++ xen-4.0.2-testing/xen/common/memory.c
@@ -162,6 +162,12 @@ int guest_remove_page(struct domain *d,
#ifdef CONFIG_X86
@@ -153,10 +153,10 @@
#else
mfn = gmfn_to_mfn(d, gmfn);
#endif
-Index: xen-4.0.1-testing/xen/include/asm-x86/p2m.h
+Index: xen-4.0.2-testing/xen/include/asm-x86/p2m.h
===================================================================
---- xen-4.0.1-testing.orig/xen/include/asm-x86/p2m.h
-+++ xen-4.0.1-testing/xen/include/asm-x86/p2m.h
+--- xen-4.0.2-testing.orig/xen/include/asm-x86/p2m.h
++++ xen-4.0.2-testing/xen/include/asm-x86/p2m.h
@@ -441,6 +441,8 @@ int set_shared_p2m_entry(struct domain *
int p2m_mem_paging_nominate(struct domain *d, unsigned long gfn);
/* Evict a frame */
@@ -175,10 +175,10 @@
static inline void p2m_mem_paging_populate(struct domain *d, unsigned long gfn)
{ }
#endif
-Index: xen-4.0.1-testing/xen/include/public/mem_event.h
+Index: xen-4.0.2-testing/xen/include/public/mem_event.h
===================================================================
---- xen-4.0.1-testing.orig/xen/include/public/mem_event.h
-+++ xen-4.0.1-testing/xen/include/public/mem_event.h
+--- xen-4.0.2-testing.orig/xen/include/public/mem_event.h
++++ xen-4.0.2-testing/xen/include/public/mem_event.h
@@ -37,6 +37,7 @@
#define MEM_EVENT_FLAG_VCPU_PAUSED (1 << 0)
#define MEM_EVENT_FLAG_DOM_PAUSED (1 << 1)
++++++ xenpaging.machine_to_phys_mapping.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -37,11 +37,11 @@
xen/common/page_alloc.c | 9 +++++++++
2 files changed, 19 insertions(+), 3 deletions(-)
-Index: xen-4.0.1-testing/xen/arch/x86/mm/p2m.c
+Index: xen-4.0.2-testing/xen/arch/x86/mm/p2m.c
===================================================================
---- xen-4.0.1-testing.orig/xen/arch/x86/mm/p2m.c
-+++ xen-4.0.1-testing/xen/arch/x86/mm/p2m.c
-@@ -2595,9 +2595,16 @@ void p2m_mem_paging_resume(struct domain
+--- xen-4.0.2-testing.orig/xen/arch/x86/mm/p2m.c
++++ xen-4.0.2-testing/xen/arch/x86/mm/p2m.c
+@@ -2606,9 +2606,16 @@ void p2m_mem_paging_resume(struct domain
/* Fix p2m entry */
mfn = gfn_to_mfn(d, rsp.gfn, &p2mt);
@@ -61,10 +61,10 @@
/* Unpause domain */
if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED )
-Index: xen-4.0.1-testing/xen/common/page_alloc.c
+Index: xen-4.0.2-testing/xen/common/page_alloc.c
===================================================================
---- xen-4.0.1-testing.orig/xen/common/page_alloc.c
-+++ xen-4.0.1-testing/xen/common/page_alloc.c
+--- xen-4.0.2-testing.orig/xen/common/page_alloc.c
++++ xen-4.0.2-testing/xen/common/page_alloc.c
@@ -1178,9 +1178,18 @@ void free_domheap_pages(struct page_info
{
int i, drop_dom_ref;
++++++ xenpaging.makefile.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -4,8 +4,10 @@
tools/xenpaging/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- xen-4.0.1-testing.orig/tools/xenpaging/Makefile
-+++ xen-4.0.1-testing/tools/xenpaging/Makefile
+Index: xen-4.0.2-testing/tools/xenpaging/Makefile
+===================================================================
+--- xen-4.0.2-testing.orig/tools/xenpaging/Makefile
++++ xen-4.0.2-testing/tools/xenpaging/Makefile
@@ -27,7 +27,7 @@ IBINS = xenpaging
all: $(IBINS)
++++++ xenpaging.mem_event_check_ring-free_requests.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -11,9 +11,11 @@
xen/arch/x86/mm/mem_event.c | 5 +++++
1 file changed, 5 insertions(+)
---- xen-4.0.1-testing.orig/xen/arch/x86/mm/mem_event.c
-+++ xen-4.0.1-testing/xen/arch/x86/mm/mem_event.c
-@@ -168,6 +168,11 @@ int mem_event_check_ring(struct domain *
+Index: xen-4.0.2-testing/xen/arch/x86/mm/mem_event.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/mm/mem_event.c
++++ xen-4.0.2-testing/xen/arch/x86/mm/mem_event.c
+@@ -152,6 +152,11 @@ int mem_event_check_ring(struct domain *
mem_event_ring_lock(d);
free_requests = RING_FREE_REQUESTS(&d->mem_event.front_ring);
@@ -24,4 +26,4 @@
+ }
ring_full = free_requests < MEM_EVENT_RING_THRESHOLD;
- if ( (current->domain->domain_id == d->domain_id) && ring_full )
+ if ( (curr->domain->domain_id == d->domain_id) && ring_full )
++++++ xenpaging.mem_paging_tool_qemu_flush_cache.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -15,10 +15,10 @@
tools/ioemu-qemu-xen/xenstore.c | 3 +++
1 file changed, 3 insertions(+)
-Index: xen-4.0.1-testing/tools/ioemu-qemu-xen/xenstore.c
+Index: xen-4.0.2-testing/tools/ioemu-qemu-xen/xenstore.c
===================================================================
---- xen-4.0.1-testing.orig/tools/ioemu-qemu-xen/xenstore.c
-+++ xen-4.0.1-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
@@ -1025,6 +1025,9 @@ static void xenstore_process_dm_command_
do_pci_add(par);
free(par);
++++++ xenpaging.notify_policy_only_once.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -16,9 +16,11 @@
tools/xenpaging/xenpaging.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
---- xen-4.0.1-testing.orig/tools/xenpaging/xenpaging.c
-+++ xen-4.0.1-testing/tools/xenpaging/xenpaging.c
-@@ -380,7 +380,7 @@ int xenpaging_evict_page(xenpaging_t *pa
+Index: xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+===================================================================
+--- xen-4.0.2-testing.orig/tools/xenpaging/xenpaging.c
++++ xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+@@ -381,7 +381,7 @@ int xenpaging_evict_page(xenpaging_t *pa
return ret;
}
@@ -27,7 +29,7 @@
{
int ret;
-@@ -390,7 +390,8 @@ static int xenpaging_resume_page(xenpagi
+@@ -391,7 +391,8 @@ static int xenpaging_resume_page(xenpagi
goto out;
/* Notify policy of page being paged in */
@@ -37,7 +39,7 @@
/* Tell Xen page is ready */
ret = xc_mem_paging_resume(paging->xc_handle, paging->mem_event.domain_id,
-@@ -621,7 +622,7 @@ int main(int argc, char *argv[])
+@@ -622,7 +623,7 @@ int main(int argc, char *argv[])
rsp.vcpu_id = req.vcpu_id;
rsp.flags = req.flags;
@@ -46,7 +48,7 @@
if ( rc != 0 )
{
ERROR("Error resuming page");
-@@ -650,7 +651,7 @@ int main(int argc, char *argv[])
+@@ -651,7 +652,7 @@ int main(int argc, char *argv[])
rsp.vcpu_id = req.vcpu_id;
rsp.flags = req.flags;
++++++ xenpaging.num_pages_equal_max_pages.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -12,9 +12,11 @@
tools/xenpaging/xenpaging.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
---- xen-4.0.1-testing.orig/tools/xenpaging/xenpaging.c
-+++ xen-4.0.1-testing/tools/xenpaging/xenpaging.c
-@@ -514,8 +514,6 @@ int main(int argc, char *argv[])
+Index: xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+===================================================================
+--- xen-4.0.2-testing.orig/tools/xenpaging/xenpaging.c
++++ xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+@@ -515,8 +515,6 @@ int main(int argc, char *argv[])
domain_id = atoi(argv[1]);
num_pages = atoi(argv[2]);
@@ -23,7 +25,7 @@
/* Seed random-number generator */
srand(time(NULL));
-@@ -536,6 +534,13 @@ int main(int argc, char *argv[])
+@@ -537,6 +535,13 @@ int main(int argc, char *argv[])
return 2;
}
++++++ xenpaging.optimize_p2m_mem_paging_populate.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -15,9 +15,11 @@
xen/arch/x86/mm/p2m.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
---- xen-4.0.1-testing.orig/xen/arch/x86/mm/p2m.c
-+++ xen-4.0.1-testing/xen/arch/x86/mm/p2m.c
-@@ -2567,12 +2567,12 @@ void p2m_mem_paging_populate(struct doma
+Index: xen-4.0.2-testing/xen/arch/x86/mm/p2m.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/mm/p2m.c
++++ xen-4.0.2-testing/xen/arch/x86/mm/p2m.c
+@@ -2578,12 +2578,12 @@ void p2m_mem_paging_populate(struct doma
mem_event_request_t req;
p2m_type_t p2mt;
@@ -32,7 +34,7 @@
/* Fix p2m mapping */
/* XXX: It seems inefficient to have this here, as it's only needed
* in one case (ept guest accessing paging out page) */
-@@ -2590,6 +2590,11 @@ void p2m_mem_paging_populate(struct doma
+@@ -2601,6 +2601,11 @@ void p2m_mem_paging_populate(struct doma
vcpu_pause_nosync(v);
req.flags |= MEM_EVENT_FLAG_VCPU_PAUSED;
}
++++++ xenpaging.p2m_mem_paging_populate_if_p2m_ram_paged.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -18,9 +18,11 @@
xen/arch/x86/mm/p2m.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- xen-4.0.1-testing.orig/xen/arch/x86/mm/p2m.c
-+++ xen-4.0.1-testing/xen/arch/x86/mm/p2m.c
-@@ -2577,7 +2577,7 @@ void p2m_mem_paging_populate(struct doma
+Index: xen-4.0.2-testing/xen/arch/x86/mm/p2m.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/mm/p2m.c
++++ xen-4.0.2-testing/xen/arch/x86/mm/p2m.c
+@@ -2588,7 +2588,7 @@ void p2m_mem_paging_populate(struct doma
/* XXX: It seems inefficient to have this here, as it's only needed
* in one case (ept guest accessing paging out page) */
gfn_to_mfn(d, gfn, &p2mt);
++++++ xenpaging.page_already_populated.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -10,9 +10,11 @@
tools/xenpaging/xenpaging.c | 2 ++
1 file changed, 2 insertions(+)
---- xen-4.0.1-testing.orig/tools/xenpaging/xenpaging.c
-+++ xen-4.0.1-testing/tools/xenpaging/xenpaging.c
-@@ -634,8 +634,10 @@ int main(int argc, char *argv[])
+Index: xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+===================================================================
+--- xen-4.0.2-testing.orig/tools/xenpaging/xenpaging.c
++++ xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+@@ -635,8 +635,10 @@ int main(int argc, char *argv[])
else
{
DPRINTF("page already populated (domain = %d; vcpu = %d;"
++++++ xenpaging.pagefile.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -14,9 +14,11 @@
tools/xenpaging/xenpaging.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
---- xen-4.0.1-testing.orig/tools/xenpaging/xenpaging.c
-+++ xen-4.0.1-testing/tools/xenpaging/xenpaging.c
-@@ -495,15 +495,6 @@ int main(int argc, char *argv[])
+Index: xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+===================================================================
+--- xen-4.0.2-testing.orig/tools/xenpaging/xenpaging.c
++++ xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+@@ -496,15 +496,6 @@ int main(int argc, char *argv[])
victims = calloc(num_pages, sizeof(xenpaging_victim_t));
@@ -32,7 +34,7 @@
/* Seed random-number generator */
srand(time(NULL));
-@@ -515,6 +506,15 @@ int main(int argc, char *argv[])
+@@ -516,6 +507,15 @@ int main(int argc, char *argv[])
goto out;
}
++++++ xenpaging.pageout_policy.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -13,9 +13,11 @@
tools/xenpaging/xenpaging.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---- xen-4.0.1-testing.orig/tools/xenpaging/xenpaging.c
-+++ xen-4.0.1-testing/tools/xenpaging/xenpaging.c
-@@ -358,8 +358,8 @@ int xenpaging_evict_page(xenpaging_t *pa
+Index: xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+===================================================================
+--- xen-4.0.2-testing.orig/tools/xenpaging/xenpaging.c
++++ xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+@@ -359,8 +359,8 @@ int xenpaging_evict_page(xenpaging_t *pa
goto out;
}
++++++ xenpaging.paging_prep_enomem.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -15,9 +15,11 @@
xen/arch/x86/mm/p2m.c | 2 +-
2 files changed, 21 insertions(+), 8 deletions(-)
---- xen-4.0.1-testing.orig/tools/xenpaging/xenpaging.c
-+++ xen-4.0.1-testing/tools/xenpaging/xenpaging.c
-@@ -23,6 +23,7 @@
+Index: xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+===================================================================
+--- xen-4.0.2-testing.orig/tools/xenpaging/xenpaging.c
++++ xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+@@ -24,6 +24,7 @@
#include
#include
#include
@@ -25,7 +27,7 @@
#include
#include
-@@ -409,19 +410,31 @@ static int xenpaging_populate_page(
+@@ -410,19 +411,31 @@ static int xenpaging_populate_page(
unsigned long _gfn;
void *page;
int ret;
@@ -64,9 +66,11 @@
page = xc_map_foreign_pages(paging->xc_handle, paging->mem_event.domain_id,
PROT_READ | PROT_WRITE, &_gfn, 1);
*gfn = _gfn;
---- xen-4.0.1-testing.orig/xen/arch/x86/mm/p2m.c
-+++ xen-4.0.1-testing/xen/arch/x86/mm/p2m.c
-@@ -2611,7 +2611,7 @@ int p2m_mem_paging_prep(struct domain *d
+Index: xen-4.0.2-testing/xen/arch/x86/mm/p2m.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/mm/p2m.c
++++ xen-4.0.2-testing/xen/arch/x86/mm/p2m.c
+@@ -2622,7 +2622,7 @@ int p2m_mem_paging_prep(struct domain *d
/* Get a free page */
page = alloc_domheap_page(d, 0);
if ( unlikely(page == NULL) )
++++++ xenpaging.policy_linear.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -19,8 +19,10 @@
tools/xenpaging/xenpaging.c | 7 +++++--
2 files changed, 33 insertions(+), 9 deletions(-)
---- xen-4.0.1-testing.orig/tools/xenpaging/policy_default.c
-+++ xen-4.0.1-testing/tools/xenpaging/policy_default.c
+Index: xen-4.0.2-testing/tools/xenpaging/policy_default.c
+===================================================================
+--- xen-4.0.2-testing.orig/tools/xenpaging/policy_default.c
++++ xen-4.0.2-testing/tools/xenpaging/policy_default.c
@@ -30,8 +30,12 @@
@@ -99,9 +101,11 @@
}
void policy_notify_paged_in(domid_t domain_id, unsigned long gfn)
---- xen-4.0.1-testing.orig/tools/xenpaging/xenpaging.c
-+++ xen-4.0.1-testing/tools/xenpaging/xenpaging.c
-@@ -440,7 +440,8 @@ static int evict_victim(xenpaging_t *pag
+Index: xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+===================================================================
+--- xen-4.0.2-testing.orig/tools/xenpaging/xenpaging.c
++++ xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+@@ -441,7 +441,8 @@ static int evict_victim(xenpaging_t *pag
ret = policy_choose_victim(paging, domain_id, victim);
if ( ret != 0 )
{
@@ -111,7 +115,7 @@
goto out;
}
-@@ -518,7 +519,9 @@ int main(int argc, char *argv[])
+@@ -519,7 +520,9 @@ int main(int argc, char *argv[])
memset(victims, 0, sizeof(xenpaging_victim_t) * num_pages);
for ( i = 0; i < num_pages; i++ )
{
++++++ xenpaging.populate_only_if_paged.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -14,8 +14,10 @@
xen/common/grant_table.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
---- xen-4.0.1-testing.orig/xen/common/grant_table.c
-+++ xen-4.0.1-testing/xen/common/grant_table.c
+Index: xen-4.0.2-testing/xen/common/grant_table.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/common/grant_table.c
++++ xen-4.0.2-testing/xen/common/grant_table.c
@@ -156,8 +156,7 @@ static int __get_paged_frame(unsigned lo
*frame = mfn_x(mfn);
if ( p2m_is_paging(p2mt) )
++++++ xenpaging.print-arguments.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -11,9 +11,11 @@
tools/xenpaging/xenpaging.c | 2 ++
1 file changed, 2 insertions(+)
---- xen-4.0.1-testing.orig/tools/xenpaging/xenpaging.c
-+++ xen-4.0.1-testing/tools/xenpaging/xenpaging.c
-@@ -538,6 +538,8 @@ int main(int argc, char *argv[])
+Index: xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+===================================================================
+--- xen-4.0.2-testing.orig/tools/xenpaging/xenpaging.c
++++ xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+@@ -539,6 +539,8 @@ int main(int argc, char *argv[])
return 1;
}
++++++ xenpaging.signal_handling.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:22.000000000 +0100
@@ -15,9 +15,11 @@
tools/xenpaging/xenpaging.c | 42 +++++++++++++++++++++++++++++++++---------
1 file changed, 33 insertions(+), 9 deletions(-)
---- xen-4.0.1-testing.orig/tools/xenpaging/xenpaging.c
-+++ xen-4.0.1-testing/tools/xenpaging/xenpaging.c
-@@ -22,6 +22,7 @@
+Index: xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+===================================================================
+--- xen-4.0.2-testing.orig/tools/xenpaging/xenpaging.c
++++ xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+@@ -23,6 +23,7 @@
#include
#include
@@ -25,7 +27,7 @@
#include
#include
-@@ -40,6 +41,14 @@
+@@ -41,6 +42,14 @@
#define DPRINTF(...) ((void)0)
#endif
@@ -40,7 +42,7 @@
static void *init_page(void)
{
-@@ -244,7 +253,6 @@ int xenpaging_teardown(xenpaging_t *pagi
+@@ -245,7 +254,6 @@ int xenpaging_teardown(xenpaging_t *pagi
if ( rc != 0 )
{
ERROR("Error tearing down domain paging in xen");
@@ -48,7 +50,7 @@
}
/* Unbind VIRQ */
-@@ -252,7 +260,6 @@ int xenpaging_teardown(xenpaging_t *pagi
+@@ -253,7 +261,6 @@ int xenpaging_teardown(xenpaging_t *pagi
if ( rc != 0 )
{
ERROR("Error unbinding event port");
@@ -56,7 +58,7 @@
}
paging->mem_event.port = -1;
-@@ -261,7 +268,6 @@ int xenpaging_teardown(xenpaging_t *pagi
+@@ -262,7 +269,6 @@ int xenpaging_teardown(xenpaging_t *pagi
if ( rc != 0 )
{
ERROR("Error closing event channel");
@@ -64,7 +66,7 @@
}
paging->mem_event.xce_handle = -1;
-@@ -270,7 +276,6 @@ int xenpaging_teardown(xenpaging_t *pagi
+@@ -271,7 +277,6 @@ int xenpaging_teardown(xenpaging_t *pagi
if ( rc != 0 )
{
ERROR("Error closing connection to xen");
@@ -72,7 +74,7 @@
}
paging->xc_handle = -1;
-@@ -375,7 +380,7 @@ int xenpaging_evict_page(xenpaging_t *pa
+@@ -376,7 +381,7 @@ int xenpaging_evict_page(xenpaging_t *pa
return ret;
}
@@ -81,7 +83,7 @@
{
int ret;
-@@ -455,6 +460,11 @@ static int evict_victim(xenpaging_t *pag
+@@ -456,6 +461,11 @@ static int evict_victim(xenpaging_t *pag
goto out;
}
@@ -93,7 +95,7 @@
ret = xc_mem_paging_nominate(paging->xc_handle,
paging->mem_event.domain_id, victim->gfn);
if ( ret == 0 )
-@@ -479,6 +489,7 @@ static int evict_victim(xenpaging_t *pag
+@@ -480,6 +490,7 @@ static int evict_victim(xenpaging_t *pag
int main(int argc, char *argv[])
{
@@ -101,7 +103,7 @@
domid_t domain_id;
int num_pages;
xenpaging_t *paging;
-@@ -491,7 +502,6 @@ int main(int argc, char *argv[])
+@@ -492,7 +503,6 @@ int main(int argc, char *argv[])
int open_flags = O_CREAT | O_TRUNC | O_RDWR;
mode_t open_mode = S_IRUSR | S_IRGRP | S_IROTH | S_IWUSR | S_IWGRP | S_IWOTH;
@@ -109,7 +111,7 @@
int fd;
if ( argc != 3 )
-@@ -513,7 +523,7 @@ int main(int argc, char *argv[])
+@@ -514,7 +524,7 @@ int main(int argc, char *argv[])
if ( paging == NULL )
{
ERROR("Error initialising paging");
@@ -118,7 +120,7 @@
}
/* Open file */
-@@ -522,9 +532,18 @@ int main(int argc, char *argv[])
+@@ -523,9 +533,18 @@ int main(int argc, char *argv[])
if ( fd < 0 )
{
perror("failed to open file");
@@ -138,7 +140,7 @@
/* Evict pages */
memset(victims, 0, sizeof(xenpaging_victim_t) * num_pages);
for ( i = 0; i < num_pages; i++ )
-@@ -532,6 +551,8 @@ int main(int argc, char *argv[])
+@@ -533,6 +552,8 @@ int main(int argc, char *argv[])
rc = evict_victim(paging, domain_id, &victims[i], fd, i);
if ( rc == -ENOSPC )
break;
@@ -147,7 +149,7 @@
if ( i % 100 == 0 )
DPRINTF("%d pages evicted\n", i);
}
-@@ -539,7 +560,7 @@ int main(int argc, char *argv[])
+@@ -540,7 +561,7 @@ int main(int argc, char *argv[])
DPRINTF("pages evicted\n");
/* Swap pages in and out */
@@ -156,7 +158,7 @@
{
/* Wait for Xen to signal that a page needs paged in */
rc = xc_wait_for_event_or_timeout(paging->mem_event.xce_handle, 100);
-@@ -630,8 +651,10 @@ int main(int argc, char *argv[])
+@@ -631,8 +652,10 @@ int main(int argc, char *argv[])
}
}
}
@@ -167,7 +169,7 @@
free(victims);
/* Tear down domain paging */
-@@ -642,6 +665,7 @@ int main(int argc, char *argv[])
+@@ -643,6 +666,7 @@ int main(int argc, char *argv[])
if ( rc == 0 )
rc = rc1;
++++++ xenpaging.tools_xenpaging_cleanup.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:22.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:23.000000000 +0100
@@ -12,9 +12,11 @@
tools/xenpaging/xenpaging.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
---- xen-4.0.1-testing.orig/tools/xenpaging/xenpaging.c
-+++ xen-4.0.1-testing/tools/xenpaging/xenpaging.c
-@@ -100,7 +100,7 @@ xenpaging_t *xenpaging_init(domid_t doma
+Index: xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+===================================================================
+--- xen-4.0.2-testing.orig/tools/xenpaging/xenpaging.c
++++ xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+@@ -101,7 +101,7 @@ xenpaging_t *xenpaging_init(domid_t doma
paging->mem_event.ring_page = init_page();
if ( paging->mem_event.ring_page == NULL )
{
@@ -23,7 +25,7 @@
goto err;
}
-@@ -198,13 +198,27 @@ xenpaging_t *xenpaging_init(domid_t doma
+@@ -199,13 +199,27 @@ xenpaging_t *xenpaging_init(domid_t doma
return paging;
err:
++++++ xenpaging.xenpaging_init.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:23.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:23.000000000 +0100
@@ -17,9 +17,11 @@
xen/arch/x86/mm/mem_event.c | 7 +++++++
2 files changed, 18 insertions(+), 1 deletion(-)
---- xen-4.0.1-testing.orig/tools/xenpaging/xenpaging.c
-+++ xen-4.0.1-testing/tools/xenpaging/xenpaging.c
-@@ -119,7 +119,17 @@ xenpaging_t *xenpaging_init(domid_t doma
+Index: xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+===================================================================
+--- xen-4.0.2-testing.orig/tools/xenpaging/xenpaging.c
++++ xen-4.0.2-testing/tools/xenpaging/xenpaging.c
+@@ -120,7 +120,17 @@ xenpaging_t *xenpaging_init(domid_t doma
paging->mem_event.ring_page);
if ( rc != 0 )
{
@@ -38,9 +40,11 @@
goto err;
}
---- xen-4.0.1-testing.orig/xen/arch/x86/mm/mem_event.c
-+++ xen-4.0.1-testing/xen/arch/x86/mm/mem_event.c
-@@ -226,6 +226,13 @@ int mem_event_domctl(struct domain *d, x
+Index: xen-4.0.2-testing/xen/arch/x86/mm/mem_event.c
+===================================================================
+--- xen-4.0.2-testing.orig/xen/arch/x86/mm/mem_event.c
++++ xen-4.0.2-testing/xen/arch/x86/mm/mem_event.c
+@@ -214,6 +214,13 @@ int mem_event_domctl(struct domain *d, x
mfn_t ring_mfn;
mfn_t shared_mfn;
@@ -48,7 +52,7 @@
+ * the cache is in an undefined state and so is the guest
+ */
+ rc = -EBUSY;
-+ if ( d->mem_event.enabled )
++ if ( d->mem_event.ring_page )
+ break;
+
/* Currently only EPT is supported */
++++++ xm-create-xflag.patch ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:23.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:23.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/python/xen/xm/create.py
+Index: xen-4.0.2-testing/tools/python/xen/xm/create.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xm/create.py
-+++ xen-4.0.1-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
@@ -36,7 +36,7 @@ from xen.xend.server.DevConstants import
from xen.util import blkif
from xen.util import vscsi_util
@@ -29,10 +29,10 @@
from xml.dom.ext import PrettyPrint as XMLPrettyPrint
XMLPrettyPrint(doc)
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendAPIConstants.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendAPIConstants.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendAPIConstants.py
-+++ xen-4.0.1-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
@@ -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.fJ9m6Q/_old 2011-02-07 12:20:23.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:23.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendAPI.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendAPI.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendAPI.py
-+++ xen-4.0.1-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):
bool(live), port, node, ssl, bool(chs))
return xen_api_success_void()
@@ -15,10 +15,10 @@
return xen_api_success_void()
def VM_restore(self, _, src, paused):
-Index: xen-4.0.1-testing/tools/python/xen/xend/XendDomain.py
+Index: xen-4.0.2-testing/tools/python/xen/xend/XendDomain.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xend/XendDomain.py
-+++ xen-4.0.1-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()
@@ -38,10 +38,10 @@
if dominfo.getDomid() == DOM0_ID:
raise XendError("Cannot save privileged domain %s" % str(domid))
if dominfo._stateGet() != DOM_STATE_RUNNING:
-Index: xen-4.0.1-testing/tools/python/xen/xm/main.py
+Index: xen-4.0.2-testing/tools/python/xen/xm/main.py
===================================================================
---- xen-4.0.1-testing.orig/tools/python/xen/xm/main.py
-+++ xen-4.0.1-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 = {
'reset' : ('<Domain>', 'Reset a domain.'),
'restore' : ('<CheckpointFile> [-p]',
++++++ xm-test-cleanup.diff ++++++
--- /var/tmp/diff_new_pack.fJ9m6Q/_old 2011-02-07 12:20:23.000000000 +0100
+++ /var/tmp/diff_new_pack.fJ9m6Q/_new 2011-02-07 12:20:23.000000000 +0100
@@ -1,7 +1,7 @@
-Index: xen-4.0.1-testing/tools/xm-test/tests/save/01_save_basic_pos.py
+Index: xen-4.0.2-testing/tools/xm-test/tests/save/01_save_basic_pos.py
===================================================================
---- xen-4.0.1-testing.orig/tools/xm-test/tests/save/01_save_basic_pos.py
-+++ xen-4.0.1-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
@@ -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