Hello community, here is the log from the commit of package xen for openSUSE:Factory checked in at 2020-06-04 17:50:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xen (Old) and /work/SRC/openSUSE:Factory/.xen.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xen" Thu Jun 4 17:50:22 2020 rev:285 rq:808027 version:4.13.1_02 Changes: -------- --- /work/SRC/openSUSE:Factory/xen/xen.changes 2020-05-14 23:23:55.080866217 +0200 +++ /work/SRC/openSUSE:Factory/.xen.new.3606/xen.changes 2020-06-04 17:50:50.619962048 +0200 @@ -1,0 +2,52 @@ +Mon May 18 10:55:26 MDT 2020 - carn...@suse.com + +- Update to Xen 4.13.1 bug fix release (bsc#1027519) + xen-4.13.1-testing-src.tar.bz2 + 5eb51be6-cpupool-fix-removing-cpu-from-pool.patch + 5eb51caa-sched-vcpu-pause-flags-atomic.patch + 5ec2a760-x86-determine-MXCSR-mask-always.patch +- Drop patches contained in new tarball + 5de65f84-gnttab-map-always-do-IOMMU-part.patch + 5de65fc4-x86-avoid-HPET-use-on-certain-Intel.patch + 5e15e03d-sched-fix-S3-resume-with-smt=0.patch + 5e16fb6a-x86-clear-per-cpu-stub-page-info.patch + 5e1da013-IRQ-u16-is-too-narrow-for-evtchn.patch + 5e1dcedd-Arm-place-speculation-barrier-after-ERET.patch + 5e21ce98-x86-time-update-TSC-stamp-after-deep-C-state.patch + 5e286cce-VT-d-dont-pass-bridges-to-domain_context_mapping_one.patch + 5e318cd4-x86-apic-fix-disabling-LVT0.patch + 5e344c11-x86-HVM-relinquish-resources-from-domain_destroy.patch + 5e3bd385-EFI-recheck-variable-name-strings.patch + 5e3bd3d1-EFI-dont-leak-heap-VIA-XEN_EFI_get_next_variable_name.patch + 5e3bd3f8-xmalloc-guard-against-overflow.patch + 5e46e090-x86-smp-reset-x2apic_enabled-in-smp_send_stop.patch + 5e4c00ef-VT-d-check-full-RMRR-for-E820-reserved.patch + 5e4d4f5b-sched-fix-get_cpu_idle_time-with-core-sched.patch + 5e4e614d-x86-spec-ctrl-no-xen-also-disables-branch-hardening.patch + 5e4ec20e-x86-virtualise-MSR_PLATFORM_ID-properly.patch + 5e5e7188-fix-error-path-in-cpupool_unassign_cpu_start.patch + 5e6f53dd-AMD-IOMMU-fix-off-by-one-get_paging_mode.patch + 5e7a371c-sched-fix-cpu-onlining-with-core-sched.patch + 5e7c90cf-sched-fix-cpu-offlining-with-core-sched.patch + 5e7cfb29-x86-ucode-AMD-fix-assert-in-compare_patch.patch + 5e7cfb29-x86-ucode-fix-error-paths-in-apply_microcode.patch + 5e7dd83b-libx86-CPUID-fix-not-just-leaf-7.patch + 5e7dfbf6-x86-ucode-AMD-potential-buffer-overrun-equiv-tab.patch + 5e846cce-x86-HVM-fix-AMD-ECS-handling-for-Fam10.patch + 5e84905c-x86-ucode-AMD-fix-more-potential-buffer-overruns.patch + 5e86f7b7-credit2-avoid-vCPUs-with-lower-creds-than-idle.patch + 5e86f7fd-credit2-fix-credit-too-few-resets.patch + 5e876b0f-tools-xenstore-fix-use-after-free-in-xenstored.patch + 5e95ad61-xenoprof-clear-buffer-intended-to-be-shared-with-guests.patch + 5e95ad8f-xenoprof-limit-consumption-of-shared-buffer-data.patch + 5e95ae77-Add-missing-memory-barrier-in-the-unlock-path-of-rwlock.patch + 5e95af5e-xen-gnttab-Fix-error-path-in-map_grant_ref.patch + 5e95afb8-gnttab-fix-GNTTABOP_copy-continuation-handling.patch + +------------------------------------------------------------------- +Wed May 13 21:07:29 UTC 2020 - James Fehlig <jfeh...@suse.com> + +- spec: Remove invocation of autogen.sh +- spec: Recommend qemu-ovmf-x86_64 to provide UEFI firmwares + +------------------------------------------------------------------- Old: ---- 5de65f84-gnttab-map-always-do-IOMMU-part.patch 5de65fc4-x86-avoid-HPET-use-on-certain-Intel.patch 5e15e03d-sched-fix-S3-resume-with-smt=0.patch 5e16fb6a-x86-clear-per-cpu-stub-page-info.patch 5e1da013-IRQ-u16-is-too-narrow-for-evtchn.patch 5e1dcedd-Arm-place-speculation-barrier-after-ERET.patch 5e21ce98-x86-time-update-TSC-stamp-after-deep-C-state.patch 5e286cce-VT-d-dont-pass-bridges-to-domain_context_mapping_one.patch 5e318cd4-x86-apic-fix-disabling-LVT0.patch 5e344c11-x86-HVM-relinquish-resources-from-domain_destroy.patch 5e3bd385-EFI-recheck-variable-name-strings.patch 5e3bd3d1-EFI-dont-leak-heap-VIA-XEN_EFI_get_next_variable_name.patch 5e3bd3f8-xmalloc-guard-against-overflow.patch 5e46e090-x86-smp-reset-x2apic_enabled-in-smp_send_stop.patch 5e4c00ef-VT-d-check-full-RMRR-for-E820-reserved.patch 5e4d4f5b-sched-fix-get_cpu_idle_time-with-core-sched.patch 5e4e614d-x86-spec-ctrl-no-xen-also-disables-branch-hardening.patch 5e4ec20e-x86-virtualise-MSR_PLATFORM_ID-properly.patch 5e5e7188-fix-error-path-in-cpupool_unassign_cpu_start.patch 5e6f53dd-AMD-IOMMU-fix-off-by-one-get_paging_mode.patch 5e7a371c-sched-fix-cpu-onlining-with-core-sched.patch 5e7c90cf-sched-fix-cpu-offlining-with-core-sched.patch 5e7cfb29-x86-ucode-AMD-fix-assert-in-compare_patch.patch 5e7cfb29-x86-ucode-fix-error-paths-in-apply_microcode.patch 5e7dd83b-libx86-CPUID-fix-not-just-leaf-7.patch 5e7dfbf6-x86-ucode-AMD-potential-buffer-overrun-equiv-tab.patch 5e846cce-x86-HVM-fix-AMD-ECS-handling-for-Fam10.patch 5e84905c-x86-ucode-AMD-fix-more-potential-buffer-overruns.patch 5e86f7b7-credit2-avoid-vCPUs-with-lower-creds-than-idle.patch 5e86f7fd-credit2-fix-credit-too-few-resets.patch 5e876b0f-tools-xenstore-fix-use-after-free-in-xenstored.patch 5e95ad61-xenoprof-clear-buffer-intended-to-be-shared-with-guests.patch 5e95ad8f-xenoprof-limit-consumption-of-shared-buffer-data.patch 5e95ae77-Add-missing-memory-barrier-in-the-unlock-path-of-rwlock.patch 5e95af5e-xen-gnttab-Fix-error-path-in-map_grant_ref.patch 5e95afb8-gnttab-fix-GNTTABOP_copy-continuation-handling.patch xen-4.13.0-testing-src.tar.bz2 New: ---- 5eb51be6-cpupool-fix-removing-cpu-from-pool.patch 5eb51caa-sched-vcpu-pause-flags-atomic.patch 5ec2a760-x86-determine-MXCSR-mask-always.patch xen-4.13.1-testing-src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.X5Vlxs/_old 2020-06-04 17:50:52.835969099 +0200 +++ /var/tmp/diff_new_pack.X5Vlxs/_new 2020-06-04 17:50:52.839969112 +0200 @@ -25,7 +25,7 @@ Name: xen ExclusiveArch: %ix86 x86_64 aarch64 %define changeset 40162 -%define xen_build_dir xen-4.13.0-testing +%define xen_build_dir xen-4.13.1-testing # %define with_gdbsx 0 %define with_dom0_support 0 @@ -70,10 +70,6 @@ BuildRequires: libfdt1-devel %endif %endif -# JWF: Until Anthony's series to load BIOS via toolstack is merged, -# autoconf is needed by autogen.sh. -# http://lists.xenproject.org/archives/html/xen-devel/2016-03/msg01626.html -BuildRequires: autoconf >= 2.67 BuildRequires: bison BuildRequires: fdupes %if 0%{?suse_version} > 1315 @@ -127,12 +123,12 @@ BuildRequires: pesign-obs-integration %endif -Version: 4.13.0_12 +Version: 4.13.1_02 Release: 0 Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel) License: GPL-2.0-only Group: System/Kernel -Source0: xen-4.13.0-testing-src.tar.bz2 +Source0: xen-4.13.1-testing-src.tar.bz2 Source1: stubdom.tar.bz2 Source5: ipxe.tar.bz2 Source6: mini-os.tar.bz2 @@ -166,42 +162,9 @@ # For xen-libs Source99: baselibs.conf # Upstream patches -Patch1: 5de65f84-gnttab-map-always-do-IOMMU-part.patch -Patch2: 5de65fc4-x86-avoid-HPET-use-on-certain-Intel.patch -Patch3: 5e15e03d-sched-fix-S3-resume-with-smt=0.patch -Patch4: 5e16fb6a-x86-clear-per-cpu-stub-page-info.patch -Patch5: 5e1da013-IRQ-u16-is-too-narrow-for-evtchn.patch -Patch6: 5e1dcedd-Arm-place-speculation-barrier-after-ERET.patch -Patch7: 5e21ce98-x86-time-update-TSC-stamp-after-deep-C-state.patch -Patch8: 5e286cce-VT-d-dont-pass-bridges-to-domain_context_mapping_one.patch -Patch9: 5e318cd4-x86-apic-fix-disabling-LVT0.patch -Patch10: 5e344c11-x86-HVM-relinquish-resources-from-domain_destroy.patch -Patch11: 5e3bd385-EFI-recheck-variable-name-strings.patch -Patch12: 5e3bd3d1-EFI-dont-leak-heap-VIA-XEN_EFI_get_next_variable_name.patch -Patch13: 5e3bd3f8-xmalloc-guard-against-overflow.patch -Patch14: 5e46e090-x86-smp-reset-x2apic_enabled-in-smp_send_stop.patch -Patch15: 5e4c00ef-VT-d-check-full-RMRR-for-E820-reserved.patch -Patch16: 5e4d4f5b-sched-fix-get_cpu_idle_time-with-core-sched.patch -Patch17: 5e4e614d-x86-spec-ctrl-no-xen-also-disables-branch-hardening.patch -Patch18: 5e4ec20e-x86-virtualise-MSR_PLATFORM_ID-properly.patch -Patch19: 5e5e7188-fix-error-path-in-cpupool_unassign_cpu_start.patch -Patch20: 5e6f53dd-AMD-IOMMU-fix-off-by-one-get_paging_mode.patch -Patch21: 5e7a371c-sched-fix-cpu-onlining-with-core-sched.patch -Patch22: 5e7c90cf-sched-fix-cpu-offlining-with-core-sched.patch -Patch23: 5e7cfb29-x86-ucode-AMD-fix-assert-in-compare_patch.patch -Patch24: 5e7cfb29-x86-ucode-fix-error-paths-in-apply_microcode.patch -Patch25: 5e7dd83b-libx86-CPUID-fix-not-just-leaf-7.patch -Patch26: 5e7dfbf6-x86-ucode-AMD-potential-buffer-overrun-equiv-tab.patch -Patch27: 5e846cce-x86-HVM-fix-AMD-ECS-handling-for-Fam10.patch -Patch28: 5e84905c-x86-ucode-AMD-fix-more-potential-buffer-overruns.patch -Patch29: 5e86f7b7-credit2-avoid-vCPUs-with-lower-creds-than-idle.patch -Patch30: 5e86f7fd-credit2-fix-credit-too-few-resets.patch -Patch31: 5e876b0f-tools-xenstore-fix-use-after-free-in-xenstored.patch -Patch32: 5e95ad61-xenoprof-clear-buffer-intended-to-be-shared-with-guests.patch -Patch33: 5e95ad8f-xenoprof-limit-consumption-of-shared-buffer-data.patch -Patch34: 5e95ae77-Add-missing-memory-barrier-in-the-unlock-path-of-rwlock.patch -Patch35: 5e95af5e-xen-gnttab-Fix-error-path-in-map_grant_ref.patch -Patch36: 5e95afb8-gnttab-fix-GNTTABOP_copy-continuation-handling.patch +Patch1: 5eb51be6-cpupool-fix-removing-cpu-from-pool.patch +Patch2: 5eb51caa-sched-vcpu-pause-flags-atomic.patch +Patch3: 5ec2a760-x86-determine-MXCSR-mask-always.patch # Our platform specific patches Patch400: xen-destdir.patch Patch401: vif-bridge-no-iptables.patch @@ -297,8 +260,7 @@ %if 0%{?suse_version} >= 1315 Requires: grub2-x86_64-xen %endif -# Uncomment when ovmf is supported -#Requires: qemu-ovmf-x86_64 +Recommends: qemu-ovmf-x86_64 Requires: qemu-x86 %endif %ifarch %arm aarch64 @@ -431,39 +393,6 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 -%patch35 -p1 -%patch36 -p1 # Our platform specific patches %patch400 -p1 %patch401 -p1 @@ -517,9 +446,6 @@ %build %define _lto_cflags %{nil} -# JWF: Anthony's series to load BIOS from toolstack requires autogen.sh. -# http://lists.xenproject.org/archives/html/xen-devel/2016-03/msg01626.html -./autogen.sh # we control the version info of this package # to gain control of filename of xen.gz ++++++ 5eb51be6-cpupool-fix-removing-cpu-from-pool.patch ++++++ # Commit 498d73647fa17d9eb7a67d2e9bdccac6b438e559 # Date 2020-05-08 10:44:22 +0200 # Author Juergen Gross <jgr...@suse.com> # Committer Jan Beulich <jbeul...@suse.com> cpupool: fix removing cpu from a cpupool Commit cb563d7665f2 ("xen/sched: support core scheduling for moving cpus to/from cpupools") introduced a regression when trying to remove an offline cpu from a cpupool, as the system would crash in this situation. Fix that by testing the cpu to be online. Fixes: cb563d7665f2 ("xen/sched: support core scheduling for moving cpus to/from cpupools") Signed-off-by: Juergen Gross <jgr...@suse.com> Acked-by: Dario Faggioli <dfaggi...@suse.com> --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -519,6 +519,9 @@ static int cpupool_unassign_cpu(struct c debugtrace_printk("cpupool_unassign_cpu(pool=%d,cpu=%d)\n", c->cpupool_id, cpu); + if ( !cpu_online(cpu) ) + return -EINVAL; + master_cpu = sched_get_resource_cpu(cpu); ret = cpupool_unassign_cpu_start(c, master_cpu); if ( ret ) ++++++ 5eb51caa-sched-vcpu-pause-flags-atomic.patch ++++++ # Commit e0d92d9bd7997c6bcda17a19aba4f3957dd1a2e9 # Date 2020-05-08 10:47:38 +0200 # Author Juergen Gross <jgr...@suse.com> # Committer Jan Beulich <jbeul...@suse.com> sched: always modify vcpu pause flags atomically credit2 is currently modifying the pause flags of vcpus non-atomically via sched_set_pause_flags() and sched_clear_pause_flags(). This is dangerous as there are cases where the paus flags are modified without any lock held. So drop the non-atomic pause flag modification functions and rename the atomic ones dropping the _atomic suffix. Fixes: a76255b4266516 ("xen/sched: make credit2 scheduler vcpu agnostic.") Signed-off-by: Juergen Gross <jgr...@suse.com> Reviewed-by: Dario Faggioli <dfaggi...@suse.com> --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -452,7 +452,7 @@ static inline void __runq_tickle(struct SCHED_UNIT_STAT_CRANK(cur, kicked_away); SCHED_UNIT_STAT_CRANK(cur, migrate_r); SCHED_STAT_CRANK(migrate_kicked_away); - sched_set_pause_flags_atomic(cur->unit, _VPF_migrating); + sched_set_pause_flags(cur->unit, _VPF_migrating); } /* Tickle cpu anyway, to let new preempt cur. */ SCHED_STAT_CRANK(tickled_busy_cpu); @@ -983,7 +983,7 @@ csched_unit_acct(struct csched_private * { SCHED_UNIT_STAT_CRANK(svc, migrate_r); SCHED_STAT_CRANK(migrate_running); - sched_set_pause_flags_atomic(currunit, _VPF_migrating); + sched_set_pause_flags(currunit, _VPF_migrating); /* * As we are about to tickle cpu, we should clear its bit in * idlers. But, if we are here, it means there is someone running --- a/xen/include/xen/sched-if.h +++ b/xen/include/xen/sched-if.h @@ -175,7 +175,7 @@ static inline void sched_set_pause_flags struct vcpu *v; for_each_sched_unit_vcpu ( unit, v ) - __set_bit(bit, &v->pause_flags); + set_bit(bit, &v->pause_flags); } /* Clear a bit in pause_flags of all vcpus of a unit. */ @@ -184,26 +184,6 @@ static inline void sched_clear_pause_fla { struct vcpu *v; - for_each_sched_unit_vcpu ( unit, v ) - __clear_bit(bit, &v->pause_flags); -} - -/* Set a bit in pause_flags of all vcpus of a unit via atomic updates. */ -static inline void sched_set_pause_flags_atomic(struct sched_unit *unit, - unsigned int bit) -{ - struct vcpu *v; - - for_each_sched_unit_vcpu ( unit, v ) - set_bit(bit, &v->pause_flags); -} - -/* Clear a bit in pause_flags of all vcpus of a unit via atomic updates. */ -static inline void sched_clear_pause_flags_atomic(struct sched_unit *unit, - unsigned int bit) -{ - struct vcpu *v; - for_each_sched_unit_vcpu ( unit, v ) clear_bit(bit, &v->pause_flags); } ++++++ 5ec2a760-x86-determine-MXCSR-mask-always.patch ++++++ # Commit 2b532519d64e653a6bbfd9eefed6040a09c8876d # Date 2020-05-18 17:18:56 +0200 # Author Jan Beulich <jbeul...@suse.com> # Committer Jan Beulich <jbeul...@suse.com> x86: determine MXCSR mask in all cases For its use(s) by the emulator to be correct in all cases, the filling of the variable needs to be independent of XSAVE availability. As there's no suitable function in i387.c to put the logic in, keep it in xstate_init(), arrange for the function to be called unconditionally, and pull the logic ahead of all return paths there. Fixes: 9a4496a35b20 ("x86emul: support {,V}{LD,ST}MXCSR") Signed-off-by: Jan Beulich <jbeul...@suse.com> Reviewed-by: Andrew Cooper <andrew.coop...@citrix.com> --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -487,8 +487,7 @@ void identify_cpu(struct cpuinfo_x86 *c) /* Now the feature flags better reflect actual CPU features! */ - if ( cpu_has_xsave ) - xstate_init(c); + xstate_init(c); #ifdef NOISY_CAPS printk(KERN_DEBUG "CPU: After all inits, caps:"); --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -587,6 +587,18 @@ void xstate_init(struct cpuinfo_x86 *c) u32 eax, ebx, ecx, edx; u64 feature_mask; + if ( bsp ) + { + static typeof(current->arch.xsave_area->fpu_sse) __initdata ctxt; + + asm ( "fxsave %0" : "=m" (ctxt) ); + if ( ctxt.mxcsr_mask ) + mxcsr_mask = ctxt.mxcsr_mask; + } + + if ( !cpu_has_xsave ) + return; + if ( (bsp && !use_xsave) || boot_cpu_data.cpuid_level < XSTATE_CPUID ) { @@ -610,8 +622,6 @@ void xstate_init(struct cpuinfo_x86 *c) if ( bsp ) { - static typeof(current->arch.xsave_area->fpu_sse) __initdata ctxt; - xfeature_mask = feature_mask; /* * xsave_cntxt_size is the max size required by enabled features. @@ -620,10 +630,6 @@ void xstate_init(struct cpuinfo_x86 *c) xsave_cntxt_size = _xstate_ctxt_size(feature_mask); printk("xstate: size: %#x and states: %#"PRIx64"\n", xsave_cntxt_size, xfeature_mask); - - asm ( "fxsave %0" : "=m" (ctxt) ); - if ( ctxt.mxcsr_mask ) - mxcsr_mask = ctxt.mxcsr_mask; } else { ++++++ libxc.sr.superpage.patch ++++++ --- /var/tmp/diff_new_pack.X5Vlxs/_old 2020-06-04 17:50:53.067969837 +0200 +++ /var/tmp/diff_new_pack.X5Vlxs/_new 2020-06-04 17:50:53.071969850 +0200 @@ -12,10 +12,10 @@ must be freed on the receiving side to avoid over-allocation. The existing code for x86_pv is moved unmodified into its own file. -Index: xen-4.12.0-testing/tools/libxc/xc_dom_x86.c +Index: xen-4.13.1-testing/tools/libxc/xc_dom_x86.c =================================================================== ---- xen-4.12.0-testing.orig/tools/libxc/xc_dom_x86.c -+++ xen-4.12.0-testing/tools/libxc/xc_dom_x86.c +--- xen-4.13.1-testing.orig/tools/libxc/xc_dom_x86.c ++++ xen-4.13.1-testing/tools/libxc/xc_dom_x86.c @@ -45,11 +45,6 @@ #define SUPERPAGE_BATCH_SIZE 512 @@ -28,10 +28,10 @@ #define X86_CR0_PE 0x01 #define X86_CR0_ET 0x10 -Index: xen-4.12.0-testing/tools/libxc/xc_private.h +Index: xen-4.13.1-testing/tools/libxc/xc_private.h =================================================================== ---- xen-4.12.0-testing.orig/tools/libxc/xc_private.h -+++ xen-4.12.0-testing/tools/libxc/xc_private.h +--- xen-4.13.1-testing.orig/tools/libxc/xc_private.h ++++ xen-4.13.1-testing/tools/libxc/xc_private.h @@ -71,6 +71,11 @@ struct iovec { #define DECLARE_FLASK_OP struct xen_flask_op op #define DECLARE_PLATFORM_OP struct xen_platform_op platform_op @@ -44,10 +44,10 @@ #undef PAGE_SHIFT #undef PAGE_SIZE #undef PAGE_MASK -Index: xen-4.12.0-testing/tools/libxc/xc_sr_common.c +Index: xen-4.13.1-testing/tools/libxc/xc_sr_common.c =================================================================== ---- xen-4.12.0-testing.orig/tools/libxc/xc_sr_common.c -+++ xen-4.12.0-testing/tools/libxc/xc_sr_common.c +--- xen-4.13.1-testing.orig/tools/libxc/xc_sr_common.c ++++ xen-4.13.1-testing/tools/libxc/xc_sr_common.c @@ -156,6 +156,47 @@ static void __attribute__((unused)) buil } @@ -96,10 +96,10 @@ * Local variables: * mode: C * c-file-style: "BSD" -Index: xen-4.12.0-testing/tools/libxc/xc_sr_common.h +Index: xen-4.13.1-testing/tools/libxc/xc_sr_common.h =================================================================== ---- xen-4.12.0-testing.orig/tools/libxc/xc_sr_common.h -+++ xen-4.12.0-testing/tools/libxc/xc_sr_common.h +--- xen-4.13.1-testing.orig/tools/libxc/xc_sr_common.h ++++ xen-4.13.1-testing/tools/libxc/xc_sr_common.h @@ -140,6 +140,16 @@ struct xc_sr_restore_ops int (*setup)(struct xc_sr_context *ctx); @@ -247,10 +247,10 @@ #endif /* * Local variables: -Index: xen-4.12.0-testing/tools/libxc/xc_sr_restore.c +Index: xen-4.13.1-testing/tools/libxc/xc_sr_restore.c =================================================================== ---- xen-4.12.0-testing.orig/tools/libxc/xc_sr_restore.c -+++ xen-4.12.0-testing/tools/libxc/xc_sr_restore.c +--- xen-4.13.1-testing.orig/tools/libxc/xc_sr_restore.c ++++ xen-4.13.1-testing/tools/libxc/xc_sr_restore.c @@ -69,132 +69,6 @@ static int read_headers(struct xc_sr_con } @@ -428,10 +428,10 @@ if ( ctx.dominfo.hvm ) { -Index: xen-4.12.0-testing/tools/libxc/xc_sr_restore_x86_hvm.c +Index: xen-4.13.1-testing/tools/libxc/xc_sr_restore_x86_hvm.c =================================================================== ---- xen-4.12.0-testing.orig/tools/libxc/xc_sr_restore_x86_hvm.c -+++ xen-4.12.0-testing/tools/libxc/xc_sr_restore_x86_hvm.c +--- xen-4.13.1-testing.orig/tools/libxc/xc_sr_restore_x86_hvm.c ++++ xen-4.13.1-testing/tools/libxc/xc_sr_restore_x86_hvm.c @@ -135,6 +135,8 @@ static int x86_hvm_localise_page(struct static int x86_hvm_setup(struct xc_sr_context *ctx) { @@ -806,11 +806,11 @@ .process_record = x86_hvm_process_record, .stream_complete = x86_hvm_stream_complete, .cleanup = x86_hvm_cleanup, -Index: xen-4.12.0-testing/tools/libxc/xc_sr_restore_x86_pv.c +Index: xen-4.13.1-testing/tools/libxc/xc_sr_restore_x86_pv.c =================================================================== ---- xen-4.12.0-testing.orig/tools/libxc/xc_sr_restore_x86_pv.c -+++ xen-4.12.0-testing/tools/libxc/xc_sr_restore_x86_pv.c -@@ -938,6 +938,75 @@ static void x86_pv_set_gfn(struct xc_sr_ +--- xen-4.13.1-testing.orig/tools/libxc/xc_sr_restore_x86_pv.c ++++ xen-4.13.1-testing/tools/libxc/xc_sr_restore_x86_pv.c +@@ -960,6 +960,75 @@ static void x86_pv_set_gfn(struct xc_sr_ } /* @@ -886,7 +886,7 @@ * restore_ops function. Convert pfns back to mfns in pagetables. Possibly * needs to populate new frames if a PTE is found referring to a frame which * hasn't yet been seen from PAGE_DATA records. -@@ -981,7 +1050,7 @@ static int x86_pv_localise_page(struct x +@@ -1003,7 +1072,7 @@ static int x86_pv_localise_page(struct x } } @@ -895,7 +895,7 @@ return -1; for ( i = 0; i < (PAGE_SIZE / sizeof(uint64_t)); ++i ) -@@ -1161,6 +1230,7 @@ struct xc_sr_restore_ops restore_ops_x86 +@@ -1183,6 +1252,7 @@ struct xc_sr_restore_ops restore_ops_x86 .set_gfn = x86_pv_set_gfn, .localise_page = x86_pv_localise_page, .setup = x86_pv_setup, ++++++ libxl.libxl__domain_pvcontrol.patch ++++++ --- /var/tmp/diff_new_pack.X5Vlxs/_old 2020-06-04 17:50:53.087969901 +0200 +++ /var/tmp/diff_new_pack.X5Vlxs/_new 2020-06-04 17:50:53.087969901 +0200 @@ -11,18 +11,11 @@ tools/libxl/libxl_domain.c | 3 +++ 1 file changed, 3 insertions(+) ---- a/tools/libxl/libxl_domain.c -+++ b/tools/libxl/libxl_domain.c -@@ -765,24 +765,27 @@ char * libxl__domain_pvcontrol_read(libxl__gc *gc, xs_transaction_t t, - - int libxl__domain_pvcontrol(libxl__egc *egc, libxl__xswait_state *pvcontrol, - domid_t domid, const char *cmd) - { - STATE_AO_GC(pvcontrol->ao); - const char *shutdown_path; - int rc; - - rc = libxl__domain_pvcontrol_available(gc, domid); +Index: xen-4.13.1-testing/tools/libxl/libxl_domain.c +=================================================================== +--- xen-4.13.1-testing.orig/tools/libxl/libxl_domain.c ++++ xen-4.13.1-testing/tools/libxl/libxl_domain.c +@@ -795,6 +795,9 @@ int libxl__domain_pvcontrol(libxl__egc * if (rc < 0) return rc; @@ -32,12 +25,3 @@ shutdown_path = libxl__domain_pvcontrol_xspath(gc, domid); if (!shutdown_path) return ERROR_FAIL; - - rc = libxl__xs_printf(gc, XBT_NULL, shutdown_path, "%s", cmd); - if (rc) - return rc; - - pvcontrol->path = shutdown_path; - pvcontrol->what = GCSPRINTF("guest acknowledgement of %s request", cmd); - pvcontrol->timeout_ms = 60 * 1000; - rc = libxl__xswait_start(gc, pvcontrol); ++++++ xen-4.13.0-testing-src.tar.bz2 -> xen-4.13.1-testing-src.tar.bz2 ++++++ ++++ 4421 lines of diff (skipped) ++++++ xen.bug1026236.suse_vtsc_tolerance.patch ++++++ --- /var/tmp/diff_new_pack.X5Vlxs/_old 2020-06-04 17:50:57.023982425 +0200 +++ /var/tmp/diff_new_pack.X5Vlxs/_new 2020-06-04 17:50:57.027982438 +0200 @@ -8,8 +8,10 @@ the hostadmin to decide how much tolerance all running domUs can actually handle. The default is zero tolerance. ---- a/xen/arch/x86/time.c -+++ b/xen/arch/x86/time.c +Index: xen-4.13.1-testing/xen/arch/x86/time.c +=================================================================== +--- xen-4.13.1-testing.orig/xen/arch/x86/time.c ++++ xen-4.13.1-testing/xen/arch/x86/time.c @@ -43,6 +43,9 @@ static char __initdata opt_clocksource[10]; string_param("clocksource", opt_clocksource); @@ -20,7 +22,7 @@ unsigned long __read_mostly cpu_khz; /* CPU clock frequency in kHz. */ DEFINE_SPINLOCK(rtc_lock); unsigned long pit0_ticks; -@@ -2229,6 +2232,7 @@ int tsc_set_info(struct domain *d, +@@ -2230,6 +2233,7 @@ int tsc_set_info(struct domain *d, switch ( tsc_mode ) { @@ -28,7 +30,7 @@ case TSC_MODE_DEFAULT: case TSC_MODE_ALWAYS_EMULATE: d->arch.vtsc_offset = get_s_time() - elapsed_nsec; -@@ -2242,8 +2246,26 @@ int tsc_set_info(struct domain *d, +@@ -2243,8 +2247,26 @@ int tsc_set_info(struct domain *d, * When a guest is created, gtsc_khz is passed in as zero, making * d->arch.tsc_khz == cpu_khz. Thus no need to check incarnation. */ ++++++ xen.build-compare.doc_html.patch ++++++ --- /var/tmp/diff_new_pack.X5Vlxs/_old 2020-06-04 17:50:57.035982464 +0200 +++ /var/tmp/diff_new_pack.X5Vlxs/_new 2020-06-04 17:50:57.039982476 +0200 @@ -5,11 +5,11 @@ docs/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -Index: xen-4.13.0-testing/docs/Makefile +Index: xen-4.13.1-testing/docs/Makefile =================================================================== ---- xen-4.13.0-testing.orig/docs/Makefile -+++ xen-4.13.0-testing/docs/Makefile -@@ -188,7 +188,7 @@ uninstall: uninstall-man-pages uninstall +--- xen-4.13.1-testing.orig/docs/Makefile ++++ xen-4.13.1-testing/docs/Makefile +@@ -191,7 +191,7 @@ uninstall: uninstall-man-pages uninstall # Individual file build targets html/index.html: $(DOC_HTML) $(CURDIR)/gen-html-index INDEX @@ -18,7 +18,7 @@ html/%.txt: %.txt @$(INSTALL_DIR) $(@D) -@@ -203,8 +203,8 @@ html/hypercall/%/index.html: $(CURDIR)/x +@@ -206,8 +206,8 @@ html/hypercall/%/index.html: $(CURDIR)/x $(INSTALL_DIR) $(@D) $(PERL) -w $(CURDIR)/xen-headers -O $(@D) \ -T 'arch-$* - Xen public headers' \
