Hello community, here is the log from the commit of package xen for openSUSE:Factory checked in at 2020-09-18 14:26:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xen (Old) and /work/SRC/openSUSE:Factory/.xen.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xen" Fri Sep 18 14:26:58 2020 rev:290 rq:834358 version:4.14.0_06 Changes: -------- --- /work/SRC/openSUSE:Factory/xen/xen.changes 2020-09-05 23:57:08.383095719 +0200 +++ /work/SRC/openSUSE:Factory/.xen.new.4249/xen.changes 2020-09-18 14:28:08.459274689 +0200 @@ -1,0 +2,23 @@ +Fri Sep 11 11:11:11 UTC 2020 - oher...@suse.de + +- Revert previous libexec change for qemu compat wrapper + The path is used in existing domU.xml files in the emulator field +- Escape some % chars in xen.spec, they have to appear verbatim + +------------------------------------------------------------------- +Wed Sep 9 10:11:12 UTC 2020 - oher...@suse.de + +- Enhance libxc.migrate_tracking.patch + Print number of allocated pages on sending side, this is more + accurate than p2m_size. + +------------------------------------------------------------------- +Wed Sep 2 12:53:47 MDT 2020 - carn...@suse.com + +- jsc#SLE-15926 - Dev: XEN: drop netware support + Dropped the following patches + pygrub-netware-xnloader.patch + xnloader.py + Refreshed pygrub-boot-legacy-sles.patch + +------------------------------------------------------------------- Old: ---- pygrub-netware-xnloader.patch xnloader.py ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.mH2Vb6/_old 2020-09-18 14:28:10.459276703 +0200 +++ /var/tmp/diff_new_pack.mH2Vb6/_new 2020-09-18 14:28:10.467276711 +0200 @@ -1,7 +1,7 @@ # # spec file for package xen # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -123,7 +123,7 @@ BuildRequires: pesign-obs-integration %endif -Version: 4.14.0_02 +Version: 4.14.0_06 Release: 0 Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel) License: GPL-2.0-only @@ -149,8 +149,7 @@ # Init script and sysconf file for pciback Source34: init.pciback Source35: sysconfig.pciback -Source36: xnloader.py -Source37: xen2libvirt.py +Source36: xen2libvirt.py # Systemd service files Source41: xencommons.service Source42: xen-dom0-modules.service @@ -186,7 +185,6 @@ Patch452: hibernate.patch Patch453: stdvga-cache.patch Patch454: ipxe-enable-nics.patch -Patch455: pygrub-netware-xnloader.patch Patch456: pygrub-boot-legacy-sles.patch Patch457: pygrub-handle-one-line-menu-entries.patch Patch458: aarch64-rename-PSR_MODE_ELxx-to-match-linux-headers.patch @@ -217,7 +215,7 @@ Patch99996: xen.stubdom.newlib.patch Patch99998: tmp_build.patch Patch99999: reproducible.patch -Url: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/ +URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define pyver %(python3 -c "import sys; print(sys.version[:3])") @@ -416,7 +414,6 @@ %patch452 -p1 %patch453 -p1 %patch454 -p1 -%patch455 -p1 %patch456 -p1 %patch457 -p1 %patch458 -p1 @@ -564,7 +561,7 @@ find %{buildroot} -ls for i in %{buildroot}/%{_fillupdir}/* do - mv -v $i ${i%/*}/sysconfig.${i##*/} + mv -v $i ${i%%/*}/sysconfig.${i##*/} done # @@ -602,7 +599,7 @@ : just started ;; cpu/[0-9]/availability|cpu/[0-9][0-9]/availability) - vcpu="${REPLY%/*}" + vcpu="${REPLY%%/*}" vcpu="${vcpu#*/}" sysfs="/sys/devices/system/cpu/cpu${vcpu}/online" if test -f "${sysfs}" @@ -649,9 +646,9 @@ _EOR_ # tee ${udev_rulesdir}/80-%{name}-channel-setup.rules <<'_EOF_' -SUBSYSTEM=="xen", DEVPATH=="/devices/console-[0-9]", IMPORT{program}=="xen-channel-setup.sh $attr{nodename} %n" +SUBSYSTEM=="xen", DEVPATH=="/devices/console-[0-9]", IMPORT{program}=="xen-channel-setup.sh $attr{nodename} %%n" -SUBSYSTEM=="xen", DEVPATH=="/devices/console-[0-9]", ENV{XEN_CHANNEL_NAME}=="org.qemu.guest_agent.0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="qemu-ga@hvc%n.service" +SUBSYSTEM=="xen", DEVPATH=="/devices/console-[0-9]", ENV{XEN_CHANNEL_NAME}=="org.qemu.guest_agent.0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="qemu-ga@hvc%%n.service" _EOF_ # dracut_moduledir=%{buildroot}/usr/lib/dracut/modules.d/50%{name}-tools-domU @@ -781,14 +778,14 @@ rm -fv xen/.config %if %{with xen_debug} echo CONFIG_DEBUG=y > xen/.config -echo "CONFIG_DOM0_MEM=\"1G+10%,max:64G\"" >> xen/.config +echo "CONFIG_DOM0_MEM=\"1G+10%%,max:64G\"" >> xen/.config yes '' | make -C xen oldconfig make -C xen install DEBUG_DIR=/boot DESTDIR=%{buildroot} CC=$CC %{?_smp_mflags} install_xen dbg make -C xen clean %endif echo CONFIG_DEBUG=n > xen/.config -echo "CONFIG_DOM0_MEM=\"1G+10%,max:64G\"" >> xen/.config +echo "CONFIG_DOM0_MEM=\"1G+10%%,max:64G\"" >> xen/.config yes '' | make -C xen oldconfig make -C xen install DEBUG_DIR=/boot DESTDIR=%{buildroot} CC=$CC %{?_smp_mflags} install_xen @@ -802,12 +799,14 @@ # /usr/bin/qemu-system-i386 # Using qemu-system-x86_64 will result in an incompatible VM %ifarch x86_64 -cat > %{buildroot}%{_libexecdir}/xen/bin/qemu-system-i386 << 'EOF' +hardcoded_path_in_existing_domU_xml='/usr/lib/xen/bin' +mkdir -vp %{buildroot}${hardcoded_path_in_existing_domU_xml} +tee %{buildroot}${hardcoded_path_in_existing_domU_xml}/qemu-system-i386 << 'EOF' #!/bin/sh exec %{_bindir}/qemu-system-i386 "$@" EOF -chmod 0755 %{buildroot}%{_libexecdir}/xen/bin/qemu-system-i386 +chmod 0755 %{buildroot}${hardcoded_path_in_existing_domU_xml}/qemu-system-i386 # unit='%{_libexecdir}/%{name}/bin/xendomains-wait-disks' mkdir -vp '%{buildroot}%{_libexecdir}/%{name}/bin' @@ -853,7 +852,7 @@ # xen-utils make -C tools/xen-utils-0.1 install DESTDIR=%{buildroot} XEN_INTREE_BUILD=yes XEN_ROOT=$PWD -install -m755 %SOURCE37 %{buildroot}/usr/sbin/xen2libvirt +install -m755 %SOURCE36 %{buildroot}/usr/sbin/xen2libvirt install -m755 %SOURCE10183 %{buildroot}/usr/sbin/xen_maskcalc rm -f %{buildroot}/etc/xen/README* @@ -886,9 +885,6 @@ mkdir -p %{buildroot}/var/log/xen mkdir -p %{buildroot}/var/log/xen/console -# Bootloader -install -m644 %SOURCE36 %{buildroot}/%{_libdir}/python%{pyver}/site-packages - # Systemd cp -bavL %{S:41} %{buildroot}/%{_unitdir} bn=`basename %{S:42}` @@ -1061,6 +1057,9 @@ %dir /usr/lib/supportconfig %dir /usr/lib/supportconfig/plugins /usr/lib/supportconfig/plugins/xen +%dir /usr/lib/xen +%dir /usr/lib/xen/bin +/usr/lib/xen/bin/qemu-system-i386 %{_libexecdir}/xen %exclude %{_libexecdir}/%{name}-tools-domU %ifarch x86_64 @@ -1103,7 +1102,6 @@ %{_libdir}/python%{pyver}/site-packages/xen/lowlevel/* %{_libdir}/python%{pyver}/site-packages/xen/migration/* %{_libdir}/python%{pyver}/site-packages/*.so -%{_libdir}/python%{pyver}/site-packages/xnloader.py %dir %{_defaultdocdir}/xen %{_defaultdocdir}/xen/COPYING %{_defaultdocdir}/xen/README.SUSE ++++++ libxc.migrate_tracking.patch ++++++ --- /var/tmp/diff_new_pack.mH2Vb6/_old 2020-09-18 14:28:10.671276916 +0200 +++ /var/tmp/diff_new_pack.mH2Vb6/_new 2020-09-18 14:28:10.671276916 +0200 @@ -192,7 +192,7 @@ xc_interface *xch = ctx->xch; int rc, saved_rc = 0, saved_errno = 0; -+ SUSEINFO("domid %u: %s %s start", ctx->domid, ctx->uuid, __func__); ++ SUSEINFO("domid %u: %s %s start, %lu pages allocated", ctx->domid, ctx->uuid, __func__, ctx->dominfo.nr_pages); IPRINTF("Saving domain %d, type %s", ctx->domid, dhdr_type_to_str(guest_type)); @@ -215,17 +215,16 @@ return XGS_POLICY_CONTINUE_PRECOPY; out: -@@ -1051,6 +1057,9 @@ out: +@@ -1051,6 +1057,8 @@ out: return XGS_POLICY_ABORT; } suspend: -+ SUSEINFO("domid %u: suspending, remaining dirty pages %ld/%lu prior final transit", -+ suse_flags.ctx->domid, -+ suse_flags.dirty_count, suse_flags.ctx->save.p2m_size); ++ SUSEINFO("domid %u: suspending, remaining dirty pages %ld prior final transit", ++ suse_flags.ctx->domid, suse_flags.dirty_count); return XGS_POLICY_STOP_AND_COPY; } -@@ -1120,6 +1129,7 @@ int xc_domain_save_suse(xc_interface *xc +@@ -1120,6 +1128,7 @@ int xc_domain_save_suse(xc_interface *xc io_fd, dom, flags, ctx.dominfo.hvm); ctx.domid = dom; ++++++ pygrub-boot-legacy-sles.patch ++++++ --- /var/tmp/diff_new_pack.mH2Vb6/_old 2020-09-18 14:28:10.719276964 +0200 +++ /var/tmp/diff_new_pack.mH2Vb6/_new 2020-09-18 14:28:10.719276964 +0200 @@ -1,8 +1,8 @@ -Index: xen-4.13.0-testing/tools/pygrub/src/pygrub +Index: xen-4.14.0-testing/tools/pygrub/src/pygrub =================================================================== ---- xen-4.13.0-testing.orig/tools/pygrub/src/pygrub -+++ xen-4.13.0-testing/tools/pygrub/src/pygrub -@@ -453,7 +453,7 @@ class Grub: +--- xen-4.14.0-testing.orig/tools/pygrub/src/pygrub ++++ xen-4.14.0-testing/tools/pygrub/src/pygrub +@@ -452,7 +452,7 @@ class Grub: self.cf.filename = f break if self.__dict__.get('cf', None) is None: @@ -11,7 +11,7 @@ f = fs.open_file(self.cf.filename) # limit read size to avoid pathological cases buf = f.read(FS_READ_MAX) -@@ -628,6 +628,20 @@ def run_grub(file, entry, fs, cfg_args): +@@ -627,6 +627,20 @@ def run_grub(file, entry, fs, cfg_args): g = Grub(file, fs) @@ -32,7 +32,7 @@ if list_entries: for i in range(len(g.cf.images)): img = g.cf.images[i] -@@ -723,6 +737,19 @@ def sniff_netware(fs, cfg): +@@ -722,6 +736,19 @@ def sniff_netware(fs, cfg): return cfg @@ -52,7 +52,7 @@ def format_sxp(kernel, ramdisk, args): s = "linux (kernel %s)" % repr(kernel) if ramdisk: -@@ -806,7 +833,7 @@ if __name__ == "__main__": +@@ -803,7 +830,7 @@ if __name__ == "__main__": debug = False not_really = False output_format = "sxp"
