November 2017 - openSUSE Commits - openSUSE Mailing Lists

commit libreoffice for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2017-11-30 12:42:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libreoffice (Old) and /work/SRC/openSUSE:Factory/.libreoffice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libreoffice" Thu Nov 30 12:42:15 2017 rev:141 rq:545573 version:5.4.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libreoffice/libreoffice.changes 2017-11-14 14:18:27.944897441 +0100 +++ /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice.changes 2017-11-30 12:43:28.238108475 +0100 @@ -1,0 +2,11 @@ +Sat Nov 18 18:42:01 UTC 2017 - tchvatal(a)suse.com + +- Version update to release 5.4.3.2: + * Various fixes in 5.4 branch + +------------------------------------------------------------------- +Thu Nov 16 12:53:43 UTC 2017 - tchvatal(a)suse.com + +- Disable the CppunitTest_desktop_lib as it fails on the utf encoding + +------------------------------------------------------------------- Old: ---- libreoffice-5.4.2.2.tar.xz libreoffice-help-5.4.2.2.tar.xz libreoffice-translations-5.4.2.2.tar.xz New: ---- libreoffice-5.4.3.2.tar.xz libreoffice-help-5.4.3.2.tar.xz libreoffice-translations-5.4.3.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice.spec ++++++ --- /var/tmp/diff_new_pack.5trWAN/_old 2017-11-30 12:43:38.669729226 +0100 +++ /var/tmp/diff_new_pack.5trWAN/_new 2017-11-30 12:43:38.673729081 +0100 @@ -22,7 +22,7 @@ %define numbertext_version 0.9.5 # Urls %define external_url http://dev-www.libreoffice.org/src/ -%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.4.2 +%define tarball_url http://download.documentfoundation.org/libreoffice/src/5.4.3 #%define tarball_url http://dev-builds.libreoffice.org/pre-releases/src/ # Wether to enable the kde integration %if 0%{?is_opensuse} && 0%{?suse_version} < 1330 @@ -41,7 +41,7 @@ %bcond_with system_gpgme %endif Name: libreoffice -Version: 5.4.2.2 +Version: 5.4.3.2 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0+ and MPL-2.0+ @@ -936,6 +936,11 @@ %patch104 -p1 %patch990 -p1 +# Disable some of the failing tests (some are random) +%if 0%{?suse_version} < 1330 +sed -i -e '/CppunitTest_desktop_lib/d' desktop/Module_desktop.mk +%endif + # Do not generate doxygen timestamp echo "HTML_TIMESTAMP = NO" >> odk/docs/cpp/Doxyfile echo "HTML_TIMESTAMP = NO" >> odk/docs/idl/Doxyfile ++++++ libreoffice-5.4.2.2.tar.xz -> libreoffice-5.4.3.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-5.4.2.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-5.4.3.2.tar.xz differ: char 27, line 1 ++++++ libreoffice-help-5.4.2.2.tar.xz -> libreoffice-help-5.4.3.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-5.4.2.2/ChangeLog-helpcontent2 new/libreoffice-5.4.3.2/ChangeLog-helpcontent2 --- old/libreoffice-5.4.2.2/ChangeLog-helpcontent2 2017-09-27 20:17:24.000000000 +0200 +++ new/libreoffice-5.4.3.2/ChangeLog-helpcontent2 2017-11-03 15:21:52.000000000 +0100 @@ -1,14 +1,20 @@ -2017-09-27 Christian Lohmaier <lohmaier+LibreOffice(a)googlemail.com> [744bd4403b694434075b89e9afa267e0739f5ec9] +2017-11-03 Christian Lohmaier <lohmaier+LibreOffice(a)googlemail.com> [0c492e53805fa148b2128c77aeaaffb08b9a6302] - Version 5.4.2.2, tag libreoffice-5.4.2.2 + Version 5.4.3.2, tag libreoffice-5.4.3.2-hotfix1 - Change-Id: I4717f0ae01b527e8e8b7f2f9a0844db5c56f5a29 + Change-Id: I71c4f38d82dcf08521a514cc4c1b992129d9947d -2017-09-15 Christian Lohmaier <lohmaier+LibreOffice(a)googlemail.com> [37b7b1e6b6740f522f9858cff8da05f85a6d0894] +2017-11-03 Christian Lohmaier <lohmaier+LibreOffice(a)googlemail.com> [ee9bf7432c3a738418b63c9a12a4131f718b7a97] - Branch libreoffice-5-4-2 + Version 5.4.3.2, tag libreoffice-5.4.3.2 - This is 'libreoffice-5-4-2' - the stable branch for the 5.4.2 release. + Change-Id: Id56bbd1389cf8f1614ad71d6b111ff779f2b4f8d + +2017-10-17 Christian Lohmaier <lohmaier+LibreOffice(a)googlemail.com> [9ed423ecae614c8ac2dd151302dc8fff1e1707aa] + + Branch libreoffice-5-4-3 + + This is 'libreoffice-5-4-3' - the stable branch for the 5.4.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.4.x release, @@ -16,7 +22,7 @@ If you want to build something cool, unstable, and risky, use master. - Change-Id: I565aaf29fec9fb6ef1cfedd011ab043d54238ae3 + Change-Id: I5e77d6dcbb14b671756f2d4583a006eb12cf379b 2017-07-06 Olivier Hallot <olivier.hallot(a)libreoffice.org> [c2bea45cca3f5afa702b8b92ad744e0c9f8320db] ++++++ libreoffice-translations-5.4.2.2.tar.xz -> libreoffice-translations-5.4.3.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/libreoffice/libreoffice-translations-5.4.2.2.tar.xz /work/SRC/openSUSE:Factory/.libreoffice.new/libreoffice-translations-5.4.3.2.tar.xz differ: char 26, line 1

1 0

commit MozillaThunderbird for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package MozillaThunderbird for openSUSE:Factory checked in at 2017-11-30 12:41:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaThunderbird (Old) and /work/SRC/openSUSE:Factory/.MozillaThunderbird.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaThunderbird" Thu Nov 30 12:41:58 2017 rev:185 rq:545445 version:52.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaThunderbird/MozillaThunderbird.changes 2017-10-09 19:36:53.109478766 +0200 +++ /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/MozillaThunderbird.changes 2017-11-30 12:42:00.173310226 +0100 @@ -1,0 +2,32 @@ +Wed Nov 22 10:02:35 UTC 2017 - wr(a)rosenauer.org + +- update to Thunderbird 52.5.0 (bsc#1068101) + * Better support for Charter/Spectrum IMAP: Thunderbird will now + detect Charter's IMAP service and send an additional IMAP select + command to the server. Check the various preferences ending in + "force_select" to see whether auto-detection has discovered this case. + * In search folders spanning multiple base folders clicking on a + message sometimes marked another message as read + * IMAP alerts have been corrected and now show the correct server + name in case of connection problems + * POP alerts have been corrected and now indicate connection problems + in case the configured POP server cannot be found + MFSA 2017-26 + * CVE-2017-7828 (bmo#1406750. bmo#1412252) + Use-after-free of PressShell while restyling layout + * CVE-2017-7830 (bmo#1408990) + Cross-origin URL information leak through Resource Timing API + * CVE-2017-7826 + Memory safety bugs fixed in Firefox 57 and Firefox ESR 52.5 + +------------------------------------------------------------------- +Fri Nov 10 22:12:18 UTC 2017 - zaitor(a)opensuse.org + +- Drop obsolete libgnomeui-devel BuildRequires: No longer needed. +- Add explicit pkgconfig(gconf-2.0), pkgconfig(gobject-2.0), + pkgconfig(gtk+-2.0), pkgconfig(gtk+-unix-print-2.0), + pkgconfig(glib-2.0), pkgconfig(gobject-2.0) and + pkgconfig(gdk-x11-2.0) BuildRequires: Previously pulled in by + libgnomeui-devel, and is what configure really checks for. + +------------------------------------------------------------------- Old: ---- l10n-52.4.0.tar.xz thunderbird-52.4.0-source.tar.xz New: ---- l10n-52.5.0.tar.xz thunderbird-52.5.0-source.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaThunderbird.spec ++++++ --- /var/tmp/diff_new_pack.lmltTB/_old 2017-11-30 12:42:16.140729690 +0100 +++ /var/tmp/diff_new_pack.lmltTB/_new 2017-11-30 12:42:16.144729545 +0100 @@ -17,9 +17,9 @@ # -%define mainversion 52.4.0 +%define mainversion 52.5.0 %define update_channel release -%define releasedate 201710040000 +%define releasedate 201711210000 %bcond_without mozilla_tb_kde4 %bcond_with mozilla_tb_valgrind @@ -39,7 +39,6 @@ BuildRequires: hunspell-devel BuildRequires: libXcomposite-devel BuildRequires: libcurl-devel -BuildRequires: libgnomeui-devel BuildRequires: libidl-devel BuildRequires: libnotify-devel BuildRequires: mozilla-nspr-devel >= 4.13.1 @@ -52,6 +51,13 @@ BuildRequires: xz BuildRequires: yasm BuildRequires: zip +BuildRequires: pkgconfig(gconf-2.0) >= 1.2.1 +BuildRequires: pkgconfig(gdk-x11-2.0) +BuildRequires: pkgconfig(glib-2.0) >= 2.22 +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gtk+-2.0) >= 2.18.0 +BuildRequires: pkgconfig(gtk+-unix-print-2.0) BuildRequires: pkgconfig(libffi) BuildRequires: pkgconfig(libpulse) %if %{with mozilla_tb_valgrind} ++++++ compare-locales.tar.xz ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.lmltTB/_old 2017-11-30 12:42:16.292724164 +0100 +++ /var/tmp/diff_new_pack.lmltTB/_new 2017-11-30 12:42:16.292724164 +0100 @@ -2,8 +2,8 @@ CHANNEL="esr52" BRANCH="releases/comm-$CHANNEL" -RELEASE_TAG="THUNDERBIRD_52_4_0_RELEASE" -VERSION="52.4.0" +RELEASE_TAG="THUNDERBIRD_52_5_0_RELEASE" +VERSION="52.5.0" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH thunderbird ++++++ l10n-52.4.0.tar.xz -> l10n-52.5.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaThunderbird/l10n-52.4.0.tar.xz /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/l10n-52.5.0.tar.xz differ: char 26, line 1 ++++++ thunderbird-52.4.0-source.tar.xz -> thunderbird-52.5.0-source.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaThunderbird/thunderbird-52.4.0-source.tar.xz /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/thunderbird-52.5.0-source.tar.xz differ: char 26, line 1

1 0

commit lvm2 for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package lvm2 for openSUSE:Factory checked in at 2017-11-30 12:41:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lvm2 (Old) and /work/SRC/openSUSE:Factory/.lvm2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lvm2" Thu Nov 30 12:41:52 2017 rev:111 rq:545433 version:2.02.176 Changes: -------- --- /work/SRC/openSUSE:Factory/lvm2/device-mapper.changes 2017-11-09 13:40:44.792447910 +0100 +++ /work/SRC/openSUSE:Factory/.lvm2.new/device-mapper.changes 2017-11-30 12:41:54.193527637 +0100 @@ -1,0 +2,31 @@ +Tue Nov 21 09:29:02 UTC 2017 - zren(a)suse.com + +- Update to LVM2.2.02.176: + Keep Install section only in lvm2-{lvmetad,lvmpolld}.socket systemd unit. + Fix segfault in lvm_pv_remove in liblvm. (2.02.173) + Do not allow storing VG metadata with LV without any segment. + Fix printed message when thin snapshot was already merged. + Remove created spare LV when creation of thin-pool failed. + Avoid reading ignored metadata when mda gets used again. + Fix detection of moved PVs in vgsplit. (2.02.175) + Ignore --stripes/--stripesize on RAID takeover + Improve used paths for generated systemd units and init shells. + Disallow creation of snapshot of mirror/raid subLV (was never supported). + Fix regression in more advanced vgname extraction in lvconvert (2.02.169). + Allow lvcreate to be used for caching of _tdata LV. + Avoid internal error when resizing cache type _tdata LV (not yet supported). + Show original converted names when lvconverting LV to pool volume. + Move lib code used only by liblvm into metadata-liblvm.c. + Distinguish between device not found and excluded by filter. + Monitor external origin LVs. + Remove the replicator code, including configure --with-replicators. + Allow lvcreate --type mirror to work with 100%FREE. + Improve selection of resource name for complex volume activation lock. + Avoid cutting first character of resource name for activation lock. + Support for encrypted devices in fsadm. + Improve thin pool overprovisioning and repair warning messages. + Fix incorrect adjustment of region size on striped RaidLVs. +- Drop: bug-960044_lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch +- Refresh: fate-31841_fsadm-add-support-for-btrfs.patch + +------------------------------------------------------------------- lvm2-clvm.changes: same change lvm2.changes: same change Old: ---- LVM2.2.02.175.tgz LVM2.2.02.175.tgz.asc bug-960044_lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch New: ---- LVM2.2.02.176.tgz LVM2.2.02.176.tgz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ device-mapper.spec ++++++ --- /var/tmp/diff_new_pack.DDtl3X/_old 2017-11-30 12:41:55.001498261 +0100 +++ /var/tmp/diff_new_pack.DDtl3X/_new 2017-11-30 12:41:55.005498116 +0100 @@ -19,8 +19,8 @@ %define libname libdevmapper1_03 %define libname_event libdevmapper-event1_03 ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.175 -%define device_mapper_version 1.02.144 +%define lvm2_version 2.02.176 +%define device_mapper_version 1.02.145 %define thin_provisioning_version 0.7.0 ### COMMON-DEF-END ### Name: device-mapper @@ -57,12 +57,10 @@ Patch1003: fate-31841_fsadm-add-support-for-btrfs.patch #bsc#935623 Patch1004: bug-935623_dmeventd-fix-dso-name-wrong-compare.patch -#bsc#960044 -Patch1005: bug-960044_lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch #SUSE patches 2000+ for device mapper, udev rules #bsc#1012973 -Patch2006: bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch +Patch2001: bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch ### COMMON-PATCH-END ### %description @@ -75,8 +73,7 @@ %patch1002 -p1 %patch1003 -p1 %patch1004 -p1 -%patch1005 -p1 -%patch2006 -p1 +%patch2001 -p1 ### COMMON-PREP-END ### %build ++++++ lvm2-clvm.spec ++++++ --- /var/tmp/diff_new_pack.DDtl3X/_old 2017-11-30 12:41:55.045496661 +0100 +++ /var/tmp/diff_new_pack.DDtl3X/_new 2017-11-30 12:41:55.049496516 +0100 @@ -19,8 +19,8 @@ %define dlm_version 3.99.1 %define sanlock_version 3.3.0 ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.175 -%define device_mapper_version 1.02.144 +%define lvm2_version 2.02.176 +%define device_mapper_version 1.02.145 %define thin_provisioning_version 0.7.0 ### COMMON-DEF-END ### Name: lvm2-clvm @@ -58,12 +58,10 @@ Patch1003: fate-31841_fsadm-add-support-for-btrfs.patch #bsc#935623 Patch1004: bug-935623_dmeventd-fix-dso-name-wrong-compare.patch -#bsc#960044 -Patch1005: bug-960044_lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch #SUSE patches 2000+ for device mapper, udev rules #bsc#1012973 -Patch2006: bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch +Patch2001: bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch ### COMMON-PATCH-END ### %description @@ -77,8 +75,7 @@ %patch1002 -p1 %patch1003 -p1 %patch1004 -p1 -%patch1005 -p1 -%patch2006 -p1 +%patch2001 -p1 ### COMMON-PREP-END ### %build ++++++ lvm2.spec ++++++ --- /var/tmp/diff_new_pack.DDtl3X/_old 2017-11-30 12:41:55.081495353 +0100 +++ /var/tmp/diff_new_pack.DDtl3X/_new 2017-11-30 12:41:55.085495207 +0100 @@ -21,8 +21,8 @@ %define cmdlib liblvm2cmd2_02 ### COMMON-DEF-BEGIN ### -%define lvm2_version 2.02.175 -%define device_mapper_version 1.02.144 +%define lvm2_version 2.02.176 +%define device_mapper_version 1.02.145 %define thin_provisioning_version 0.7.0 ### COMMON-DEF-END ### @@ -68,12 +68,10 @@ Patch1003: fate-31841_fsadm-add-support-for-btrfs.patch #bsc#935623 Patch1004: bug-935623_dmeventd-fix-dso-name-wrong-compare.patch -#bsc#960044 -Patch1005: bug-960044_lvm2-lvmetad.service-add-Also-lvm2-lvmetad.socket.patch #SUSE patches 2000+ for device mapper, udev rules #bsc#1012973 -Patch2006: bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch +Patch2001: bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch ### COMMON-PATCH-END ### # 3000+ for test code @@ -95,8 +93,7 @@ %patch1002 -p1 %patch1003 -p1 %patch1004 -p1 -%patch1005 -p1 -%patch2006 -p1 +%patch2001 -p1 ### COMMON-PREP-END ### %patch3001 -p1 ++++++ LVM2.2.02.175.tgz -> LVM2.2.02.176.tgz ++++++ ++++ 10724 lines of diff (skipped) ++++++ fate-31841_fsadm-add-support-for-btrfs.patch ++++++ --- /var/tmp/diff_new_pack.DDtl3X/_old 2017-11-30 12:41:55.753470921 +0100 +++ /var/tmp/diff_new_pack.DDtl3X/_new 2017-11-30 12:41:55.757470776 +0100 @@ -1,4 +1,4 @@ -From ecc163a3cb10a8ad89a445ec9d6fdb5a30c380de Mon Sep 17 00:00:00 2001 +From 701999ed1d48cadb34084253c698fb9b45763499 Mon Sep 17 00:00:00 2001 From: Eric Ren <zren(a)suse.com> Date: Thu, 6 Jul 2017 17:42:58 +0800 Subject: [PATCH] fsadm: add support for btrfs @@ -9,11 +9,11 @@ the device id since there are maybe several devices underneath btrfs filesystem --- - scripts/fsadm.sh | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- - 1 file changed, 71 insertions(+), 3 deletions(-) + scripts/fsadm.sh | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 72 insertions(+), 3 deletions(-) diff --git a/scripts/fsadm.sh b/scripts/fsadm.sh -index 459905f..1219549 100755 +index 4f402ce..6501e34 100755 --- a/scripts/fsadm.sh +++ b/scripts/fsadm.sh @@ -22,6 +22,7 @@ @@ -24,15 +24,15 @@ # # Return values: # 0 success -@@ -56,6 +57,7 @@ FSCK=fsck - XFS_CHECK=xfs_check +@@ -57,6 +58,7 @@ XFS_CHECK=xfs_check # XFS_REPAIR -n is used when XFS_CHECK is not found XFS_REPAIR=xfs_repair + CRYPTSETUP=cryptsetup +BTRFS=btrfs # user may override lvm location by setting LVM_BINARY LVM=${LVM_BINARY:-lvm} -@@ -75,6 +77,9 @@ BLOCKCOUNT= +@@ -76,6 +78,9 @@ BLOCKCOUNT= MOUNTPOINT= MOUNTED= REMOUNT= @@ -42,7 +42,7 @@ PROCDIR="/proc" PROCMOUNTS="$PROCDIR/mounts" PROCSELFMOUNTINFO="$PROCDIR/self/mountinfo" -@@ -225,6 +230,33 @@ detect_fs() { +@@ -227,6 +232,33 @@ detect_fs() { verbose "\"$FSTYPE\" filesystem found on \"$VOLUME\"." } @@ -76,7 +76,7 @@ # Check that passed mounted MAJOR:MINOR is not matching $MAJOR:MINOR of resized $VOLUME validate_mounted_major_minor() { -@@ -352,8 +384,12 @@ detect_mounted_with_proc_mounts() { +@@ -354,8 +386,12 @@ detect_mounted_with_proc_mounts() { # check if the given device is already mounted and where # FIXME: resolve swap usage and device stacking @@ -91,8 +91,8 @@ detect_mounted_with_proc_self_mountinfo elif test -e "$PROCMOUNTS"; then detect_mounted_with_proc_mounts -@@ -520,6 +556,31 @@ resize_xfs() { - fi +@@ -654,6 +690,32 @@ resize_crypt() { + dry $CRYPTSETUP resize "$1" --size $CRYPT_RESIZE_BLOCKS || error "$CRYPTSETUP failed to resize device $1" } +######################## @@ -120,31 +120,32 @@ + verbose "Resizing filesystem on device \"$VOLUME\" to $NEWSIZE bytes(btrfs devid: $BTRFS_DEVID) " + dry "$BTRFS" filesystem resize "$BTRFS_DEVID":"$NEWSIZE" "$MOUNTPOINT" +} ++ #################### # Resize filesystem #################### -@@ -536,6 +597,7 @@ resize() { - "ext3"|"ext2"|"ext4") resize_ext $NEWSIZE ;; - "reiserfs") resize_reiser $NEWSIZE ;; - "xfs") resize_xfs $NEWSIZE ;; +@@ -676,6 +738,7 @@ resize() { + "crypto_LUKS") + which $CRYPTSETUP > /dev/null 2>&1 || error "$CRYPTSETUP utility required to resize LUKS volume" + resize_luks $NEWSIZE ;; + "btrfs") resize_btrfs $NEWSIZE ;; *) error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool." ;; esac || error "Resize $FSTYPE failed." - cleanup 0 -@@ -593,6 +655,12 @@ check() { - # Think about better way.... - dry "$XFS_REPAIR" -n -o force_geometry "$VOLUME" - fi ;; + test -z "$CRYPT_SHRINK" || resize_crypt "$VOLUME_ORIG" +@@ -748,6 +811,12 @@ check() { + "crypto_LUKS") + which $CRYPTSETUP > /dev/null 2>&1 || error "$CRYPTSETUP utility required." + check_luks ;; + "btrfs") #mount the device first and then run scrub + MOUNTPOINT=$TEMPDIR + temp_mount || error "Cannot mount btrfs filesystem" + dry "$BTRFS" scrub start -B "$VOLUME" + test "$MOUNTPOINT" = "$TEMPDIR" && MOUNTPOINT="" temp_umount + ;; - *) # check if executed from interactive shell environment - case "$-" in - *i*) dry "$FSCK" $YES $FORCE "$VOLUME" ;; -@@ -614,7 +682,7 @@ test -n "$FSADM_RUNNING" && exit 0 + *) + error "Filesystem \"$FSTYPE\" on device \"$VOLUME\" is not supported by this tool." ;; + esac +@@ -766,7 +835,7 @@ test -n "$FSADM_RUNNING" && exit 0 for i in "$TUNE_EXT" "$RESIZE_EXT" "$TUNE_REISER" "$RESIZE_REISER" \ "$TUNE_XFS" "$RESIZE_XFS" "$MOUNT" "$UMOUNT" "$MKDIR" \ "$RMDIR" "$BLOCKDEV" "$BLKID" "$GREP" "$READLINK" \

1 0

commit pcsc-lite for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package pcsc-lite for openSUSE:Factory checked in at 2017-11-30 12:41:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcsc-lite (Old) and /work/SRC/openSUSE:Factory/.pcsc-lite.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pcsc-lite" Thu Nov 30 12:41:46 2017 rev:75 rq:545322 version:1.8.22 Changes: -------- --- /work/SRC/openSUSE:Factory/pcsc-lite/pcsc-lite.changes 2017-06-21 13:49:46.954077530 +0200 +++ /work/SRC/openSUSE:Factory/.pcsc-lite.new/pcsc-lite.changes 2017-11-30 12:41:48.313741413 +0100 @@ -1,0 +2,6 @@ +Thu Nov 23 13:52:37 UTC 2017 - rbrown(a)suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-lite.spec ++++++ --- /var/tmp/diff_new_pack.nKUK5q/_old 2017-11-30 12:41:49.029715382 +0100 +++ /var/tmp/diff_new_pack.nKUK5q/_new 2017-11-30 12:41:49.029715382 +0100 @@ -16,6 +16,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + # FIXME: Maybe we should use /usr/lib/pcsc/drivers as others do: %define ifddir %{_libdir}/readers %define USER scard @@ -130,8 +135,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/reader.conf.d/ sed s:@ifddir@:%{ifddir}: <pcsc-lite-reader-conf >%{buildroot}%{_sysconfdir}/reader.conf.d/reader.conf ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcpcscd -mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates -cp %{name}.sysconfig %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.pcscd +mkdir -p %{buildroot}%{_fillupdir} +cp %{name}.sysconfig %{buildroot}%{_fillupdir}/sysconfig.pcscd mkdir -p %{buildroot}%{_docdir}/%{name} cp -a AUTHORS ChangeLog COPYING DRIVERS HELP NEWS README README.SUSE SECURITY TODO %{buildroot}%{_docdir}/%{name} # Remove useless la files @@ -181,7 +186,7 @@ %config(noreplace) %{_sysconfdir}/reader.conf.d/reader.conf %{ifddir} %{_unitdir}/* -%{_localstatedir}/adm/fillup-templates/sysconfig.pcscd +%{_fillupdir}/sysconfig.pcscd # libpcsclite.so should stay in the main package (#732911). Third party packages may need it for dlopen(). %{_libdir}/libpcsclite.so %{_datadir}/polkit-1/actions/org.debian.pcsc-lite.policy

1 0

commit ebtables for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package ebtables for openSUSE:Factory checked in at 2017-11-30 12:41:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ebtables (Old) and /work/SRC/openSUSE:Factory/.ebtables.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ebtables" Thu Nov 30 12:41:41 2017 rev:39 rq:545296 version:2.0.10.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ebtables/ebtables.changes 2017-04-17 10:20:49.516829998 +0200 +++ /work/SRC/openSUSE:Factory/.ebtables.new/ebtables.changes 2017-11-30 12:41:42.369957518 +0100 @@ -1,0 +2,6 @@ +Thu Nov 23 13:37:47 UTC 2017 - rbrown(a)suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ebtables.spec ++++++ --- /var/tmp/diff_new_pack.zkPOXr/_old 2017-11-30 12:41:43.061932359 +0100 +++ /var/tmp/diff_new_pack.zkPOXr/_new 2017-11-30 12:41:43.061932359 +0100 @@ -16,6 +16,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + Name: ebtables Version: 2.0.10.4 Release: 0 @@ -92,16 +97,16 @@ INITDIR="%{_sysconfdir}/init.d" \ SYSCONFIGDIR="%{_sysconfdir}" \ install -mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates +mkdir -p %{buildroot}%{_fillupdir} mkdir -p %{buildroot}%{_unitdir} install -p %{SOURCE1} %{buildroot}%{_unitdir}/ chmod -x %{buildroot}%{_unitdir}/*.service mkdir -p %{buildroot}%{_libexecdir} install -m0755 %{SOURCE2} %{buildroot}%{_libexecdir}/ebtables ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} -touch %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.filter -touch %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.nat -touch %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.broute +touch %{buildroot}%{_fillupdir}/sysconfig.%{name}.filter +touch %{buildroot}%{_fillupdir}/sysconfig.%{name}.nat +touch %{buildroot}%{_fillupdir}/sysconfig.%{name}.broute rm -rf %{buildroot}%{_initrddir} # not used rm -f "%{buildroot}/%{_sysconfdir}/ebtables-config" @@ -126,9 +131,9 @@ %config(noreplace) %{_sysconfdir}/ethertypes %{_libexecdir}/%{name} %{_unitdir}/%{name}.service -%ghost %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.filter -%ghost %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.nat -%ghost %{_localstatedir}/adm/fillup-templates/sysconfig.%{name}.broute +%ghost %{_fillupdir}/sysconfig.%{name}.filter +%ghost %{_fillupdir}/sysconfig.%{name}.nat +%ghost %{_fillupdir}/sysconfig.%{name}.broute %dir %{_libdir}/%{name} %{_libdir}/%{name}/*.so %{_sbindir}/ebtables

1 0

commit docker for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package docker for openSUSE:Factory checked in at 2017-11-30 12:41:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker (Old) and /work/SRC/openSUSE:Factory/.docker.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "docker" Thu Nov 30 12:41:35 2017 rev:64 rq:545292 version:17.07.0_ce Changes: -------- --- /work/SRC/openSUSE:Factory/docker/docker.changes 2017-11-10 14:42:50.823646548 +0100 +++ /work/SRC/openSUSE:Factory/.docker.new/docker.changes 2017-11-30 12:41:40.326031831 +0100 @@ -1,0 +2,19 @@ +Thu Nov 23 13:48:08 UTC 2017 - rbrown(a)suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +------------------------------------------------------------------- +Tue Nov 14 22:39:56 UTC 2017 - asarai(a)suse.com + +- Remove migration code for the v1.9.x -> v1.10.x migration. This has been + around for a while, and we no longer support migrating from such an old + version "nicely". Docker still has migration code that will run on + first-boot, we are merely removing all of the "nice" warnings which tell + users how to avoid issues during an upgrade that ocurred more than a year + ago. +- Drop un-needed files: + - docker-plugin-message.txt + - docker-update-message.txt + +------------------------------------------------------------------- @@ -37 +56 @@ -- Update to Docker v17.07-ce. Upstream changelog: +- Update to Docker v17.07-ce (bsc#1069758). Upstream changelog: Old: ---- docker-plugin-message.txt docker-update-message.txt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker.spec ++++++ --- /var/tmp/diff_new_pack.bJySsx/_old 2017-11-30 12:41:41.166001291 +0100 +++ /var/tmp/diff_new_pack.bJySsx/_new 2017-11-30 12:41:41.170001146 +0100 @@ -17,12 +17,14 @@ # nodebuginfo -%global docker_store %{_localstatedir}/lib/docker -%global docker_migration_testfile %{docker_store}/.suse-image-migration-v1to2-complete -%global docker_migration_warnfile %{docker_store}/docker-update-message.txt -%global docker_plugin_warnfile %{docker_store}/docker-plugin-message.txt -%define docker_graph %{docker_store}/graph -%define __arch_install_post export NO_BRP_STRIP_DEBUG=true +# Where important update information will be stored, such that an administrator +# is guaranteed to see the relevant warning. +%define update_messages %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release} + +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif # Used when generating the "build" information for Docker version. The value of # git_commit_epoch is unused here (we use SOURCE_DATE_EPOCH, which rpm @@ -32,12 +34,6 @@ %define git_version 87847530f717 %define git_commit_epoch 1508266293 -# When upgrading to a new version requires the service not to be restarted -# Due to a long migration process update last_migration_version to the new version -# that will first perform the migration, last time this was needed was version -# 1.10.1 -%global last_migration_version 1.10.1 - Name: docker Version: 17.07.0_ce Release: 0 @@ -54,8 +50,6 @@ Source7: README_SUSE.md Source8: docker-audit.rules Source9: tests.sh -Source50: docker-update-message.txt -Source51: docker-plugin-message.txt # SUSE-FEATURE: Adds the /run/secrets mountpoint inside all Docker containers # which is not snapshotted when images are committed. Note that if you modify # this patch, please also modify the patch in the suse-secrets-v<version> @@ -124,8 +118,6 @@ Requires(post): %fillup_prereq Requires(post): udev Requires(post): shadow -# Not necessary, but must be installed to have a smooth upgrade. -Recommends: docker-image-migrator # Not necessary, but must be installed when the underlying system is # configured to use lvm and the user doesn't explicitly provide a # different storage-driver than devicemapper @@ -342,7 +334,7 @@ install -d %{buildroot}%{_bindir} install -D -m755 components/cli/build/docker %{buildroot}/%{_bindir}/docker install -D -m755 components/engine/bundles/latest/dynbinary-daemon/dockerd %{buildroot}/%{_bindir}/dockerd -install -d %{buildroot}/%{_prefix}/lib/docker +install -d %{buildroot}/%{_localstatedir}/lib/docker install -Dd -m 0755 \ %{buildroot}%{_sysconfdir}/init.d \ %{buildroot}%{_sbindir} @@ -370,7 +362,7 @@ install -D -m 0640 %{SOURCE8} %{buildroot}%{_sysconfdir}/audit/rules.d/%{name}.rules # sysconfig file -install -D -m 644 %{SOURCE4} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.docker +install -D -m 644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.docker # install manpages (using the ones from the engine) install -d %{buildroot}%{_mandir}/man1 @@ -380,54 +372,13 @@ install -d %{buildroot}%{_mandir}/man8 install -p -m 644 components/cli/man/man8/*.8 %{buildroot}%{_mandir}/man8 -install -D -m 0644 %{SOURCE50} %{buildroot}%{docker_migration_warnfile} -install -D -m 0644 %{SOURCE51} %{buildroot}%{docker_plugin_warnfile} - %fdupes %{buildroot} %pre -# TODO: Remove this code in the near future. -# In order to make sure we don't print a scary warning when we shouldn't we -# need to test these things (in this order): -# 1. Check that %%{_localstatedir}/lib/docker actually exists (docker daemon has run). -# 2. Check that the migrator has *not* finished. -# 3. Check that %%{_localstatedir}/lib/docker/graph exists (this is a <=1.9.1 thing, but -# will stick around if it has been migrated -- which is why we need the -# MIGRATION_TESTFILE check). -# 4. Check that there are images in the graph/ directory. -if [[ -x %{_bindir}/docker && -d "%{docker_store}" && -n "$(find "%{docker_graph}" -maxdepth 1 -type d 2>/dev/null | grep -Ev '_tmp|^%{docker_graph}$')" ]]; then - # Check if currently installed version of docker is old enough to need migration. - CURRENT_DOCKER_VERSION=$(docker -v | sed 's/^.*[^0-9]$[0-9]*\.[0-9]*\.[0-9]*$.*$/\1/') - # This variable will contain the current docker version if migration is needed otherwise it will contain the upgrade point. - # Next time the docker package needs to be upgraded without restarting the service increase the 1.10.1 to the new version. - NEED_UPGRADE_VERSION=$(echo -e "$CURRENT_DOCKER_VERSION\n%{last_migration_version}" | sort -V | head -1) - - if [[ $CURRENT_DOCKER_VERSION == $NEED_UPGRADE_VERSION ]]; then - touch %{docker_migration_testfile} - fi -fi - getent group docker >/dev/null || groupadd -r docker %service_add_pre %{name}.service %post -if [ -e %{docker_migration_testfile} ]; then - cat %{docker_migration_warnfile} >> /var/adm/update-messages/docker-%{version}-%{release} -else - if [ -e %{docker_migration_warnfile} ]; then - rm %{docker_migration_warnfile} - fi -fi - -# TODO: Remove this code in the near future. -# If plugins.json is present, docker will fail to start. It should be noted -# that this was not supported by us, as it was only experimental at the time. -# But handle this migration anyway. https://github.com/docker/docker/releases/tag/v1.13.0 -if [ -e /var/lib/docker/plugins/plugins.json ];then - cat %{docker_plugin_warnfile} >> /var/adm/update-messages/docker-%{version}-%{release} - mv /var/lib/docker/plugins/plugins.json /var/lib/docker/plugins/_plugins.json.old -fi - %service_add_post %{name}.service %{fillup_only -n docker} @@ -435,10 +386,6 @@ %service_del_preun %{name}.service %postun -if [ -e %{docker_migration_testfile} ]; then - rm %{docker_migration_testfile} - export DISABLE_RESTART_ON_UPDATE=yes -fi %service_del_postun %{name}.service %files @@ -450,8 +397,8 @@ %{_unitdir}/%{name}.service %config %{_sysconfdir}/audit/rules.d/%{name}.rules %{_udevrulesdir}/80-%{name}.rules -%{_localstatedir}/adm/fillup-templates/sysconfig.docker -%{_localstatedir}/lib/docker/ +%{_fillupdir}/sysconfig.docker +%dir %{_localstatedir}/lib/docker/ %{_mandir}/man1/docker-*.1%{ext_man} %{_mandir}/man1/docker.1%{ext_man} %{_mandir}/man5/Dockerfile.5%{ext_man} ++++++ secrets-0001-daemon-allow-directory-creation-in-run-secrets.patch ++++++ --- /var/tmp/diff_new_pack.bJySsx/_old 2017-11-30 12:41:41.305996201 +0100 +++ /var/tmp/diff_new_pack.bJySsx/_new 2017-11-30 12:41:41.309996056 +0100 @@ -70,5 +70,5 @@ return errors.Wrap(err, "error setting ownership for secret") } -- -2.14.2 +2.15.0 ++++++ secrets-0002-SUSE-implement-SUSE-container-secrets.patch ++++++ --- /var/tmp/diff_new_pack.bJySsx/_old 2017-11-30 12:41:41.329995328 +0100 +++ /var/tmp/diff_new_pack.bJySsx/_new 2017-11-30 12:41:41.333995183 +0100 @@ -1,4 +1,4 @@ -From afb202611a8330e0b3a7900aa2d68b7cc1d489fe Mon Sep 17 00:00:00 2001 +From 7c03750568cb9b67b763cd03f92ce45c567ca043 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai <asarai(a)suse.de> Date: Wed, 8 Mar 2017 11:43:29 +1100 Subject: [PATCH 2/2] SUSE: implement SUSE container secrets @@ -13,8 +13,8 @@ Signed-off-by: Aleksa Sarai <asarai(a)suse.de> --- daemon/start.go | 5 + - daemon/suse_secrets.go | 328 +++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 333 insertions(+) + daemon/suse_secrets.go | 331 +++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 336 insertions(+) create mode 100644 daemon/suse_secrets.go diff --git a/daemon/start.go b/daemon/start.go @@ -35,10 +35,10 @@ return err diff --git a/daemon/suse_secrets.go b/daemon/suse_secrets.go new file mode 100644 -index 000000000000..b09ad96f01b0 +index 000000000000..b6914adf09ce --- /dev/null +++ b/daemon/suse_secrets.go -@@ -0,0 +1,328 @@ +@@ -0,0 +1,331 @@ +/* + * suse-secrets: patch for Docker to implement SUSE secrets + * Copyright (C) 2017 SUSE LLC. @@ -94,6 +94,9 @@ +} + +func (s SuseFakeFile) id() string { ++ // NOTE: It is _very_ important that this string always has a prefix of ++ // "suse". This is how we can ensure that we can operate on ++ // SecretReferences with a confidence that it was made by us. + return fmt.Sprintf("suse_%s_%s", digest.FromBytes(s.Data).Hex(), s.Path) +} + @@ -113,7 +116,7 @@ + // mapped). + ctrUser := idtools.IDPair{UID: s.Uid, GID: s.Gid} + hostUser := idMaps.RootPair() -+ if user, err := idMaps.ToHost(ctrUser); err != nil { ++ if user, err := idMaps.ToHost(ctrUser); err == nil { + hostUser = user + } + @@ -368,5 +371,5 @@ + return nil +} -- -2.14.2 +2.15.0

1 0

commit xen for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package xen for openSUSE:Factory checked in at 2017-11-30 12:41:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xen (Old) and /work/SRC/openSUSE:Factory/.xen.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xen" Thu Nov 30 12:41:28 2017 rev:237 rq:545274 version:4.10.0_03 Changes: -------- --- /work/SRC/openSUSE:Factory/xen/xen.changes 2017-11-03 16:23:00.656227202 +0100 +++ /work/SRC/openSUSE:Factory/.xen.new/xen.changes 2017-11-30 12:41:33.874266405 +0100 @@ -1,0 +2,55 @@ +Fri Nov 24 17:28:59 UTC 2017 - carnold(a)suse.com + +- Update to Xen 4.10.0-rc6 (fate#321394, fate#322686) + xen-4.10.0-testing-src.tar.bz2 + +------------------------------------------------------------------- +Fri Nov 24 13:25:07 UTC 2017 - ohering(a)suse.de + +- Since xen switched to Kconfig, building a debug hypervisor + was done by default. Adjust make logic to build a non-debug + hypervisor by default, and continue to provide one as xen-dbg.gz + +------------------------------------------------------------------- +Fri Nov 24 11:26:45 UTC 2017 - ohering(a)suse.de + +- fate#316614: set migration constraints from cmdline + fix libxl.set-migration-constraints-from-cmdline.patch for xen-4.10 + +------------------------------------------------------------------- +Thu Nov 23 15:06:44 UTC 2017 - ohering(a)suse.de + +- Document the suse-diskcache-disable-flush option in + xl-disk-configuration(5) (bsc#879425,bsc#1067317) + +------------------------------------------------------------------- +Thu Nov 23 13:47:42 UTC 2017 - rbrown(a)suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +------------------------------------------------------------------- +Thu Nov 16 08:48:07 MST 2017 - carnold(a)suse.com + +- Update to Xen 4.10.0-rc5 (fate#321394, fate#322686) + xen-4.10.0-testing-src.tar.bz2 +- fate#323663 - Run Xenstore in stubdomain + xenstore-run-in-studomain.patch + +------------------------------------------------------------------- +Thu Nov 9 15:11:57 MST 2017 - carnold(a)suse.com + +- bsc#1067224 - xen-tools have hard dependency on Python 2 + pygrub-python3-conversion.patch + xenmon-python3-conversion.patch + migration-python3-conversion.patch + xnloader.py + xen2libvirt.py + +------------------------------------------------------------------- +Wed Nov 8 10:47:24 UTC 2017 - ohering(a)suse.de + +- Remove xendriverdomain.service (bsc#1065185) + Driver domains must be configured manually with custom .service file + +------------------------------------------------------------------- @@ -24,2 +78,0 @@ -- Drop until further notice - libxl.set-migration-constraints-from-cmdline.patch New: ---- libxl.set-migration-constraints-from-cmdline.patch migration-python3-conversion.patch pygrub-python3-conversion.patch xenmon-python3-conversion.patch xenstore-run-in-studomain.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.JSV8D9/_old 2017-11-30 12:41:36.366175804 +0100 +++ /var/tmp/diff_new_pack.JSV8D9/_new 2017-11-30 12:41:36.374175513 +0100 @@ -18,6 +18,11 @@ # needssslcertforbuild +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + Name: xen ExclusiveArch: %ix86 x86_64 %arm aarch64 %define changeset 35349 @@ -126,7 +131,7 @@ BuildRequires: pesign-obs-integration %endif -Version: 4.10.0_01 +Version: 4.10.0_03 Release: 0 Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel) License: GPL-2.0 @@ -190,6 +195,12 @@ Patch463: libxl.add-option-to-disable-disk-cache-flushes-in-qdisk.patch Patch464: libxl.pvscsi.patch Patch465: xen.libxl.dmmd.patch +Patch466: libxl.set-migration-constraints-from-cmdline.patch +Patch467: xenstore-run-in-studomain.patch +# python3 conversion patches +Patch500: pygrub-python3-conversion.patch +Patch501: xenmon-python3-conversion.patch +Patch502: migration-python3-conversion.patch # Hypervisor and PV driver Patches Patch601: x86-ioapic-ack-default.patch Patch602: x86-cpufreq-report.patch @@ -371,6 +382,12 @@ %patch463 -p1 %patch464 -p1 %patch465 -p1 +%patch466 -p1 +%patch467 -p1 +# python3 conversion patches +%patch500 -p1 +%patch501 -p1 +%patch502 -p1 # Hypervisor and PV driver Patches %patch601 -p1 %patch602 -p1 @@ -444,6 +461,8 @@ %if %{with xen_stubdom} configure_flags=--enable-stubdom %else +# pick the default during a fresh install +sed -i~ '/^XENSTORETYPE=domain/d' tools/hotplug/Linux/init.d/sysconfig.xencommons.in configure_flags=--disable-stubdom %endif configure_flags="${configure_flags} --disable-qemu-traditional" @@ -486,11 +505,11 @@ # tools make \ DESTDIR=$RPM_BUILD_ROOT \ - SYSCONFIG_DIR=/var/adm/fillup-templates \ + SYSCONFIG_DIR=%{_fillupdir} \ %{?_smp_mflags} \ install find $RPM_BUILD_ROOT -ls -for i in $RPM_BUILD_ROOT/var/adm/fillup-templates/* +for i in $RPM_BUILD_ROOT%{_fillupdir}/* do mv -v $i ${i%/*}/sysconfig.${i##*/} done @@ -597,12 +616,17 @@ %if %{?with_gcc48}0 CC=gcc-4.8 %endif +rm -fv xen/.config %if %{with xen_debug} -make -C xen install debug=y DEBUG_DIR=/boot DESTDIR=$RPM_BUILD_ROOT CC=$CC %{?_smp_mflags} +echo CONFIG_DEBUG=y > xen/.config +yes '' | make -C xen oldconfig +make -C xen install DEBUG_DIR=/boot DESTDIR=$RPM_BUILD_ROOT CC=$CC %{?_smp_mflags} install_xen dbg make -C xen clean %endif -make -C xen install debug=n DEBUG_DIR=/boot DESTDIR=$RPM_BUILD_ROOT CC=$CC %{?_smp_mflags} +echo CONFIG_DEBUG=n > xen/.config +yes '' | make -C xen oldconfig +make -C xen install DEBUG_DIR=/boot DESTDIR=$RPM_BUILD_ROOT CC=$CC %{?_smp_mflags} install_xen make -C xen clean echo > xen.files.txt @@ -702,7 +726,7 @@ echo "ExecStart=-/bin/sh -c 'modprobe $mod || :'" >> $RPM_BUILD_ROOT%{_unitdir}/${bn} done rm -rfv $RPM_BUILD_ROOT%{_initddir} -install -m644 %SOURCE35 $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.pciback +install -m644 %SOURCE35 $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.pciback # Clean up unpackaged files find $RPM_BUILD_ROOT \( \ @@ -733,6 +757,9 @@ : fi +# "xl devd" has to be called manually in a driver domain +find $RPM_BUILD_ROOT -name xendriverdomain.service -print -delete + # Create symlinks for keymaps %fdupes -s $RPM_BUILD_ROOT find $RPM_BUILD_ROOT -size 0 -delete @@ -747,6 +774,7 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/python* rm -rf $RPM_BUILD_ROOT/%{_libdir}/ocaml* rm -rf $RPM_BUILD_ROOT%{_unitdir} +rm -rf $RPM_BUILD_ROOT%{_fillupdir} rm -rf $RPM_BUILD_ROOT%{with_systemd_modules_load} rm -rf $RPM_BUILD_ROOT/usr/sbin rm -rf $RPM_BUILD_ROOT/etc/xen @@ -855,9 +883,9 @@ %dir /usr/lib/supportconfig/plugins /usr/lib/supportconfig/plugins/xen %{_libexecdir}/xen -/var/adm/fillup-templates/sysconfig.pciback -/var/adm/fillup-templates/sysconfig.xencommons -/var/adm/fillup-templates/sysconfig.xendomains +%{_fillupdir}/sysconfig.pciback +%{_fillupdir}/sysconfig.xencommons +%{_fillupdir}/sysconfig.xendomains %dir /var/lib/xen %dir %attr(700,root,root) /var/lib/xen/images %dir %attr(700,root,root) /var/lib/xen/save @@ -1019,7 +1047,6 @@ %service_add_pre xenconsoled.service %service_add_pre xen-init-dom0.service %service_add_pre xen-qemu-dom0-disk-backend.service -%service_add_pre xendriverdomain.service %post tools xen_tools_first_arg=$1 @@ -1033,7 +1060,6 @@ %service_add_post xenconsoled.service %service_add_post xen-init-dom0.service %service_add_post xen-qemu-dom0-disk-backend.service -%service_add_post xendriverdomain.service if [ -f /usr/bin/qemu-img ]; then if [ -f /usr/bin/qemu-img-xen ]; then @@ -1069,7 +1095,6 @@ %service_del_preun xenconsoled.service %service_del_preun xen-init-dom0.service %service_del_preun xen-qemu-dom0-disk-backend.service -%service_del_preun xendriverdomain.service %postun tools export DISABLE_RESTART_ON_UPDATE=yes @@ -1081,7 +1106,6 @@ %service_del_postun xenconsoled.service %service_del_postun xen-init-dom0.service %service_del_postun xen-qemu-dom0-disk-backend.service -%service_del_postun xendriverdomain.service %endif ++++++ aarch64-rename-PSR_MODE_ELxx-to-match-linux-headers.patch ++++++ --- /var/tmp/diff_new_pack.JSV8D9/_old 2017-11-30 12:41:36.446172895 +0100 +++ /var/tmp/diff_new_pack.JSV8D9/_new 2017-11-30 12:41:36.446172895 +0100 @@ -10,11 +10,11 @@ xen/include/public/arch-arm.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -Index: xen-4.7.0-testing/xen/include/public/arch-arm.h +Index: xen-4.10.0-testing/xen/include/public/arch-arm.h =================================================================== ---- xen-4.7.0-testing.orig/xen/include/public/arch-arm.h -+++ xen-4.7.0-testing/xen/include/public/arch-arm.h -@@ -362,13 +362,13 @@ typedef uint64_t xen_callback_t; +--- xen-4.10.0-testing.orig/xen/include/public/arch-arm.h ++++ xen-4.10.0-testing/xen/include/public/arch-arm.h +@@ -363,13 +363,13 @@ typedef uint64_t xen_callback_t; /* 64 bit modes */ #define PSR_MODE_BIT 0x10 /* Set iff AArch32 */ ++++++ libxl.add-option-to-disable-disk-cache-flushes-in-qdisk.patch ++++++ --- /var/tmp/diff_new_pack.JSV8D9/_old 2017-11-30 12:41:36.602167223 +0100 +++ /var/tmp/diff_new_pack.JSV8D9/_new 2017-11-30 12:41:36.602167223 +0100 @@ -81,3 +81,40 @@ /* the target magic parameter, eats the rest of the string */ +Index: xen-4.10.0-testing/docs/man/xl-disk-configuration.pod.5 +=================================================================== +--- xen-4.10.0-testing.orig/docs/man/xl-disk-configuration.pod.5 ++++ xen-4.10.0-testing/docs/man/xl-disk-configuration.pod.5 +@@ -344,6 +344,32 @@ can be used to disable "hole punching" f + were intentionally created non-sparse to avoid fragmentation of the + file. + ++=item B<suse-diskcache-disable-flush> ++ ++=over 4 ++ ++=item Description ++ ++Request that the qemu block driver does not automatically flush written data to the backend storage. ++ ++=item Supported values ++ ++absent, present ++ ++=item Mandatory ++ ++No ++ ++=item Default value ++ ++absent ++ ++=back ++ ++This enables the '-disk cache=unsafe' mode inside qemu. ++In this mode writes to the underlying blockdevice are delayed. ++While using this option in production is dangerous, it improves performance during installation of a domU. ++ + =back + + ++++++ libxl.set-migration-constraints-from-cmdline.patch ++++++ >From 77deb80879859ed279e24a790ec08e9c5d37dd0e Mon Sep 17 00:00:00 2001 From: Olaf Hering <olaf(a)aepfle.de> Date: Wed, 5 Feb 2014 14:37:53 +0100 Subject: libxl: set migration constraints from cmdline Add new options to xl migrate to control the process of migration. The intention is to optionally abort the migration if it takes too long to migrate a busy guest due to the high number of new dirty pages. Currently the guest is suspended to transfer the remaining dirty pages. The suspend/resume cycle will cause a time jump. This transfer can take a long time, which can confuse the guest if the time jump is too far. The new options allow to override the built-in default values, which are not changed by this patch. --max_iters <number> Number of iterations before final suspend (default: 30) --max_factor <factor> Max amount of memory to transfer before final suspend (default: 3*RAM) --min_remaing <pages> Number of dirty pages before stop&copy (default: 50) --abort_if_busy Abort migration instead of doing final suspend. The changes to libxl change the API, handle LIBXL_API_VERSION == 0x040200. v8: - merge --min_remaing changes - tools/libxc: print stats if migration is aborted - use special _suse version of lib calls to preserve ABI v7: - remove short options - update description of --abort_if_busy in xl.1 - extend description of --abort_if_busy in xl help - add comment to libxl_domain_suspend declaration, props is optional v6: - update the LIBXL_API_VERSION handling for libxl_domain_suspend change it to an inline function if LIBXL_API_VERSION is defined to 4.2.0 - rename libxl_save_properties to libxl_domain_suspend_properties - rename ->xlflags to ->flags within that struct v5: - adjust libxl_domain_suspend prototype, move flags, max_iters, max_factor into a new, optional struct libxl_save_properties - rename XCFLAGS_DOMSAVE_NOSUSPEND to XCFLAGS_DOMSAVE_ABORT_IF_BUSY - rename LIBXL_SUSPEND_NO_FINAL_SUSPEND to LIBXL_SUSPEND_ABORT_IF_BUSY - rename variables no_suspend to abort_if_busy - rename option -N/--no_suspend to -A/--abort_if_busy - update xl.1, extend description of -A option v4: - update default for no_suspend from None to 0 in XendCheckpoint.py:save - update logoutput in setMigrateConstraints - change xm migrate defaults from None to 0 - add new options to xl.1 - fix syntax error in XendDomain.py:domain_migrate_constraints_set - fix xm migrate -N option name to match xl migrate v3: - move logic errors in libxl__domain_suspend and fixed help text in cmd_table to separate patches - fix syntax error in XendCheckpoint.py - really pass max_iters and max_factor in libxl__xc_domain_save - make libxl_domain_suspend_0x040200 declaration globally visible - bump libxenlight.so SONAME from 2.0 to 2.1 due to changed libxl_domain_suspend v2: - use LIBXL_API_VERSION and define libxl_domain_suspend_0x040200 - fix logic error in min_reached check in xc_domain_save - add longopts - update --help text - correct description of migrate --help text Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- docs/man/xl.pod.1 | 20 +++++++++++++++++++ tools/libxc/include/xenguest.h | 7 ++++++ tools/libxc/xc_nomigrate.c | 10 +++++++++ tools/libxc/xc_sr_common.h | 1 tools/libxc/xc_sr_save.c | 22 +++++++++++++++------ tools/libxl/libxl.c | 29 ++++++++++++++++++++++++---- tools/libxl/libxl.h | 15 ++++++++++++++ tools/libxl/libxl_dom_save.c | 1 tools/libxl/libxl_internal.h | 4 +++ tools/libxl/libxl_save_callout.c | 4 ++- tools/libxl/libxl_save_helper.c | 8 ++++--- tools/libxl/xl_cmdimpl.c | 40 +++++++++++++++++++++++++++++++++------ tools/libxl/xl_cmdtable.c | 23 ++++++++++++++-------- 13 files changed, 156 insertions(+), 28 deletions(-) Index: xen-4.10.0-testing/docs/man/xl.pod.1.in =================================================================== --- xen-4.10.0-testing.orig/docs/man/xl.pod.1.in +++ xen-4.10.0-testing/docs/man/xl.pod.1.in @@ -459,6 +459,26 @@ Display huge (!) amount of debug informa Leave the domain on the receive side paused after migration. +=item B<--max_iters> I<number> + +Number of iterations before final suspend (default: 30) + +=item B<--max_factor> I<factor> + +Max amount of memory to transfer before final suspend (default: 3*RAM) + +=item B<--min_remaining> + +Number of remaining dirty pages. If the number of dirty pages drops that +low the guest is suspended and the remaing pages are transfered to <host>. + +=item B<--abort_if_busy> + +Abort migration instead of doing final suspend/transfer/resume if the +guest has still dirty pages after the number of iterations and/or the +amount of RAM transferred. This avoids long periods of time where the +guest is suspended. + =back =item B<remus> [I<OPTIONS>] I<domain-id> I<host> Index: xen-4.10.0-testing/tools/libxc/include/xenguest.h =================================================================== --- xen-4.10.0-testing.orig/tools/libxc/include/xenguest.h +++ xen-4.10.0-testing/tools/libxc/include/xenguest.h @@ -29,6 +29,7 @@ #define XCFLAGS_HVM (1 << 2) #define XCFLAGS_STDVGA (1 << 3) #define XCFLAGS_CHECKPOINT_COMPRESS (1 << 4) +#define XCFLAGS_DOMSAVE_ABORT_IF_BUSY (1 << 5) #define X86_64_B_SIZE 64 #define X86_32_B_SIZE 32 @@ -131,10 +132,20 @@ typedef enum { * doesn't use checkpointing * @return 0 on success, -1 on failure */ +int xc_domain_save_suse(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iters, + uint32_t max_factor, uint32_t flags /* XCFLAGS_xxx */, + uint32_t min_remaining, + struct save_callbacks* callbacks, int hvm, + xc_migration_stream_t stream_type, int recv_fd); +static inline int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t flags /* XCFLAGS_xxx */, struct save_callbacks* callbacks, int hvm, - xc_migration_stream_t stream_type, int recv_fd); + xc_migration_stream_t stream_type, int recv_fd) +{ + return xc_domain_save_suse(xch,io_fd,dom,0,0,flags,0,callbacks,hvm,stream_type,recv_fd); +} + /* callbacks provided by xc_domain_restore */ struct restore_callbacks { Index: xen-4.10.0-testing/tools/libxc/xc_nomigrate.c =================================================================== --- xen-4.10.0-testing.orig/tools/libxc/xc_nomigrate.c +++ xen-4.10.0-testing/tools/libxc/xc_nomigrate.c @@ -20,9 +20,11 @@ #include <xenctrl.h> #include <xenguest.h> -int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t flags, - struct save_callbacks* callbacks, int hvm, - xc_migration_stream_t stream_type, int recv_fd) +int xc_domain_save_suse(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iters, + uint32_t max_factor, uint32_t flags, + uint32_t min_remaining, + struct save_callbacks* callbacks, int hvm, + xc_migration_stream_t stream_type, int recv_fd) { errno = ENOSYS; return -1; Index: xen-4.10.0-testing/tools/libxc/xc_sr_save.c =================================================================== --- xen-4.10.0-testing.orig/tools/libxc/xc_sr_save.c +++ xen-4.10.0-testing/tools/libxc/xc_sr_save.c @@ -525,6 +525,11 @@ static int send_memory_live(struct xc_sr policy_decision = precopy_policy(*policy_stats, data); x++; + if ( policy_decision == XGS_POLICY_ABORT ) + { + rc = -1; + break; + } if ( stats.dirty_count > 0 && policy_decision != XGS_POLICY_ABORT ) { rc = update_progress_string(ctx, &progress_str); @@ -545,6 +550,11 @@ static int send_memory_live(struct xc_sr policy_decision = precopy_policy(*policy_stats, data); + if ( policy_decision == XGS_POLICY_ABORT ) + { + rc = -1; + break; + } if ( policy_decision != XGS_POLICY_CONTINUE_PRECOPY ) break; @@ -965,9 +975,71 @@ static int save(struct xc_sr_context *ct return rc; }; -int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, - uint32_t flags, struct save_callbacks* callbacks, - int hvm, xc_migration_stream_t stream_type, int recv_fd) +static struct suse_flags { + struct xc_sr_context *ctx; + unsigned long cnt; + uint32_t max_iters; + unsigned long max_factor; + long min_remaining; + long dirty_count; + uint32_t abort_if_busy; +} suse_flags; + +static int suse_precopy_policy(struct precopy_stats stats, void *user) +{ + xc_interface *xch = suse_flags.ctx->xch; + + suse_flags.cnt++; + errno = 0; + DBGPRINTF("%s: domU %u: #%lu iteration %u total_written %u dirty_count %ld", + __func__, suse_flags.ctx->domid, suse_flags.cnt, stats.iteration, stats.total_written, stats.dirty_count); + + if ( stats.dirty_count >= 0 ) + suse_flags.dirty_count = stats.dirty_count; + + /* Stop loop after N iterations */ + if ( stats.iteration > suse_flags.max_iters ) + { + IPRINTF("%s: domU %u, too many iterations (%u/%u)", + __func__, suse_flags.ctx->domid, stats.iteration, suse_flags.max_iters); + goto out; + } + /* Suspend domU in case only few dirty pages remain */ + if ( stats.dirty_count >= 0 && stats.dirty_count < suse_flags.min_remaining ) + { + IPRINTF("%s: domU %u, dirty_count reached (%ld/%ld)", + __func__, suse_flags.ctx->domid, stats.dirty_count, suse_flags.min_remaining); + goto suspend; + } + /* Stop loop if too much memory was transfered (formula incorrect for ballooned domU) */ + if ( stats.total_written > suse_flags.max_factor * suse_flags.ctx->save.p2m_size ) + { + IPRINTF("%s: domU %u, too much memory transfered (%u/%lu)", + __func__, suse_flags.ctx->domid, stats.total_written, suse_flags.max_factor * suse_flags.ctx->save.p2m_size); + goto out; + } + /* Keep going */ + return XGS_POLICY_CONTINUE_PRECOPY; + +out: + if ( suse_flags.abort_if_busy ) + { + errno = EBUSY; + PERROR("%s: domU %u busy, dirty pages %ld/%lu after %u iterations, %u pages transfered", + __func__, suse_flags.ctx->domid, + suse_flags.dirty_count, suse_flags.ctx->save.p2m_size, + stats.iteration, stats.total_written); + return XGS_POLICY_ABORT; + } +suspend: + return XGS_POLICY_STOP_AND_COPY; +} + +int xc_domain_save_suse(xc_interface *xch, int io_fd, uint32_t dom, + uint32_t max_iters, uint32_t max_factor, uint32_t flags, + uint32_t min_remaining, + struct save_callbacks* callbacks, int hvm, + xc_migration_stream_t stream_type, int recv_fd) { struct xc_sr_context ctx = { @@ -982,6 +1054,19 @@ int xc_domain_save(xc_interface *xch, in ctx.save.checkpointed = stream_type; ctx.save.recv_fd = recv_fd; + if ( callbacks->precopy_policy ) + { + errno = EBUSY; + PERROR("%s: precopy_policy already set (%p)", __func__, callbacks->precopy_policy); + return -1; + } + callbacks->precopy_policy = suse_precopy_policy; + suse_flags.ctx = &ctx; + suse_flags.max_iters = max_iters ? : 5; + suse_flags.max_factor = max_factor ? : 3; + suse_flags.min_remaining = min_remaining ? : 50; + suse_flags.abort_if_busy = !!(flags & XCFLAGS_DOMSAVE_ABORT_IF_BUSY); + /* If altering migration_stream update this assert too. */ assert(stream_type == XC_MIG_STREAM_NONE || stream_type == XC_MIG_STREAM_REMUS || Index: xen-4.10.0-testing/tools/libxl/libxl.h =================================================================== --- xen-4.10.0-testing.orig/tools/libxl/libxl.h +++ xen-4.10.0-testing/tools/libxl/libxl.h @@ -1467,8 +1467,23 @@ int libxl_domain_suspend(libxl_ctx *ctx, int flags, /* LIBXL_SUSPEND_* */ const libxl_asyncop_how *ao_how) LIBXL_EXTERNAL_CALLERS_ONLY; + +typedef struct { + int flags; /* LIBXL_SUSPEND_* */ + int max_iters; + int max_factor; + int min_remaining; +} libxl_domain_suspend_suse_properties; + +#define LIBXL_HAVE_DOMAIN_SUSPEND_SUSE +int libxl_domain_suspend_suse(libxl_ctx *ctx, uint32_t domid, int fd, + const libxl_domain_suspend_suse_properties *props, /* optional */ + const libxl_asyncop_how *ao_how) + LIBXL_EXTERNAL_CALLERS_ONLY; + #define LIBXL_SUSPEND_DEBUG 1 #define LIBXL_SUSPEND_LIVE 2 +#define LIBXL_SUSPEND_ABORT_IF_BUSY 4 /* @param suspend_cancel [from xenctrl.h:xc_domain_resume( @param fast )] * If this parameter is true, use co-operative resume. The guest Index: xen-4.10.0-testing/tools/libxl/libxl_dom_save.c =================================================================== --- xen-4.10.0-testing.orig/tools/libxl/libxl_dom_save.c +++ xen-4.10.0-testing/tools/libxl/libxl_dom_save.c @@ -379,6 +379,7 @@ void libxl__domain_save(libxl__egc *egc, dss->xcflags = (live ? XCFLAGS_LIVE : 0) | (debug ? XCFLAGS_DEBUG : 0) + | (dss->xlflags & LIBXL_SUSPEND_ABORT_IF_BUSY ? XCFLAGS_DOMSAVE_ABORT_IF_BUSY : 0) | (dss->hvm ? XCFLAGS_HVM : 0); /* Disallow saving a guest with vNUMA configured because migration Index: xen-4.10.0-testing/tools/libxl/libxl_domain.c =================================================================== --- xen-4.10.0-testing.orig/tools/libxl/libxl_domain.c +++ xen-4.10.0-testing/tools/libxl/libxl_domain.c @@ -486,8 +486,9 @@ static void domain_suspend_cb(libxl__egc } -int libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd, int flags, - const libxl_asyncop_how *ao_how) +static int do_libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd, + const libxl_domain_suspend_suse_properties *props, + const libxl_asyncop_how *ao_how) { AO_CREATE(ctx, domid, ao_how); int rc; @@ -507,9 +508,15 @@ int libxl_domain_suspend(libxl_ctx *ctx, dss->domid = domid; dss->fd = fd; dss->type = type; - dss->live = flags & LIBXL_SUSPEND_LIVE; - dss->debug = flags & LIBXL_SUSPEND_DEBUG; dss->checkpointed_stream = LIBXL_CHECKPOINTED_STREAM_NONE; + if (props) { + dss->live = props->flags & LIBXL_SUSPEND_LIVE; + dss->debug = props->flags & LIBXL_SUSPEND_DEBUG; + dss->max_iters = props->max_iters; + dss->max_factor = props->max_factor; + dss->min_remaining = props->min_remaining; + dss->xlflags = props->flags; + } rc = libxl__fd_flags_modify_save(gc, dss->fd, ~(O_NONBLOCK|O_NDELAY), 0, @@ -523,6 +530,20 @@ int libxl_domain_suspend(libxl_ctx *ctx, return AO_CREATE_FAIL(rc); } +int libxl_domain_suspend_suse(libxl_ctx *ctx, uint32_t domid, int fd, + const libxl_domain_suspend_suse_properties *props, + const libxl_asyncop_how *ao_how) +{ + return do_libxl_domain_suspend(ctx, domid, fd, props, ao_how); +} + +int libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd, int flags, + const libxl_asyncop_how *ao_how) +{ + libxl_domain_suspend_suse_properties props = { .flags = flags }; + return do_libxl_domain_suspend(ctx, domid, fd, &props, ao_how); +} + int libxl_domain_pause(libxl_ctx *ctx, uint32_t domid) { int ret; Index: xen-4.10.0-testing/tools/libxl/libxl_internal.h =================================================================== --- xen-4.10.0-testing.orig/tools/libxl/libxl_internal.h +++ xen-4.10.0-testing/tools/libxl/libxl_internal.h @@ -3293,6 +3293,10 @@ struct libxl__domain_save_state { /* private */ int rc; int hvm; + int max_iters; + int max_factor; + int min_remaining; + int xlflags; int xcflags; libxl__domain_suspend_state dsps; union { Index: xen-4.10.0-testing/tools/libxl/libxl_save_callout.c =================================================================== --- xen-4.10.0-testing.orig/tools/libxl/libxl_save_callout.c +++ xen-4.10.0-testing/tools/libxl/libxl_save_callout.c @@ -89,7 +89,9 @@ void libxl__xc_domain_save(libxl__egc *e libxl__srm_callout_enumcallbacks_save(&shs->callbacks.save.a); const unsigned long argnums[] = { - dss->domid, dss->xcflags, dss->hvm, cbflags, + dss->domid, + dss->max_iters, dss->max_factor, dss->min_remaining, + dss->xcflags, dss->hvm, cbflags, dss->checkpointed_stream, }; Index: xen-4.10.0-testing/tools/libxl/libxl_save_helper.c =================================================================== --- xen-4.10.0-testing.orig/tools/libxl/libxl_save_helper.c +++ xen-4.10.0-testing/tools/libxl/libxl_save_helper.c @@ -251,6 +251,9 @@ int main(int argc, char **argv) io_fd = atoi(NEXTARG); recv_fd = atoi(NEXTARG); uint32_t dom = strtoul(NEXTARG,0,10); + uint32_t max_iters = strtoul(NEXTARG,0,10); + uint32_t max_factor = strtoul(NEXTARG,0,10); + uint32_t min_remaining = strtoul(NEXTARG,0,10); uint32_t flags = strtoul(NEXTARG,0,10); int hvm = atoi(NEXTARG); unsigned cbflags = strtoul(NEXTARG,0,10); @@ -262,8 +265,10 @@ int main(int argc, char **argv) startup("save"); setup_signals(save_signal_handler); - r = xc_domain_save(xch, io_fd, dom, flags, &helper_save_callbacks, - hvm, stream_type, recv_fd); + r = xc_domain_save_suse(xch, io_fd, dom, max_iters, max_factor, flags, + min_remaining, + &helper_save_callbacks, hvm, stream_type, + recv_fd); complete(r); } else if (!strcmp(mode,"--restore-domain")) { Index: xen-4.10.0-testing/tools/xl/xl_cmdtable.c =================================================================== --- xen-4.10.0-testing.orig/tools/xl/xl_cmdtable.c +++ xen-4.10.0-testing/tools/xl/xl_cmdtable.c @@ -157,15 +157,22 @@ struct cmd_spec cmd_table[] = { &main_migrate, 0, 1, "Migrate a domain to another host", "[options] <Domain> <host>", - "-h Print this help.\n" - "-C <config> Send <config> instead of config file from creation.\n" - "-s <sshcommand> Use <sshcommand> instead of ssh. String will be passed\n" - " to sh. If empty, run <host> instead of ssh <host> xl\n" - " migrate-receive [-d -e]\n" - "-e Do not wait in the background (on <host>) for the death\n" - " of the domain.\n" - "--debug Print huge (!) amount of debug during the migration process.\n" - "-p Do not unpause domain after migrating it." + "-h Print this help.\n" + "-C <config> Send <config> instead of config file from creation.\n" + "-s <sshcommand> Use <sshcommand> instead of ssh. String will be passed\n" + " to sh. If empty, run <host> instead of ssh <host> xl\n" + " migrate-receive [-d -e]\n" + "-e Do not wait in the background (on <host>) for the death\n" + " of the domain.\n" + "--debug Print huge (!) amount of debug during the migration process.\n" + "-p Do not unpause domain after migrating it.\n" + "\n" + "SUSE Linux specific options:\n" + "--max_iters <number> Number of iterations before final suspend (default: 30)\n" + "--max_factor <factor> Max amount of memory to transfer before final suspend (default: 3*RAM).\n" + "--min_remaining <pages> Number of remaining dirty pages before final suspend (default: 50).\n" + "--abort_if_busy Abort migration instead of doing final suspend, if number\n" + " of iterations or amount of transfered memory is exceeded." }, { "restore", &main_restore, 0, 1, Index: xen-4.10.0-testing/tools/xl/xl_migrate.c =================================================================== --- xen-4.10.0-testing.orig/tools/xl/xl_migrate.c +++ xen-4.10.0-testing/tools/xl/xl_migrate.c @@ -177,6 +177,8 @@ static void migrate_do_preamble(int send } static void migrate_domain(uint32_t domid, const char *rune, int debug, + int max_iters, int max_factor, + int min_remaining, int abort_if_busy, const char *override_config_file) { pid_t child = -1; @@ -185,7 +187,13 @@ static void migrate_domain(uint32_t domi char *away_domname; char rc_buf; uint8_t *config_data; - int config_len, flags = LIBXL_SUSPEND_LIVE; + int config_len; + libxl_domain_suspend_suse_properties props = { + .flags = LIBXL_SUSPEND_LIVE, + .max_iters = max_iters, + .max_factor = max_factor, + .min_remaining = min_remaining, + }; save_domain_core_begin(domid, override_config_file, &config_data, &config_len); @@ -204,10 +212,12 @@ static void migrate_domain(uint32_t domi xtl_stdiostream_adjust_flags(logger, XTL_STDIOSTREAM_HIDE_PROGRESS, 0); if (debug) - flags |= LIBXL_SUSPEND_DEBUG; - rc = libxl_domain_suspend(ctx, domid, send_fd, flags, NULL); + props.flags |= LIBXL_SUSPEND_DEBUG; + if (abort_if_busy) + props.flags |= LIBXL_SUSPEND_ABORT_IF_BUSY; + rc = libxl_domain_suspend_suse(ctx, domid, send_fd, &props, NULL); if (rc) { - fprintf(stderr, "migration sender: libxl_domain_suspend failed" + fprintf(stderr, "migration sender: libxl_domain_suspend_suse failed" " (rc=%d)\n", rc); if (rc == ERROR_GUEST_TIMEDOUT) goto failed_suspend; @@ -537,13 +547,18 @@ int main_migrate(int argc, char **argv) char *rune = NULL; char *host; int opt, daemonize = 1, monitor = 1, debug = 0, pause_after_migration = 0; + int max_iters = 0, max_factor = 0, min_remaining = 0, abort_if_busy = 0; static struct option opts[] = { {"debug", 0, 0, 0x100}, + {"max_iters", 1, 0, 0x101}, + {"max_factor", 1, 0, 0x102}, + {"min_remaining", 1, 0, 0x103}, + {"abort_if_busy", 0, 0, 0x104}, {"live", 0, 0, 0x200}, COMMON_LONG_OPTS }; - SWITCH_FOREACH_OPT(opt, "FC:s:ep", opts, "migrate", 2) { + SWITCH_FOREACH_OPT(opt, "FC:s:epM:m:A", opts, "migrate", 2) { case 'C': config_filename = optarg; break; @@ -563,6 +578,18 @@ int main_migrate(int argc, char **argv) case 0x100: /* --debug */ debug = 1; break; + case 0x101: + max_iters = atoi(optarg); + break; + case 0x102: + max_factor = atoi(optarg); + break; + case 0x103: + min_remaining = atoi(optarg); + break; + case 0x104: + abort_if_busy = 1; + break; case 0x200: /* --live */ /* ignored for compatibility with xm */ break; @@ -596,7 +623,8 @@ int main_migrate(int argc, char **argv) pause_after_migration ? " -p" : ""); } - migrate_domain(domid, rune, debug, config_filename); + migrate_domain(domid, rune, debug, max_iters, max_factor, min_remaining, + abort_if_busy, config_filename); return EXIT_SUCCESS; } ++++++ migration-python3-conversion.patch ++++++ Index: xen-4.10.0-testing/tools/python/xen/migration/libxc.py =================================================================== --- xen-4.10.0-testing.orig/tools/python/xen/migration/libxc.py +++ xen-4.10.0-testing/tools/python/xen/migration/libxc.py @@ -87,23 +87,23 @@ rec_type_to_str = { # page_data PAGE_DATA_FORMAT = "II" -PAGE_DATA_PFN_MASK = (long(1) << 52) - 1 -PAGE_DATA_PFN_RESZ_MASK = ((long(1) << 60) - 1) & ~((long(1) << 52) - 1) +PAGE_DATA_PFN_MASK = (int(1) << 52) - 1 +PAGE_DATA_PFN_RESZ_MASK = ((int(1) << 60) - 1) & ~((int(1) << 52) - 1) # flags from xen/public/domctl.h: XEN_DOMCTL_PFINFO_* shifted by 32 bits PAGE_DATA_TYPE_SHIFT = 60 -PAGE_DATA_TYPE_LTABTYPE_MASK = (long(0x7) << PAGE_DATA_TYPE_SHIFT) -PAGE_DATA_TYPE_LTAB_MASK = (long(0xf) << PAGE_DATA_TYPE_SHIFT) -PAGE_DATA_TYPE_LPINTAB = (long(0x8) << PAGE_DATA_TYPE_SHIFT) # Pinned pagetable +PAGE_DATA_TYPE_LTABTYPE_MASK = (int(0x7) << PAGE_DATA_TYPE_SHIFT) +PAGE_DATA_TYPE_LTAB_MASK = (int(0xf) << PAGE_DATA_TYPE_SHIFT) +PAGE_DATA_TYPE_LPINTAB = (int(0x8) << PAGE_DATA_TYPE_SHIFT) # Pinned pagetable -PAGE_DATA_TYPE_NOTAB = (long(0x0) << PAGE_DATA_TYPE_SHIFT) # Regular page -PAGE_DATA_TYPE_L1TAB = (long(0x1) << PAGE_DATA_TYPE_SHIFT) # L1 pagetable -PAGE_DATA_TYPE_L2TAB = (long(0x2) << PAGE_DATA_TYPE_SHIFT) # L2 pagetable -PAGE_DATA_TYPE_L3TAB = (long(0x3) << PAGE_DATA_TYPE_SHIFT) # L3 pagetable -PAGE_DATA_TYPE_L4TAB = (long(0x4) << PAGE_DATA_TYPE_SHIFT) # L4 pagetable -PAGE_DATA_TYPE_BROKEN = (long(0xd) << PAGE_DATA_TYPE_SHIFT) # Broken -PAGE_DATA_TYPE_XALLOC = (long(0xe) << PAGE_DATA_TYPE_SHIFT) # Allocate-only -PAGE_DATA_TYPE_XTAB = (long(0xf) << PAGE_DATA_TYPE_SHIFT) # Invalid +PAGE_DATA_TYPE_NOTAB = (int(0x0) << PAGE_DATA_TYPE_SHIFT) # Regular page +PAGE_DATA_TYPE_L1TAB = (int(0x1) << PAGE_DATA_TYPE_SHIFT) # L1 pagetable +PAGE_DATA_TYPE_L2TAB = (int(0x2) << PAGE_DATA_TYPE_SHIFT) # L2 pagetable +PAGE_DATA_TYPE_L3TAB = (int(0x3) << PAGE_DATA_TYPE_SHIFT) # L3 pagetable +PAGE_DATA_TYPE_L4TAB = (int(0x4) << PAGE_DATA_TYPE_SHIFT) # L4 pagetable +PAGE_DATA_TYPE_BROKEN = (int(0xd) << PAGE_DATA_TYPE_SHIFT) # Broken +PAGE_DATA_TYPE_XALLOC = (int(0xe) << PAGE_DATA_TYPE_SHIFT) # Allocate-only +PAGE_DATA_TYPE_XTAB = (int(0xf) << PAGE_DATA_TYPE_SHIFT) # Invalid # x86_pv_info X86_PV_INFO_FORMAT = "BBHI" Index: xen-4.10.0-testing/tools/python/xen/migration/verify.py =================================================================== --- xen-4.10.0-testing.orig/tools/python/xen/migration/verify.py +++ xen-4.10.0-testing/tools/python/xen/migration/verify.py @@ -7,11 +7,11 @@ Common verification infrastructure for v from struct import calcsize, unpack -class StreamError(StandardError): +class StreamError(Exception): """Error with the stream""" pass -class RecordError(StandardError): +class RecordError(Exception): """Error with a record in the stream""" pass ++++++ pygrub-python3-conversion.patch ++++++ Index: xen-4.10.0-testing/tools/pygrub/src/pygrub =================================================================== --- xen-4.10.0-testing.orig/tools/pygrub/src/pygrub +++ xen-4.10.0-testing/tools/pygrub/src/pygrub @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python # # pygrub - simple python-based bootloader for Xen # @@ -12,6 +12,7 @@ # along with this program; If not, see <http://www.gnu.org/licenses/>. # +from __future__ import print_function import os, sys, string, struct, tempfile, re, traceback, stat, errno import copy import logging @@ -51,7 +52,7 @@ def enable_cursor(ison): except _curses.error: pass -DISK_TYPE_RAW, DISK_TYPE_HYBRIDISO, DISK_TYPE_DOS = range(3) +DISK_TYPE_RAW, DISK_TYPE_HYBRIDISO, DISK_TYPE_DOS = list(range(3)) def identify_disk_image(file): """Detect DOS partition table or HybridISO format.""" fd = os.open(file, os.O_RDONLY) @@ -78,7 +79,7 @@ def get_solaris_slice(file, offset): buf = os.read(fd, 512) os.close(fd) if struct.unpack("<H", buf[508:510])[0] != DKL_MAGIC: - raise RuntimeError, "Invalid disklabel magic" + raise RuntimeError("Invalid disklabel magic") nslices = struct.unpack("<H", buf[30:32])[0] @@ -89,7 +90,7 @@ def get_solaris_slice(file, offset): if slicetag == V_ROOT: return slicesect * SECTOR_SIZE - raise RuntimeError, "No root slice found" + raise RuntimeError("No root slice found") def get_fs_offset_gpt(file): fd = os.open(file, os.O_RDONLY) @@ -424,20 +425,17 @@ class Grub: we're being given a raw config file rather than a disk image.""" if not os.access(fn, os.R_OK): - raise RuntimeError, "Unable to access %s" %(fn,) + raise RuntimeError("Unable to access %s" %(fn,)) - cfg_list = map(lambda x: (x,grub.GrubConf.Grub2ConfigFile), - ["/boot/grub/grub.cfg", "/grub/grub.cfg", - "/boot/grub2/grub.cfg", "/grub2/grub.cfg"]) + \ - map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile), - ["/boot/isolinux/isolinux.cfg", + cfg_list = [(x,grub.GrubConf.Grub2ConfigFile) for x in ["/boot/grub/grub.cfg", "/grub/grub.cfg", + "/boot/grub2/grub.cfg", "/grub2/grub.cfg"]] + \ + [(x,grub.ExtLinuxConf.ExtLinuxConfigFile) for x in ["/boot/isolinux/isolinux.cfg", "/boot/extlinux/extlinux.conf", "/boot/extlinux.conf", "/extlinux/extlinux.conf", - "/extlinux.conf"]) + \ - map(lambda x: (x,grub.GrubConf.GrubConfigFile), - ["/boot/grub/menu.lst", "/boot/grub/grub.conf", - "/grub/menu.lst", "/grub/grub.conf"]) + "/extlinux.conf"]] + \ + [(x,grub.GrubConf.GrubConfigFile) for x in ["/boot/grub/menu.lst", "/boot/grub/grub.conf", + "/grub/menu.lst", "/grub/grub.conf"]] if not fs: # set the config file and parse it @@ -449,7 +447,7 @@ class Grub: for f,parser in cfg_list: if fs.file_exists(f): - print >>sys.stderr, "Using %s to parse %s" % (parser,f) + print("Using %s to parse %s" % (parser,f), file=sys.stderr) self.cf = parser() self.cf.filename = f break @@ -636,18 +634,18 @@ def run_grub(file, entry, fs, cfg_args): chosencfg["args"] = cfg_args return chosencfg if g.__dict__.get('cf', None) is None: - raise RuntimeError, "couldn't find bootloader config file in the image provided." + raise RuntimeError("couldn't find bootloader config file in the image provided.") else: return if list_entries: for i in range(len(g.cf.images)): img = g.cf.images[i] - print "title: %s" % img.title - print " root: %s" % img.root - print " kernel: %s" % img.kernel[1] - print " args: %s" % img.args - print " initrd: %s" % img.initrd[1] + print("title: %s" % img.title) + print(" root: %s" % img.root) + print(" kernel: %s" % img.kernel[1]) + print(" args: %s" % img.args) + print(" initrd: %s" % img.initrd[1]) if interactive and not list_entries: curses.wrapper(run_main) @@ -661,7 +659,7 @@ def run_grub(file, entry, fs, cfg_args): sel = idx if sel == -1: - print "No kernel image selected!" + print("No kernel image selected!") sys.exit(1) try: @@ -759,7 +757,7 @@ def format_sxp(kernel, ramdisk, args): def format_simple(kernel, ramdisk, args, sep): for check in (kernel, ramdisk, args): if check is not None and sep in check: - raise RuntimeError, "simple format cannot represent delimiter-containing value" + raise RuntimeError("simple format cannot represent delimiter-containing value") s = ("kernel %s" % kernel) + sep if ramdisk: s += ("ramdisk %s" % ramdisk) + sep @@ -772,7 +770,7 @@ if __name__ == "__main__": sel = None def usage(): - print >> sys.stderr, "Usage: %s [-q|--quiet] [-i|--interactive] [-l|--list-entries] [-n|--not-really] [--output=] [--kernel=] [--ramdisk=] [--args=] [--entry=] [--output-directory=] [--output-format=sxp|simple|simple0] [--offset=] <image>" %(sys.argv[0],) + print("Usage: %s [-q|--quiet] [-i|--interactive] [-l|--list-entries] [-n|--not-really] [--output=] [--kernel=] [--ramdisk=] [--args=] [--entry=] [--output-directory=] [--output-format=sxp|simple|simple0] [--offset=] <image>" %(sys.argv[0],), file=sys.stderr) def copy_from_image(fs, file_to_read, file_type, output_directory, not_really): @@ -783,8 +781,8 @@ if __name__ == "__main__": sys.exit("The requested %s file does not exist" % file_type) try: datafile = fs.open_file(file_to_read) - except Exception, e: - print >>sys.stderr, e + except Exception as e: + print(e, file=sys.stderr) sys.exit("Error opening %s in guest" % file_to_read) (tfd, ret) = tempfile.mkstemp(prefix="boot_"+file_type+".", dir=output_directory) @@ -799,8 +797,8 @@ if __name__ == "__main__": return ret try: os.write(tfd, data) - except Exception, e: - print >>sys.stderr, e + except Exception as e: + print(e, file=sys.stderr) os.close(tfd) os.unlink(ret) del datafile @@ -864,7 +862,7 @@ if __name__ == "__main__": try: part_offs = [ int(a) ] except ValueError: - print "offset value must be an integer" + print("offset value must be an integer") usage() sys.exit(1) elif o in ("--entry",): @@ -877,13 +875,13 @@ if __name__ == "__main__": debug = True elif o in ("--output-format",): if a not in ["sxp", "simple", "simple0"]: - print "unknown output format %s" % a + print("unknown output format %s" % a) usage() sys.exit(1) output_format = a elif o in ("--output-directory",): if not os.path.isdir(a): - print "%s is not an existing directory" % a + print("%s is not an existing directory" % a) sys.exit(1) output_directory = a @@ -892,8 +890,8 @@ if __name__ == "__main__": try: - os.makedirs(output_directory, 0700) - except OSError,e: + os.makedirs(output_directory, 0o700) + except OSError as e: if (e.errno == errno.EEXIST) and os.path.isdir(output_directory): pass else: @@ -907,10 +905,10 @@ if __name__ == "__main__": # debug if isconfig: chosencfg = run_grub(file, entry, fs, incfg["args"]) - print " kernel: %s" % chosencfg["kernel"] + print(" kernel: %s" % chosencfg["kernel"]) if chosencfg["ramdisk"]: - print " initrd: %s" % chosencfg["ramdisk"] - print " args: %s" % chosencfg["args"] + print(" initrd: %s" % chosencfg["ramdisk"]) + print(" args: %s" % chosencfg["args"]) sys.exit(0) # if boot filesystem is set then pass to fsimage.open @@ -956,7 +954,7 @@ if __name__ == "__main__": # Did looping through partitions find us a kernel? if fs is None: - raise RuntimeError, "Unable to find partition containing kernel" + raise RuntimeError("Unable to find partition containing kernel") bootcfg["kernel"] = copy_from_image(fs, chosencfg["kernel"], "kernel", output_directory, not_really) Index: xen-4.10.0-testing/tools/pygrub/src/GrubConf.py =================================================================== --- xen-4.10.0-testing.orig/tools/pygrub/src/GrubConf.py +++ xen-4.10.0-testing/tools/pygrub/src/GrubConf.py @@ -44,7 +44,7 @@ def get_path(s): return (None, s) idx = s.find(')') if idx == -1: - raise ValueError, "Unable to find matching ')'" + raise ValueError("Unable to find matching ')'") d = s[:idx] return (GrubDiskPart(d), s[idx + 1:]) @@ -100,7 +100,7 @@ class _GrubImage(object): " initrd: %s\n" %(self.title, self.root, self.kernel, self.args, self.initrd)) def _parse(self, lines): - map(self.set_from_line, lines) + list(map(self.set_from_line, lines)) def reset(self, lines): self._root = self._initrd = self._kernel = self._args = None @@ -141,7 +141,7 @@ class GrubImage(_GrubImage): def set_from_line(self, line, replace = None): (com, arg) = grub_exact_split(line, 2) - if self.commands.has_key(com): + if com in self.commands: if self.commands[com] is not None: setattr(self, self.commands[com], arg.strip()) else: @@ -177,7 +177,7 @@ class _GrubConfigFile(object): self.parse() def parse(self, buf = None): - raise RuntimeError, "unimplemented parse function" + raise RuntimeError("unimplemented parse function") def hasPasswordAccess(self): return self.passwordAccess @@ -201,7 +201,7 @@ class _GrubConfigFile(object): import crypt if crypt.crypt(password, pwd[1]) == pwd[1]: return True - except Exception, e: + except Exception as e: self.passExc = "Can't verify password: %s" % str(e) return False @@ -213,7 +213,7 @@ class _GrubConfigFile(object): def set(self, line): (com, arg) = grub_exact_split(line, 2) - if self.commands.has_key(com): + if com in self.commands: if self.commands[com] is not None: setattr(self, self.commands[com], arg.strip()) else: @@ -233,7 +233,7 @@ class _GrubConfigFile(object): self._default = val if self._default < 0: - raise ValueError, "default must be positive number" + raise ValueError("default must be positive number") default = property(_get_default, _set_default) def set_splash(self, val): @@ -265,7 +265,7 @@ class GrubConfigFile(_GrubConfigFile): def parse(self, buf = None): if buf is None: if self.filename is None: - raise ValueError, "No config file defined to parse!" + raise ValueError("No config file defined to parse!") f = open(self.filename, 'r') lines = f.readlines() @@ -296,7 +296,7 @@ class GrubConfigFile(_GrubConfigFile): continue (com, arg) = grub_exact_split(l, 2) - if self.commands.has_key(com): + if com in self.commands: if self.commands[com] is not None: setattr(self, self.commands[com], arg.strip()) else: @@ -328,7 +328,7 @@ class Grub2Image(_GrubImage): if com == "set": (com,arg) = grub2_handle_set(arg) - if self.commands.has_key(com): + if com in self.commands: if self.commands[com] is not None: setattr(self, self.commands[com], arg.strip()) else: @@ -364,7 +364,7 @@ class Grub2ConfigFile(_GrubConfigFile): def parse(self, buf = None): if buf is None: if self.filename is None: - raise ValueError, "No config file defined to parse!" + raise ValueError("No config file defined to parse!") f = open(self.filename, 'r') lines = f.readlines() @@ -398,7 +398,7 @@ class Grub2ConfigFile(_GrubConfigFile): title_match = re.match('^menuentry ["\'](.*?)["\'] (.*){', l) if title_match: if img is not None: - raise RuntimeError, "syntax error: cannot nest menuentry (%d %s)" % (len(img),img) + raise RuntimeError("syntax error: cannot nest menuentry (%d %s)" % (len(img),img)) img = [] title = title_match.group(1) if not l.endswith('}'): @@ -416,7 +416,7 @@ class Grub2ConfigFile(_GrubConfigFile): menu_level -= 1 continue else: - raise RuntimeError, "syntax error: closing brace without menuentry" + raise RuntimeError("syntax error: closing brace without menuentry") self.add_image(Grub2Image(title, img)) img = None @@ -431,7 +431,7 @@ class Grub2ConfigFile(_GrubConfigFile): if com == "set": (com,arg) = grub2_handle_set(arg) - if self.commands.has_key(com): + if com in self.commands: if self.commands[com] is not None: arg_strip = arg.strip() if arg_strip == "${saved_entry}" or arg_strip == "${next_entry}": @@ -446,7 +446,7 @@ class Grub2ConfigFile(_GrubConfigFile): logging.debug("Unknown directive %s" %(com,)) if img is not None: - raise RuntimeError, "syntax error: end of file with open menuentry(%d %s)" % (len(img),img) + raise RuntimeError("syntax error: end of file with open menuentry(%d %s)" % (len(img),img)) if self.hasPassword(): self.setPasswordAccess(False) @@ -465,12 +465,12 @@ class Grub2ConfigFile(_GrubConfigFile): if __name__ == "__main__": if len(sys.argv) < 3: - raise RuntimeError, "Need a grub version (\"grub\" or \"grub2\") and a grub.conf or grub.cfg to read" + raise RuntimeError("Need a grub version (\"grub\" or \"grub2\") and a grub.conf or grub.cfg to read") if sys.argv[1] == "grub": g = GrubConfigFile(sys.argv[2]) elif sys.argv[1] == "grub2": g = Grub2ConfigFile(sys.argv[2]) else: - raise RuntimeError, "Unknown config type %s" % sys.argv[1] + raise RuntimeError("Unknown config type %s" % sys.argv[1]) for i in g.images: - print i #, i.title, i.root, i.kernel, i.args, i.initrd + print(i) #, i.title, i.root, i.kernel, i.args, i.initrd Index: xen-4.10.0-testing/tools/pygrub/src/ExtLinuxConf.py =================================================================== --- xen-4.10.0-testing.orig/tools/pygrub/src/ExtLinuxConf.py +++ xen-4.10.0-testing/tools/pygrub/src/ExtLinuxConf.py @@ -12,7 +12,7 @@ import sys, re, os import logging -import GrubConf +from . import GrubConf class ExtLinuxImage(object): def __init__(self, lines, path): @@ -32,7 +32,7 @@ class ExtLinuxImage(object): self.lines = [] self.path = path self.root = "" - map(self.set_from_line, lines) + list(map(self.set_from_line, lines)) def set_from_line(self, line, replace = None): (com, arg) = GrubConf.grub_exact_split(line, 2) @@ -67,7 +67,7 @@ class ExtLinuxImage(object): setattr(self, "initrd", a.replace("initrd=", "")) arg = arg.replace(a, "") - if com is not None and self.commands.has_key(com): + if com is not None and com in self.commands: if self.commands[com] is not None: setattr(self, self.commands[com], re.sub('^"(.+)"$', r"\1", arg.strip())) else: @@ -136,7 +136,7 @@ class ExtLinuxConfigFile(object): def parse(self, buf = None): if buf is None: if self.filename is None: - raise ValueError, "No config file defined to parse!" + raise ValueError("No config file defined to parse!") f = open(self.filename, 'r') lines = f.readlines() @@ -167,7 +167,7 @@ class ExtLinuxConfigFile(object): (com, arg) = GrubConf.grub_exact_split(l, 2) com = com.lower() - if self.commands.has_key(com): + if com in self.commands: if self.commands[com] is not None: setattr(self, self.commands[com], arg.strip()) else: @@ -207,8 +207,8 @@ class ExtLinuxConfigFile(object): if __name__ == "__main__": if len(sys.argv) < 2: - raise RuntimeError, "Need a configuration file to read" + raise RuntimeError("Need a configuration file to read") g = ExtLinuxConfigFile(sys.argv[1]) for i in g.images: - print i - print g.default + print(i) + print(g.default) Index: xen-4.10.0-testing/tools/pygrub/src/LiloConf.py =================================================================== --- xen-4.10.0-testing.orig/tools/pygrub/src/LiloConf.py +++ xen-4.10.0-testing/tools/pygrub/src/LiloConf.py @@ -4,7 +4,7 @@ import sys, re, os import logging -import GrubConf +from . import GrubConf class LiloImage(object): def __init__(self, lines, path): @@ -24,12 +24,12 @@ class LiloImage(object): self.lines = [] self.path = path self.root = "" - map(self.set_from_line, lines) + list(map(self.set_from_line, lines)) def set_from_line(self, line, replace = None): (com, arg) = GrubConf.grub_exact_split(line, 2) - if self.commands.has_key(com): + if com in self.commands: if self.commands[com] is not None: setattr(self, self.commands[com], re.sub('^"(.+)"$', r"\1", arg.strip())) else: @@ -97,7 +97,7 @@ class LiloConfigFile(object): def parse(self, buf = None): if buf is None: if self.filename is None: - raise ValueError, "No config file defined to parse!" + raise ValueError("No config file defined to parse!") f = open(self.filename, 'r') lines = f.readlines() @@ -127,7 +127,7 @@ class LiloConfigFile(object): continue (com, arg) = GrubConf.grub_exact_split(l, 2) - if self.commands.has_key(com): + if com in self.commands: if self.commands[com] is not None: setattr(self, self.commands[com], arg.strip()) else: @@ -170,8 +170,8 @@ class LiloConfigFile(object): if __name__ == "__main__": if len(sys.argv) < 2: - raise RuntimeError, "Need a lilo.conf to read" + raise RuntimeError("Need a lilo.conf to read") g = LiloConfigFile(sys.argv[1]) for i in g.images: - print i #, i.title, i.root, i.kernel, i.args, i.initrd - print g.default + print(i) #, i.title, i.root, i.kernel, i.args, i.initrd + print(g.default) ++++++ xen-4.10.0-testing-src.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/ChangeLog new/xen-4.10.0-testing/ChangeLog --- old/xen-4.10.0-testing/ChangeLog 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/ChangeLog 2017-11-24 17:28:36.000000000 +0100 @@ -1,42 +1,28 @@ -commit bb2c1a1cc98a22e2d4c14b18421aa7be6c2adf0d -Author: Bhupinder Thakur <bhupinder.thakur(a)linaro.org> -Date: Tue Oct 24 18:09:22 2017 +0100 +commit d2f86bf604698806d311cc251c1b66fbb752673c +Author: Andrew Cooper <andrew.cooper3(a)citrix.com> +Date: Thu Nov 16 21:34:02 2017 +0000 - arm/xen: vpl011: Fix SBSA UART interrupt assertion + x86/hvm: Don't corrupt the HVM context stream when writing the MSR record - With the current SBSA UART emulation, streaming larger amounts of data - (as caused by "find /", for instance) can lead to character losses. - This is due to the OUT ring buffer getting full, because we change the - TX interrupt bit only when the FIFO is actually full, and not already - when it's half-way filled, as the Linux driver expects. - The SBSA spec does not explicitly state this, but we assume that an - SBSA compliant UART uses the PL011 default "interrupt FIFO level select - register" value of "1/2 way". The Linux driver certainly makes this - assumption, so it expect to be able to write a number of characters - after the TX interrupt line has been asserted. - On a similar issue we have the same wrong behaviour on the receive side. - However changing the RX interrupt to trigger on reaching half of the FIFO - level will lead to lag, because the guest would not be notified of incoming - characters until the FIFO is half way filled. This leads to inacceptible - lags when typing on a terminal. - Real hardware solves this issue by using the "receive timeout - interrupt" (RTI), which is triggered when character reception stops for - 32 baud cycles. As we cannot and do not want to emulate any timing here, - we slightly abuse the timeout interrupt to notify the guest of new - characters: when a new character comes in, the RTI is asserted, when - the FIFO is cleared, the interrupt gets cleared. - - So this patch changes the emulated interrupt trigger behaviour to come - as close to real hardware as possible: the RX and TX interrupt trigger - when the FIFO gets half full / half empty, and the RTI interrupt signals - new incoming characters. - - [Andre: reword commit message, introduce receive timeout interrupt, add - comments] - - Signed-off-by: Bhupinder Thakur <bhupinder.thakur(a)linaro.org> - Reviewed-by: Andre Przywara <andre.przywara(a)linaro.org> - Signed-off-by: Andre Przywara <andre.przywara(a)linaro.org> - Signed-off-by: Stefano Stabellini <sstabellini(a)kernel.org> - Reviewed-by: Stefano Stabellini <sstabellini(a)kernel.org> + Ever since it was introduced in c/s bd1f0b45ff, hvm_save_cpu_msrs() has had a + bug whereby it corrupts the HVM context stream if some, but fewer than the + maximum number of MSRs are written. + + _hvm_init_entry() creates an hvm_save_descriptor with length for + msr_count_max, but in the case that we write fewer than max, h->cur only moves + forward by the amount of space used, causing the subsequent + hvm_save_descriptor to be written within the bounds of the previous one. + + To resolve this, reduce the length reported by the descriptor to match the + actual number of bytes used. + + A typical failure on the destination side looks like: + + (XEN) HVM4 restore: CPU_MSR 0 + (XEN) HVM4.0 restore: not enough data left to read 56 MSR bytes + (XEN) HVM4 restore: failed to load entry 20/0 + + Signed-off-by: Andrew Cooper <andrew.cooper3(a)citrix.com> + Reviewed-by: Wei Liu <wei.liu2(a)citrix.com> + Reviewed-by: Jan Beulich <jbeulich(a)suse.com> Release-acked-by: Julien Grall <julien.grall(a)linaro.org> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/Config.mk new/xen-4.10.0-testing/Config.mk --- old/xen-4.10.0-testing/Config.mk 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/Config.mk 2017-11-24 17:28:36.000000000 +0100 @@ -273,7 +273,7 @@ MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= 947f3737abf65fda63f3ffd97fddfa6986986868 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.10.0-rc1 +QEMU_UPSTREAM_REVISION ?= b79708a8ed1b3d18bee67baeaf33b3fa529493e2 MINIOS_UPSTREAM_REVISION ?= 0b4b7897e08b967a09bed2028a79fabff82342dd # Mon Oct 16 16:36:41 2017 +0100 # Update Xen header files again diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/docs/features/sched_credit2.pandoc new/xen-4.10.0-testing/docs/features/sched_credit2.pandoc --- old/xen-4.10.0-testing/docs/features/sched_credit2.pandoc 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/docs/features/sched_credit2.pandoc 2017-11-24 17:28:36.000000000 +0100 @@ -1,5 +1,5 @@ % Credit2 Scheduler -% Revision 1 +% Revision 2 \clearpage @@ -60,14 +60,6 @@ `LIBXL\_HAVE\_SCHED\_CREDIT2\_PARAMS` symbol is introduced to indicate their availability. -# Limitations - -The Credit1 scheduler comes with vCPU hard-affinity, vCPU soft-affinity -and caps (see `docs/man/xl.pod.1.in` for more details). In Credit2, -vCPU hard affinity is supported starting from Xen 4.8, while soft-affinity -and caps, while being worked on, are not yet available in any released -hypervisor. - # Testing Any change done in Credit2 wants to be tested by doing at least the @@ -87,8 +79,6 @@ # Areas for improvement -* Close the feature gap with Credit1 (i.e., finishing implementing vCPU - soft-affinity and caps); * vCPUs' reservations (similar to caps, but providing a vCPU with guarantees about some pCPU time it will always be able to execute for); * benchmarking for assessing the best combination of values for the various @@ -115,4 +105,5 @@ Date Revision Version Notes ---------- -------- -------- ------------------------------------------- 2016-10-14 1 Xen 4.8 Document written +2017-11-6 2 Xen 4.10 Soft-affinity and caps implemented ---------- -------- -------- ------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/docs/misc/hvmlite.markdown new/xen-4.10.0-testing/docs/misc/hvmlite.markdown --- old/xen-4.10.0-testing/docs/misc/hvmlite.markdown 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/docs/misc/hvmlite.markdown 1970-01-01 01:00:00.000000000 +0100 @@ -1,97 +0,0 @@ -**NOTE**: this document will be merged into `pvh.markdown` once PVH is replaced -with the HVMlite implementation. - -# x86/HVM direct boot ABI # - -Since the Xen entry point into the kernel can be different from the -native entry point, a `ELFNOTE` is used in order to tell the domain -builder how to load and jump into the kernel entry point: - - ELFNOTE(Xen, XEN_ELFNOTE_PHYS32_ENTRY, .long, xen_start32) - -The presence of the `XEN_ELFNOTE_PHYS32_ENTRY` note indicates that the -kernel supports the boot ABI described in this document. - -The domain builder must load the kernel into the guest memory space and -jump into the entry point defined at `XEN_ELFNOTE_PHYS32_ENTRY` with the -following machine state: - - * `ebx`: contains the physical memory address where the loader has placed - the boot start info structure. - - * `cr0`: bit 0 (PE) must be set. All the other writeable bits are cleared. - - * `cr4`: all bits are cleared. - - * `cs`: must be a 32-bit read/execute code segment with a base of ‘0’ - and a limit of ‘0xFFFFFFFF’. The selector value is unspecified. - - * `ds`, `es`: must be a 32-bit read/write data segment with a base of - ‘0’ and a limit of ‘0xFFFFFFFF’. The selector values are all unspecified. - - * `tr`: must be a 32-bit TSS (active) with a base of '0' and a limit of '0x67'. - - * `eflags`: bit 17 (VM) must be cleared. Bit 9 (IF) must be cleared. - Bit 8 (TF) must be cleared. Other bits are all unspecified. - -All other processor registers and flag bits are unspecified. The OS is in -charge of setting up it's own stack, GDT and IDT. - -The format of the boot start info structure (pointed to by %ebx) can be found -in xen/include/public/arch-x86/hvm/start_info.h - -Other relevant information needed in order to boot a guest kernel -(console page address, xenstore event channel...) can be obtained -using HVMPARAMS, just like it's done on HVM guests. - -The setup of the hypercall page is also performed in the same way -as HVM guests, using the hypervisor cpuid leaves and msr ranges. - -## AP startup ## - -AP startup can be performed using hypercalls or the local APIC if present. -The following VCPU hypercalls can be used in order to bring up secondary vCPUs: - - * `VCPUOP_initialise` is used to set the initial state of the vCPU. The - argument passed to the hypercall must be of the type vcpu_hvm_context. - See `public/hvm/hvm_vcpu.h` for the layout of the structure. Note that - this hypercall allows starting the vCPU in several modes (16/32/64bits), - regardless of the mode the BSP is currently running on. - - * `VCPUOP_up` is used to launch the vCPU once the initial state has been - set using `VCPUOP_initialise`. - - * `VCPUOP_down` is used to bring down a vCPU. - - * `VCPUOP_is_up` is used to scan the number of available vCPUs. - -## Hardware description ## - -PVHv2 guests that have access to hardware (either emulated or real) will also -have ACPI tables with the description of the hardware that's available to the -guest. This applies to both privileged and unprivileged guests. A pointer to -the position of the RSDP in memory (if present) can be fetched from the start -info structure that's passed at boot time (field rsdp_paddr). - -Description of paravirtualized devices will come from XenStore, just as it's -done for HVM guests. - -## Interrupts ## - -### Interrupts from physical devices ### - -Interrupts from physical devices are delivered using native methods, this is -done in order to take advantage of new hardware assisted virtualization -functions, like posted interrupts. This implies that PVHv2 guests with physical -devices will also have the necessary interrupt controllers in order to manage -the delivery of interrupts from those devices, using the same interfaces that -are available on native hardware. - -### Interrupts from paravirtualized devices ### - -Interrupts from paravirtualized devices are delivered using event channels, see -[Event Channel Internals][event_channels] for more detailed information about -event channels. Delivery of those interrupts can be configured in the same way -as HVM guests, check xen/include/public/hvm/params.h and -xen/include/public/hvm/hvm_op.h for more information about available delivery -methods. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/docs/misc/pvh.markdown new/xen-4.10.0-testing/docs/misc/pvh.markdown --- old/xen-4.10.0-testing/docs/misc/pvh.markdown 1970-01-01 01:00:00.000000000 +0100 +++ new/xen-4.10.0-testing/docs/misc/pvh.markdown 2017-11-24 17:28:36.000000000 +0100 @@ -0,0 +1,94 @@ +# x86/HVM direct boot ABI # + +Since the Xen entry point into the kernel can be different from the +native entry point, a `ELFNOTE` is used in order to tell the domain +builder how to load and jump into the kernel entry point: + + ELFNOTE(Xen, XEN_ELFNOTE_PHYS32_ENTRY, .long, xen_start32) + +The presence of the `XEN_ELFNOTE_PHYS32_ENTRY` note indicates that the +kernel supports the boot ABI described in this document. + +The domain builder must load the kernel into the guest memory space and +jump into the entry point defined at `XEN_ELFNOTE_PHYS32_ENTRY` with the +following machine state: + + * `ebx`: contains the physical memory address where the loader has placed + the boot start info structure. + + * `cr0`: bit 0 (PE) must be set. All the other writeable bits are cleared. + + * `cr4`: all bits are cleared. + + * `cs`: must be a 32-bit read/execute code segment with a base of ‘0’ + and a limit of ‘0xFFFFFFFF’. The selector value is unspecified. + + * `ds`, `es`: must be a 32-bit read/write data segment with a base of + ‘0’ and a limit of ‘0xFFFFFFFF’. The selector values are all unspecified. + + * `tr`: must be a 32-bit TSS (active) with a base of '0' and a limit of '0x67'. + + * `eflags`: bit 17 (VM) must be cleared. Bit 9 (IF) must be cleared. + Bit 8 (TF) must be cleared. Other bits are all unspecified. + +All other processor registers and flag bits are unspecified. The OS is in +charge of setting up it's own stack, GDT and IDT. + +The format of the boot start info structure (pointed to by %ebx) can be found +in xen/include/public/arch-x86/hvm/start\_info.h + +Other relevant information needed in order to boot a guest kernel +(console page address, xenstore event channel...) can be obtained +using HVMPARAMS, just like it's done on HVM guests. + +The setup of the hypercall page is also performed in the same way +as HVM guests, using the hypervisor cpuid leaves and msr ranges. + +## AP startup ## + +AP startup can be performed using hypercalls or the local APIC if present. +The following VCPU hypercalls can be used in order to bring up secondary vCPUs: + + * `VCPUOP_initialise` is used to set the initial state of the vCPU. The + argument passed to the hypercall must be of the type vcpu\_hvm\_context. + See `public/hvm/hvm_vcpu.h` for the layout of the structure. Note that + this hypercall allows starting the vCPU in several modes (16/32/64bits), + regardless of the mode the BSP is currently running on. + + * `VCPUOP_up` is used to launch the vCPU once the initial state has been + set using `VCPUOP_initialise`. + + * `VCPUOP_down` is used to bring down a vCPU. + + * `VCPUOP_is_up` is used to scan the number of available vCPUs. + +## Hardware description ## + +PVHv2 guests that have access to hardware (either emulated or real) will also +have ACPI tables with the description of the hardware that's available to the +guest. This applies to both privileged and unprivileged guests. A pointer to +the position of the RSDP in memory (if present) can be fetched from the start +info structure that's passed at boot time (field rsdp\_paddr). + +Description of paravirtualized devices will come from XenStore, just as it's +done for HVM guests. + +## Interrupts ## + +### Interrupts from physical devices ### + +Interrupts from physical devices are delivered using native methods, this is +done in order to take advantage of new hardware assisted virtualization +functions, like posted interrupts. This implies that PVHv2 guests with physical +devices will also have the necessary interrupt controllers in order to manage +the delivery of interrupts from those devices, using the same interfaces that +are available on native hardware. + +### Interrupts from paravirtualized devices ### + +Interrupts from paravirtualized devices are delivered using event channels, see +[Event Channel Internals][event_channels] for more detailed information about +event channels. Delivery of those interrupts can be configured in the same way +as HVM guests, check xen/include/public/hvm/params.h and +xen/include/public/hvm/hvm\_op.h for more information about available delivery +methods. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/tools/debugger/gdbsx/xg/xg_main.c new/xen-4.10.0-testing/tools/debugger/gdbsx/xg/xg_main.c --- old/xen-4.10.0-testing/tools/debugger/gdbsx/xg/xg_main.c 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/tools/debugger/gdbsx/xg/xg_main.c 2017-11-24 17:28:36.000000000 +0100 @@ -126,9 +126,11 @@ int flags, saved_errno; XGTRC("E\n"); - if ((_dom0_fd=open("/proc/xen/privcmd", O_RDWR)) == -1) { - perror("Failed to open /proc/xen/privcmd\n"); - return -1; + if ((_dom0_fd=open("/dev/xen/privcmd", O_RDWR)) == -1) { + if ((_dom0_fd=open("/proc/xen/privcmd", O_RDWR)) == -1) { + perror("Failed to open /dev/xen/privcmd or /proc/xen/privcmd\n"); + return -1; + } } /* Although we return the file handle as the 'xc handle' the API * does not specify / guarentee that this integer is in fact diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/tools/hotplug/Linux/init.d/xencommons.in new/xen-4.10.0-testing/tools/hotplug/Linux/init.d/xencommons.in --- old/xen-4.10.0-testing/tools/hotplug/Linux/init.d/xencommons.in 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/tools/hotplug/Linux/init.d/xencommons.in 2017-11-24 17:28:36.000000000 +0100 @@ -58,6 +58,7 @@ mkdir -p ${XEN_RUN_DIR} mkdir -p ${XEN_LOCK_DIR} + mkdir -p ${XEN_LOG_DIR} @XEN_SCRIPT_DIR@/launch-xenstore || exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/tools/libs/evtchn/core.c new/xen-4.10.0-testing/tools/libs/evtchn/core.c --- old/xen-4.10.0-testing/tools/libs/evtchn/core.c 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/tools/libs/evtchn/core.c 2017-11-24 17:28:36.000000000 +0100 @@ -56,6 +56,7 @@ err: osdep_evtchn_close(xce); + xentoolcore__deregister_active_handle(&xce->tc_ah); xtl_logger_destroy(xce->logger_tofree); free(xce); return NULL; @@ -69,6 +70,7 @@ return 0; rc = osdep_evtchn_close(xce); + xentoolcore__deregister_active_handle(&xce->tc_ah); xtl_logger_destroy(xce->logger_tofree); free(xce); return rc; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/tools/libs/evtchn/freebsd.c new/xen-4.10.0-testing/tools/libs/evtchn/freebsd.c --- old/xen-4.10.0-testing/tools/libs/evtchn/freebsd.c 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/tools/libs/evtchn/freebsd.c 2017-11-24 17:28:36.000000000 +0100 @@ -19,6 +19,7 @@ * Split off from xc_freebsd_osdep.c */ +#include <errno.h> #include <fcntl.h> #include <unistd.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/tools/libs/evtchn/netbsd.c new/xen-4.10.0-testing/tools/libs/evtchn/netbsd.c --- old/xen-4.10.0-testing/tools/libs/evtchn/netbsd.c 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/tools/libs/evtchn/netbsd.c 2017-11-24 17:28:36.000000000 +0100 @@ -19,6 +19,7 @@ * Split out from xc_netbsd.c */ +#include <errno.h> #include <fcntl.h> #include <unistd.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/tools/libs/evtchn/solaris.c new/xen-4.10.0-testing/tools/libs/evtchn/solaris.c --- old/xen-4.10.0-testing/tools/libs/evtchn/solaris.c 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/tools/libs/evtchn/solaris.c 2017-11-24 17:28:36.000000000 +0100 @@ -19,6 +19,7 @@ * Split out from xc_solaris.c */ +#include <errno.h> #include <fcntl.h> #include <unistd.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/tools/libxc/xc_dom_arm.c new/xen-4.10.0-testing/tools/libxc/xc_dom_arm.c --- old/xen-4.10.0-testing/tools/libxc/xc_dom_arm.c 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/tools/libxc/xc_dom_arm.c 2017-11-24 17:28:36.000000000 +0100 @@ -91,7 +91,8 @@ xc_clear_domain_page(dom->xch, dom->guest_domid, dom->console_pfn); xc_clear_domain_page(dom->xch, dom->guest_domid, dom->xenstore_pfn); xc_clear_domain_page(dom->xch, dom->guest_domid, base + MEMACCESS_PFN_OFFSET); - xc_clear_domain_page(dom->xch, dom->guest_domid, base + VUART_PFN_OFFSET); + xc_clear_domain_page(dom->xch, dom->guest_domid, dom->vuart_gfn); + xc_hvm_param_set(dom->xch, dom->guest_domid, HVM_PARAM_CONSOLE_PFN, dom->console_pfn); xc_hvm_param_set(dom->xch, dom->guest_domid, HVM_PARAM_STORE_PFN, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/tools/libxc/xc_dom_boot.c new/xen-4.10.0-testing/tools/libxc/xc_dom_boot.c --- old/xen-4.10.0-testing/tools/libxc/xc_dom_boot.c 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/tools/libxc/xc_dom_boot.c 2017-11-24 17:28:36.000000000 +0100 @@ -62,25 +62,6 @@ return rc; } -static int clear_page(struct xc_dom_image *dom, xen_pfn_t pfn) -{ - xen_pfn_t dst; - int rc; - - if ( pfn == 0 ) - return 0; - - dst = xc_dom_p2m(dom, pfn); - DOMPRINTF("%s: pfn 0x%" PRIpfn ", mfn 0x%" PRIpfn "", - __FUNCTION__, pfn, dst); - rc = xc_clear_domain_page(dom->xch, dom->guest_domid, dst); - if ( rc != 0 ) - xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, - "%s: xc_clear_domain_page failed (pfn 0x%" PRIpfn - ", rc=%d)", __FUNCTION__, pfn, rc); - return rc; -} - /* ------------------------------------------------------------------------ */ @@ -222,13 +203,6 @@ if ( (rc = dom->arch_hooks->setup_pgtables(dom)) != 0 ) return rc; - if ( (rc = clear_page(dom, dom->console_pfn)) != 0 ) - return rc; - if ( (rc = clear_page(dom, dom->xenstore_pfn)) != 0 ) - return rc; - if ( (rc = clear_page(dom, dom->vuart_gfn)) != 0 ) - return rc; - /* start info page */ if ( dom->arch_hooks->start_info ) dom->arch_hooks->start_info(dom); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/tools/libxc/xc_dom_x86.c new/xen-4.10.0-testing/tools/libxc/xc_dom_x86.c --- old/xen-4.10.0-testing/tools/libxc/xc_dom_x86.c 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/tools/libxc/xc_dom_x86.c 2017-11-24 17:28:36.000000000 +0100 @@ -534,24 +534,24 @@ /* ------------------------------------------------------------------------ */ -static int alloc_magic_pages(struct xc_dom_image *dom) +static int alloc_magic_pages_pv(struct xc_dom_image *dom) { - /* allocate special pages */ dom->start_info_pfn = xc_dom_alloc_page(dom, "start info"); if ( dom->start_info_pfn == INVALID_PFN ) return -1; + dom->xenstore_pfn = xc_dom_alloc_page(dom, "xenstore"); if ( dom->xenstore_pfn == INVALID_PFN ) return -1; + xc_clear_domain_page(dom->xch, dom->guest_domid, + xc_dom_p2m(dom, dom->xenstore_pfn)); + dom->console_pfn = xc_dom_alloc_page(dom, "console"); if ( dom->console_pfn == INVALID_PFN ) return -1; - if ( xc_dom_translated(dom) ) - { - dom->shared_info_pfn = xc_dom_alloc_page(dom, "shared info"); - if ( dom->shared_info_pfn == INVALID_PFN ) - return -1; - } + xc_clear_domain_page(dom->xch, dom->guest_domid, + xc_dom_p2m(dom, dom->console_pfn)); + dom->alloc_bootstack = 1; return 0; @@ -700,7 +700,11 @@ special_pfn(SPECIALPAGE_IDENT_PT) << PAGE_SHIFT); dom->console_pfn = special_pfn(SPECIALPAGE_CONSOLE); + xc_clear_domain_page(dom->xch, dom->guest_domid, dom->console_pfn); + dom->xenstore_pfn = special_pfn(SPECIALPAGE_XENSTORE); + xc_clear_domain_page(dom->xch, dom->guest_domid, dom->xenstore_pfn); + dom->parms.virt_hypercall = -1; rc = 0; @@ -1756,7 +1760,7 @@ .sizeof_pfn = 4, .p2m_base_supported = 0, .arch_private_size = sizeof(struct xc_dom_image_x86), - .alloc_magic_pages = alloc_magic_pages, + .alloc_magic_pages = alloc_magic_pages_pv, .alloc_pgtables = alloc_pgtables_x86_32_pae, .alloc_p2m_list = alloc_p2m_list_x86_32, .setup_pgtables = setup_pgtables_x86_32_pae, @@ -1775,7 +1779,7 @@ .sizeof_pfn = 8, .p2m_base_supported = 1, .arch_private_size = sizeof(struct xc_dom_image_x86), - .alloc_magic_pages = alloc_magic_pages, + .alloc_magic_pages = alloc_magic_pages_pv, .alloc_pgtables = alloc_pgtables_x86_64, .alloc_p2m_list = alloc_p2m_list_x86_64, .setup_pgtables = setup_pgtables_x86_64, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/tools/libxc/xc_sr_restore_x86_pv.c new/xen-4.10.0-testing/tools/libxc/xc_sr_restore_x86_pv.c --- old/xen-4.10.0-testing/tools/libxc/xc_sr_restore_x86_pv.c 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/tools/libxc/xc_sr_restore_x86_pv.c 2017-11-24 17:28:36.000000000 +0100 @@ -455,8 +455,8 @@ domctl.cmd = XEN_DOMCTL_set_vcpu_msrs; domctl.domain = ctx->domid; domctl.u.vcpu_msrs.vcpu = vcpuid; - domctl.u.vcpu_msrs.msr_count = vcpu->msrsz % sizeof(xen_domctl_vcpu_msr_t); - set_xen_guest_handle(domctl.u.vcpuextstate.buffer, buffer); + domctl.u.vcpu_msrs.msr_count = vcpu->msrsz / sizeof(xen_domctl_vcpu_msr_t); + set_xen_guest_handle(domctl.u.vcpu_msrs.msrs, buffer); memcpy(buffer, vcpu->msr, vcpu->msrsz); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/tools/libxl/libxl_console.c new/xen-4.10.0-testing/tools/libxl/libxl_console.c --- old/xen-4.10.0-testing/tools/libxl/libxl_console.c 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/tools/libxl/libxl_console.c 2017-11-24 17:28:36.000000000 +0100 @@ -376,7 +376,7 @@ flexarray_append(ro_front, "port"); flexarray_append(ro_front, GCSPRINTF("%"PRIu32, state->vuart_port)); flexarray_append(ro_front, "ring-ref"); - flexarray_append(ro_front, GCSPRINTF("%"PRI_xen_pfn, state->vuart_gfn)); + flexarray_append(ro_front, GCSPRINTF("%"PRIu_xen_pfn, state->vuart_gfn)); flexarray_append(ro_front, "limit"); flexarray_append(ro_front, GCSPRINTF("%d", LIBXL_XENCONSOLE_LIMIT)); flexarray_append(ro_front, "type"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/tools/misc/xen-cpuid.c new/xen-4.10.0-testing/tools/misc/xen-cpuid.c --- old/xen-4.10.0-testing/tools/misc/xen-cpuid.c 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/tools/misc/xen-cpuid.c 2017-11-24 17:28:36.000000000 +0100 @@ -95,7 +95,7 @@ [ 0] = "fsgsbase", [ 1] = "tsc-adj", [ 2] = "sgx", [ 3] = "bmi1", [ 4] = "hle", [ 5] = "avx2", - [ 6] = "REZ", [ 7] = "smep", + [ 6] = "fdp_exn", [ 7] = "smep", [ 8] = "bmi2", [ 9] = "erms", [10] = "invpcid", [11] = "rtm", [12] = "pqm", [13] = "depfpp", @@ -121,23 +121,28 @@ static const char *str_7c0[32] = { [ 0] = "prechwt1", [ 1] = "avx512vbmi", - [ 2] = "REZ", [ 3] = "pku", + [ 2] = "umip", [ 3] = "pku", [ 4] = "ospke", [5 ... 13] = "REZ", [14] = "avx512_vpopcntdq", - [15 ... 31] = "REZ", + [15 ... 21] = "REZ", + + [22] = "rdpid", + + [23 ... 31] = "REZ", }; static const char *str_e7d[32] = { [0 ... 7] = "REZ", - [ 8] = "itsc", + [ 8] = "itsc", [ 9] = "REZ", + [10] = "efro", - [9 ... 31] = "REZ", + [11 ... 31] = "REZ", }; static const char *str_e8b[32] = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/tools/xenstore/xenstored_control.c new/xen-4.10.0-testing/tools/xenstore/xenstored_control.c --- old/xen-4.10.0-testing/tools/xenstore/xenstored_control.c 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/tools/xenstore/xenstored_control.c 2017-11-24 17:28:36.000000000 +0100 @@ -184,6 +184,8 @@ return EACCES; num = xs_count_strings(in->buffer, in->used); + if (num < 1) + return EINVAL; vec = talloc_array(in, char *, num); if (!vec) return ENOMEM; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/xen/arch/arm/domain_build.c new/xen-4.10.0-testing/xen/arch/arm/domain_build.c --- old/xen-4.10.0-testing/xen/arch/arm/domain_build.c 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/xen/arch/arm/domain_build.c 2017-11-24 17:28:36.000000000 +0100 @@ -2002,15 +2002,15 @@ for ( offs = 0; offs < len; ) { - int rc; - paddr_t s, l, ma; + uint64_t par; + paddr_t s, l, ma = 0; void *dst; s = offs & ~PAGE_MASK; l = min(PAGE_SIZE - s, len); - rc = gvirt_to_maddr(load_addr + offs, &ma, GV2M_WRITE); - if ( rc ) + par = gvirt_to_maddr(load_addr + offs, &ma, GV2M_WRITE); + if ( par ) { panic("Unable to translate guest address"); return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/xen/arch/arm/kernel.c new/xen-4.10.0-testing/xen/arch/arm/kernel.c --- old/xen-4.10.0-testing/xen/arch/arm/kernel.c 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/xen/arch/arm/kernel.c 2017-11-24 17:28:36.000000000 +0100 @@ -167,15 +167,15 @@ paddr, load_addr, load_addr + len); for ( offs = 0; offs < len; ) { - int rc; - paddr_t s, l, ma; + uint64_t par; + paddr_t s, l, ma = 0; void *dst; s = offs & ~PAGE_MASK; l = min(PAGE_SIZE - s, len); - rc = gvirt_to_maddr(load_addr + offs, &ma, GV2M_WRITE); - if ( rc ) + par = gvirt_to_maddr(load_addr + offs, &ma, GV2M_WRITE); + if ( par ) { panic("Unable to map translate guest address"); return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/xen/arch/arm/p2m.c new/xen-4.10.0-testing/xen/arch/arm/p2m.c --- old/xen-4.10.0-testing/xen/arch/arm/p2m.c 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/xen/arch/arm/p2m.c 2017-11-24 17:28:36.000000000 +0100 @@ -1414,7 +1414,7 @@ struct p2m_domain *p2m = p2m_get_hostp2m(d); struct page_info *page = NULL; paddr_t maddr = 0; - int rc; + uint64_t par; /* * XXX: To support a different vCPU, we would need to load the @@ -1425,19 +1425,32 @@ p2m_read_lock(p2m); - rc = gvirt_to_maddr(va, &maddr, flags); + par = gvirt_to_maddr(va, &maddr, flags); - if ( rc ) + if ( par ) + { + dprintk(XENLOG_G_DEBUG, + "%pv: gvirt_to_maddr failed va=%#"PRIvaddr" flags=0x%lx par=%#"PRIx64"\n", + v, va, flags, par); goto err; + } if ( !mfn_valid(maddr_to_mfn(maddr)) ) + { + dprintk(XENLOG_G_DEBUG, "%pv: Invalid MFN %#"PRI_mfn"\n", + v, mfn_x(maddr_to_mfn(maddr))); goto err; + } page = mfn_to_page(maddr_to_mfn(maddr)); ASSERT(page); if ( unlikely(!get_page(page, d)) ) + { + dprintk(XENLOG_G_DEBUG, "%pv: Failing to acquire the MFN %#"PRI_mfn"\n", + v, mfn_x(maddr_to_mfn(maddr))); page = NULL; + } err: if ( !page && p2m->mem_access_enabled ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/xen/arch/x86/hvm/hpet.c new/xen-4.10.0-testing/xen/arch/x86/hvm/hpet.c --- old/xen-4.10.0-testing/xen/arch/x86/hvm/hpet.c 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/xen/arch/x86/hvm/hpet.c 2017-11-24 17:28:36.000000000 +0100 @@ -635,14 +635,10 @@ HVM_REGISTER_SAVE_RESTORE(HPET, hpet_save, hpet_load, 1, HVMSR_PER_DOM); -void hpet_init(struct domain *d) +static void hpet_set(HPETState *h) { - HPETState *h = domain_vhpet(d); int i; - if ( !has_vhpet(d) ) - return; - memset(h, 0, sizeof(HPETState)); rwlock_init(&h->lock); @@ -668,7 +664,14 @@ h->hpet.comparator64[i] = ~0ULL; h->pt[i].source = PTSRC_isa; } +} + +void hpet_init(struct domain *d) +{ + if ( !has_vhpet(d) ) + return; + hpet_set(domain_vhpet(d)); register_mmio_handler(d, &hpet_mmio_ops); d->arch.hvm_domain.params[HVM_PARAM_HPET_ENABLED] = 1; } @@ -697,8 +700,11 @@ void hpet_reset(struct domain *d) { + if ( !has_vhpet(d) ) + return; + hpet_deinit(d); - hpet_init(d); + hpet_set(domain_vhpet(d)); } /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/xen/arch/x86/hvm/hvm.c new/xen-4.10.0-testing/xen/arch/x86/hvm/hvm.c --- old/xen-4.10.0-testing/xen/arch/x86/hvm/hvm.c 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/xen/arch/x86/hvm/hvm.c 2017-11-24 17:28:36.000000000 +0100 @@ -1330,6 +1330,7 @@ for_each_vcpu ( d, v ) { + struct hvm_save_descriptor *d = _p(&h->data[h->cur]); struct hvm_msr *ctxt; unsigned int i; @@ -1348,8 +1349,13 @@ ctxt->msr[i]._rsvd = 0; if ( ctxt->count ) + { + /* Rewrite length to indicate how much space we actually used. */ + d->length = HVM_CPU_MSR_SIZE(ctxt->count); h->cur += HVM_CPU_MSR_SIZE(ctxt->count); + } else + /* or rewind and remove the descriptor from the stream. */ h->cur -= sizeof(struct hvm_save_descriptor); } @@ -4534,12 +4540,18 @@ if ( a.u.enable_notify.pad || a.domain != DOMID_SELF || a.u.enable_notify.vcpu_id != curr->vcpu_id ) + { rc = -EINVAL; + break; + } if ( !gfn_eq(vcpu_altp2m(curr).veinfo_gfn, INVALID_GFN) || mfn_eq(get_gfn_query_unlocked(curr->domain, a.u.enable_notify.gfn, &p2mt), INVALID_MFN) ) - return -EINVAL; + { + rc = -EINVAL; + break; + } vcpu_altp2m(curr).veinfo_gfn = _gfn(a.u.enable_notify.gfn); altp2m_vcpu_update_vmfunc_ve(curr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/xen/arch/x86/mm/shadow/multi.c new/xen-4.10.0-testing/xen/arch/x86/mm/shadow/multi.c --- old/xen-4.10.0-testing/xen/arch/x86/mm/shadow/multi.c 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/xen/arch/x86/mm/shadow/multi.c 2017-11-24 17:28:36.000000000 +0100 @@ -4350,11 +4350,18 @@ /* Carefully look in the shadow linear map for the l1e we expect */ #if SHADOW_PAGING_LEVELS >= 4 - /* Is a shadow linear map is installed in the first place? */ - sl4p = v->arch.paging.shadow.guest_vtable; - sl4p += shadow_l4_table_offset(SH_LINEAR_PT_VIRT_START); - if ( !(shadow_l4e_get_flags(*sl4p) & _PAGE_PRESENT) ) - return 0; + /* + * Non-external guests (i.e. PV) have a SHADOW_LINEAR mapping from the + * moment their shadows are created. External guests (i.e. HVM) may not, + * but always have a regular linear mapping, which we can use to observe + * whether a SHADOW_LINEAR mapping is present. + */ + if ( paging_mode_external(d) ) + { + sl4p = __linear_l4_table + l4_linear_offset(SH_LINEAR_PT_VIRT_START); + if ( !(shadow_l4e_get_flags(*sl4p) & _PAGE_PRESENT) ) + return 0; + } sl4p = sh_linear_l4_table(v) + shadow_l4_linear_offset(vaddr); if ( !(shadow_l4e_get_flags(*sl4p) & _PAGE_PRESENT) ) return 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/xen/arch/x86/mm.c new/xen-4.10.0-testing/xen/arch/x86/mm.c --- old/xen-4.10.0-testing/xen/arch/x86/mm.c 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/xen/arch/x86/mm.c 2017-11-24 17:28:36.000000000 +0100 @@ -2477,26 +2477,19 @@ break; } -#ifdef CONFIG_PV_LINEAR_PT - if ( ptpg && PGT_type_equal(x, ptpg->u.inuse.type_info) ) + if ( !ptpg || !PGT_type_equal(x, ptpg->u.inuse.type_info) ) { /* * set_tlbflush_timestamp() accesses the same union - * linear_pt_count lives in. Unvalidated page table pages, - * however, should occur during domain destruction only - * anyway. Updating of linear_pt_count luckily is not - * necessary anymore for a dying domain. + * linear_pt_count lives in. Pages (including page table ones), + * however, don't need their flush time stamp set except when + * the last reference is being dropped. For page table pages + * this happens in _put_final_page_type(). */ - ASSERT(page_get_owner(page)->is_dying); - ASSERT(page->linear_pt_count < 0); - ASSERT(ptpg->linear_pt_count > 0); - ptpg = NULL; - } -#else /* CONFIG_PV_LINEAR_PT */ - BUG_ON(ptpg && PGT_type_equal(x, ptpg->u.inuse.type_info)); -#endif - - set_tlbflush_timestamp(page); + set_tlbflush_timestamp(page); + } + else + BUG_ON(!IS_ENABLED(CONFIG_PV_LINEAR_PT)); } else if ( unlikely((nx & (PGT_locked | PGT_count_mask)) == (PGT_locked | 1)) ) @@ -4844,9 +4837,29 @@ { unsigned long base_mfn; - pl1e = l2e_to_l1e(*pl2e); if ( locking ) spin_lock(&map_pgdir_lock); + + ol2e = *pl2e; + /* + * L2E may be already cleared, or set to a superpage, by + * concurrent paging structure modifications on other CPUs. + */ + if ( !(l2e_get_flags(ol2e) & _PAGE_PRESENT) ) + { + if ( locking ) + spin_unlock(&map_pgdir_lock); + continue; + } + + if ( l2e_get_flags(ol2e) & _PAGE_PSE ) + { + if ( locking ) + spin_unlock(&map_pgdir_lock); + goto check_l3; + } + + pl1e = l2e_to_l1e(ol2e); base_mfn = l1e_get_pfn(*pl1e) & ~(L1_PAGETABLE_ENTRIES - 1); for ( i = 0; i < L1_PAGETABLE_ENTRIES; i++, pl1e++ ) if ( (l1e_get_pfn(*pl1e) != (base_mfn + i)) || @@ -4854,7 +4867,6 @@ break; if ( i == L1_PAGETABLE_ENTRIES ) { - ol2e = *pl2e; l2e_write_atomic(pl2e, l2e_from_pfn(base_mfn, l1f_to_lNf(flags))); if ( locking ) @@ -4880,7 +4892,20 @@ if ( locking ) spin_lock(&map_pgdir_lock); + ol3e = *pl3e; + /* + * L3E may be already cleared, or set to a superpage, by + * concurrent paging structure modifications on other CPUs. + */ + if ( !(l3e_get_flags(ol3e) & _PAGE_PRESENT) || + (l3e_get_flags(ol3e) & _PAGE_PSE) ) + { + if ( locking ) + spin_unlock(&map_pgdir_lock); + continue; + } + pl2e = l3e_to_l2e(ol3e); base_mfn = l2e_get_pfn(*pl2e) & ~(L2_PAGETABLE_ENTRIES * L1_PAGETABLE_ENTRIES - 1); @@ -5079,6 +5104,27 @@ */ if ( (nf & _PAGE_PRESENT) || ((v != e) && (l1_table_offset(v) != 0)) ) continue; + if ( locking ) + spin_lock(&map_pgdir_lock); + + /* + * L2E may be already cleared, or set to a superpage, by + * concurrent paging structure modifications on other CPUs. + */ + if ( !(l2e_get_flags(*pl2e) & _PAGE_PRESENT) ) + { + if ( locking ) + spin_unlock(&map_pgdir_lock); + goto check_l3; + } + + if ( l2e_get_flags(*pl2e) & _PAGE_PSE ) + { + if ( locking ) + spin_unlock(&map_pgdir_lock); + continue; + } + pl1e = l2e_to_l1e(*pl2e); for ( i = 0; i < L1_PAGETABLE_ENTRIES; i++ ) if ( l1e_get_intpte(pl1e[i]) != 0 ) @@ -5087,11 +5133,16 @@ { /* Empty: zap the L2E and free the L1 page. */ l2e_write_atomic(pl2e, l2e_empty()); + if ( locking ) + spin_unlock(&map_pgdir_lock); flush_area(NULL, FLUSH_TLB_GLOBAL); /* flush before free */ free_xen_pagetable(pl1e); } + else if ( locking ) + spin_unlock(&map_pgdir_lock); } + check_l3: /* * If we are not destroying mappings, or not done with the L3E, * skip the empty&free check. @@ -5099,6 +5150,21 @@ if ( (nf & _PAGE_PRESENT) || ((v != e) && (l2_table_offset(v) + l1_table_offset(v) != 0)) ) continue; + if ( locking ) + spin_lock(&map_pgdir_lock); + + /* + * L3E may be already cleared, or set to a superpage, by + * concurrent paging structure modifications on other CPUs. + */ + if ( !(l3e_get_flags(*pl3e) & _PAGE_PRESENT) || + (l3e_get_flags(*pl3e) & _PAGE_PSE) ) + { + if ( locking ) + spin_unlock(&map_pgdir_lock); + continue; + } + pl2e = l3e_to_l2e(*pl3e); for ( i = 0; i < L2_PAGETABLE_ENTRIES; i++ ) if ( l2e_get_intpte(pl2e[i]) != 0 ) @@ -5107,9 +5173,13 @@ { /* Empty: zap the L3E and free the L2 page. */ l3e_write_atomic(pl3e, l3e_empty()); + if ( locking ) + spin_unlock(&map_pgdir_lock); flush_area(NULL, FLUSH_TLB_GLOBAL); /* flush before free */ free_xen_pagetable(pl2e); } + else if ( locking ) + spin_unlock(&map_pgdir_lock); } flush_area(NULL, FLUSH_TLB_GLOBAL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/xen/common/gcov/gcov.c new/xen-4.10.0-testing/xen/common/gcov/gcov.c --- old/xen-4.10.0-testing/xen/common/gcov/gcov.c 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/xen/common/gcov/gcov.c 2017-11-24 17:28:36.000000000 +0100 @@ -239,7 +239,7 @@ break; default: - ret = -ENOSYS; + ret = -EOPNOTSUPP; break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/xen/common/multicall.c new/xen-4.10.0-testing/xen/common/multicall.c --- old/xen-4.10.0-testing/xen/common/multicall.c 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/xen/common/multicall.c 2017-11-24 17:28:36.000000000 +0100 @@ -66,6 +66,13 @@ disp = arch_do_multicall_call(mcs); + /* + * In the unlikely event that a hypercall has left interrupts, + * spinlocks, or other things in a bad way, continuing the multicall + * will typically lead to far more subtle issues to debug. + */ + ASSERT_NOT_IN_ATOMIC(); + #ifndef NDEBUG { /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/xen/common/spinlock.c new/xen-4.10.0-testing/xen/common/spinlock.c --- old/xen-4.10.0-testing/xen/common/spinlock.c 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/xen/common/spinlock.c 2017-11-24 17:28:36.000000000 +0100 @@ -44,7 +44,13 @@ if ( unlikely(debug->irq_safe != irq_safe) ) { int seen = cmpxchg(&debug->irq_safe, -1, irq_safe); - BUG_ON(seen == !irq_safe); + + if ( seen == !irq_safe ) + { + printk("CHECKLOCK FAILURE: prev irqsafe: %d, curr irqsafe %d\n", + seen, irq_safe); + BUG(); + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/xen/include/asm-arm/mm.h new/xen-4.10.0-testing/xen/include/asm-arm/mm.h --- old/xen-4.10.0-testing/xen/include/asm-arm/mm.h 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/xen/include/asm-arm/mm.h 2017-11-24 17:28:36.000000000 +0100 @@ -266,11 +266,16 @@ } #endif -static inline int gvirt_to_maddr(vaddr_t va, paddr_t *pa, unsigned int flags) +/* + * Translate a guest virtual address to a machine address. + * Return the fault information if the translation has failed else 0. + */ +static inline uint64_t gvirt_to_maddr(vaddr_t va, paddr_t *pa, + unsigned int flags) { uint64_t par = gva_to_ma_par(va, flags); if ( par & PAR_F ) - return -EFAULT; + return par; *pa = (par & PADDR_MASK & PAGE_MASK) | ((unsigned long) va & ~PAGE_MASK); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/xen/include/public/arch-arm.h new/xen-4.10.0-testing/xen/include/public/arch-arm.h --- old/xen-4.10.0-testing/xen/include/public/arch-arm.h 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/xen/include/public/arch-arm.h 2017-11-24 17:28:36.000000000 +0100 @@ -274,6 +274,7 @@ typedef uint64_t xen_pfn_t; #define PRI_xen_pfn PRIx64 +#define PRIu_xen_pfn PRIu64 /* Maximum number of virtual CPUs in legacy multi-processor guests. */ /* Only one. All other VCPUS must use VCPUOP_register_vcpu_info */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/xen/include/public/arch-x86/cpufeatureset.h new/xen-4.10.0-testing/xen/include/public/arch-x86/cpufeatureset.h --- old/xen-4.10.0-testing/xen/include/public/arch-x86/cpufeatureset.h 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/xen/include/public/arch-x86/cpufeatureset.h 2017-11-24 17:28:36.000000000 +0100 @@ -239,8 +239,8 @@ XEN_CPUFEATURE(CLZERO, 8*32+ 0) /*A CLZERO instruction */ /* Intel-defined CPU features, CPUID level 0x00000007:0.edx, word 9 */ -XEN_CPUFEATURE(AVX512_4VNNIW, 9*32+ 2) /*A AVX512 Neural Network Instructions */ -XEN_CPUFEATURE(AVX512_4FMAPS, 9*32+ 3) /*A AVX512 Multiply Accumulation Single Precision */ +XEN_CPUFEATURE(AVX512_4VNNIW, 9*32+ 2) /*A AVX512 Neural Network Instructions */ +XEN_CPUFEATURE(AVX512_4FMAPS, 9*32+ 3) /*A AVX512 Multiply Accumulation Single Precision */ #endif /* XEN_CPUFEATURE */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xen-4.10.0-testing/xen/include/public/arch-x86/xen.h new/xen-4.10.0-testing/xen/include/public/arch-x86/xen.h --- old/xen-4.10.0-testing/xen/include/public/arch-x86/xen.h 2017-11-02 21:13:35.000000000 +0100 +++ new/xen-4.10.0-testing/xen/include/public/arch-x86/xen.h 2017-11-24 17:28:36.000000000 +0100 @@ -75,6 +75,7 @@ #ifndef __ASSEMBLY__ typedef unsigned long xen_pfn_t; #define PRI_xen_pfn "lx" +#define PRIu_xen_pfn "lu" #endif #define XEN_HAVE_PV_GUEST_ENTRY 1 ++++++ xen2libvirt.py ++++++ --- /var/tmp/diff_new_pack.JSV8D9/_old 2017-11-30 12:41:40.058041574 +0100 +++ /var/tmp/diff_new_pack.JSV8D9/_new 2017-11-30 12:41:40.066041283 +0100 @@ -22,6 +22,7 @@ # Read native Xen configuration format, convert to libvirt domXML, and # import (virsh define <xml>) into libvirt. +from __future__ import print_function import sys import os import argparse @@ -31,7 +32,7 @@ try: import libvirt except ImportError: - print 'Unable to import the libvirt module. Is libvirt-python installed?' + print('Unable to import the libvirt module. Is libvirt-python installed?') sys.exit(1) parser = argparse.ArgumentParser(description='Import Xen domain configuration into libvirt') @@ -44,14 +45,14 @@ def print_verbose(msg): if args.verbose: - print msg + print(msg) def check_config(path, config): isbinary = os.system('file -b ' + path + ' | grep text > /dev/null') if isbinary: - print('Skipping %s (not a valid Xen configuration file)' % path) + print(('Skipping %s (not a valid Xen configuration file)' % path)) return 'unknown' for line in config.splitlines(): @@ -61,14 +62,14 @@ # XML is not a supported conversion format break if line.startswith('(domain'): - print('Found sexpr formatted file %s' % path) + print(('Found sexpr formatted file %s' % path)) return 'sexpr' if '=' in line: - print('Found xm formatted file %s' % path) + print(('Found xm formatted file %s' % path)) return 'xm' break - print('Skipping %s (not a valid Xen configuration file)' % path) + print(('Skipping %s (not a valid Xen configuration file)' % path)) return 'unknown' @@ -103,12 +104,12 @@ print_verbose('Successfully converted Xen domain configuration to ' 'libvirt domXML:\n %s' % xml) if convert_only: - print xml + print(xml) else: print_verbose('Importing converted libvirt domXML into libvirt...') dom = conn.defineXML(xml) if dom is None: - print 'Failed to define domain from converted domXML' + print('Failed to define domain from converted domXML') sys.exit(1) print_verbose('domXML successfully imported into libvirt') @@ -130,7 +131,7 @@ print_verbose('Processing file %s' % abs_name) import_domain(conn, abs_name, args.format, args.convert_only) except IOError: - print('Failed to open/read path %s' % path) + print(('Failed to open/read path %s' % path)) sys.exit(1) else: import_domain(conn, args.path, args.format, args.convert_only) ++++++ xenmon-python3-conversion.patch ++++++ Index: xen-4.10.0-testing/tools/xenmon/xenmon.py =================================================================== --- xen-4.10.0-testing.orig/tools/xenmon/xenmon.py +++ xen-4.10.0-testing/tools/xenmon/xenmon.py @@ -23,6 +23,7 @@ # along with this program; If not, see <http://www.gnu.org/licenses/>. ##################################################################### +from __future__ import print_function import mmap import struct import os @@ -248,8 +249,8 @@ def display(scr, row, col, str, attr=0): scr.keypad(0) _c.echo() _c.endwin() - print "Your terminal screen is not big enough; Please resize it." - print "row=%d, col=%d, str='%s'" % (row, col, str) + print("Your terminal screen is not big enough; Please resize it.") + print("row=%d, col=%d, str='%s'" % (row, col, str)) sys.exit(1) @@ -704,7 +705,7 @@ def main(): try: writelog() except: - print 'Quitting.' + print('Quitting.') stop_xenbaked() if __name__ == "__main__": ++++++ xenstore-run-in-studomain.patch ++++++ References: fate#323663 - Run Xenstore in stubdomain Index: xen-4.10.0-testing/tools/hotplug/Linux/init.d/sysconfig.xencommons.in =================================================================== --- xen-4.10.0-testing.orig/tools/hotplug/Linux/init.d/sysconfig.xencommons.in +++ xen-4.10.0-testing/tools/hotplug/Linux/init.d/sysconfig.xencommons.in @@ -16,7 +16,7 @@ # # Changing this requires a reboot to take effect. # -#XENSTORETYPE=daemon +XENSTORETYPE=domain ## Type: string ## Default: xenstored @@ -67,7 +67,7 @@ XENSTORED_ARGS= # # xenstore domain memory size in MiB. # Only evaluated if XENSTORETYPE is "domain". -#XENSTORE_DOMAIN_SIZE=8 +XENSTORE_DOMAIN_SIZE=32 ## Type: string ## Default: not set, no autoballooning of xenstore domain @@ -78,7 +78,7 @@ XENSTORED_ARGS= # - combination of both in form of <val>:<frac> (e.g. 8:1/100), resulting # value will be the higher of both specifications # Only evaluated if XENSTORETYPE is "domain". -#XENSTORE_MAX_DOMAIN_SIZE= +XENSTORE_MAX_DOMAIN_SIZE=1/100 ## Type: string ## Default: "" ++++++ xnloader.py ++++++ --- /var/tmp/diff_new_pack.JSV8D9/_old 2017-11-30 12:41:40.150038229 +0100 +++ /var/tmp/diff_new_pack.JSV8D9/_new 2017-11-30 12:41:40.150038229 +0100 @@ -13,6 +13,7 @@ # Binary patching of xnloader.sys # For launching NetWare on Xen 4.2 and newer +from __future__ import print_function import os, sys, base64 CODE_OFFSET=0x49F5 @@ -34,8 +35,8 @@ try: fd = os.open(loader, os.O_RDWR) - except Exception, e: - print >>sys.stderr, e + except Exception as e: + print(e, file=sys.stderr) raise # Validate minimum size for I/O

1 0

commit ca-certificates for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package ca-certificates for openSUSE:Factory checked in at 2017-11-30 12:41:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ca-certificates (Old) and /work/SRC/openSUSE:Factory/.ca-certificates.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ca-certificates" Thu Nov 30 12:41:22 2017 rev:39 rq:545252 version:2+git20170807.10b2785 Changes: -------- --- /work/SRC/openSUSE:Factory/ca-certificates/ca-certificates.changes 2017-08-12 20:01:24.132922080 +0200 +++ /work/SRC/openSUSE:Factory/.ca-certificates.new/ca-certificates.changes 2017-11-30 12:41:25.238580384 +0100 @@ -1,0 +2,8 @@ +Thu Nov 23 16:03:55 CET 2017 - kukuk(a)suse.de + +- Don't require systemd, since we could be used in environments + like container images, where we don't have systemd. If systemd + is installed the systemd units will be used, else they are not + needed. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ca-certificates.spec ++++++ --- /var/tmp/diff_new_pack.ZlvEpi/_old 2017-11-30 12:41:26.462535883 +0100 +++ /var/tmp/diff_new_pack.ZlvEpi/_new 2017-11-30 12:41:26.470535592 +0100 @@ -53,7 +53,6 @@ Obsoletes: java-ca-certificates = 1 Provides: java-ca-certificates = %version-%release BuildArch: noarch -%{?systemd_requires} %description Update-ca-certificates is intended to keep the certificate stores of

1 0

commit irqbalance for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package irqbalance for openSUSE:Factory checked in at 2017-11-30 12:41:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/irqbalance (Old) and /work/SRC/openSUSE:Factory/.irqbalance.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "irqbalance" Thu Nov 30 12:41:17 2017 rev:49 rq:545240 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/irqbalance/irqbalance.changes 2017-03-10 21:44:55.334222811 +0100 +++ /work/SRC/openSUSE:Factory/.irqbalance.new/irqbalance.changes 2017-11-30 12:41:18.802814379 +0100 @@ -1,0 +2,6 @@ +Thu Nov 23 13:40:17 UTC 2017 - rbrown(a)suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ irqbalance.spec ++++++ --- /var/tmp/diff_new_pack.fPbB05/_old 2017-11-30 12:41:19.562786747 +0100 +++ /var/tmp/diff_new_pack.fPbB05/_new 2017-11-30 12:41:19.566786601 +0100 @@ -1,7 +1,7 @@ # # spec file for package irqbalance # -# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + Name: irqbalance Version: 1.2.0 Release: 0 @@ -60,8 +65,8 @@ %install %make_install -mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates/ -install -m 0644 sysconfig.irqbalance %{buildroot}%{_localstatedir}/adm/fillup-templates/ +mkdir -p %{buildroot}%{_fillupdir}/ +install -m 0644 sysconfig.irqbalance %{buildroot}%{_fillupdir}/ sed -ie "s|EnvironmentFile=.*|EnvironmentFile=%{_sysconfdir}/sysconfig/irqbalance|g" misc/irqbalance.service # Remove syslog.target in systemd service file; not provided by systemd anymore sed -ie "s|After=syslog.target||g" misc/irqbalance.service @@ -88,6 +93,6 @@ %{_sbindir}/rcirqbalance %{_unitdir}/irqbalance.service %{_mandir}/man1/irqbalance.1.gz -%{_localstatedir}/adm/fillup-templates/sysconfig.irqbalance +%{_fillupdir}/sysconfig.irqbalance %changelog

1 0

commit ntp for openSUSE:Factory
by root＠hilbert.suse.de 30 Nov '17

30 Nov '17

Hello community, here is the log from the commit of package ntp for openSUSE:Factory checked in at 2017-11-30 12:41:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ntp (Old) and /work/SRC/openSUSE:Factory/.ntp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ntp" Thu Nov 30 12:41:12 2017 rev:111 rq:545184 version:4.2.8p10 Changes: -------- --- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2017-04-11 12:40:09.964958070 +0200 +++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2017-11-30 12:41:14.370975513 +0100 @@ -1,0 +2,6 @@ +Thu Nov 23 13:47:08 UTC 2017 - rbrown(a)suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntp.spec ++++++ --- /var/tmp/diff_new_pack.LmPJsU/_old 2017-11-30 12:41:15.798923595 +0100 +++ /var/tmp/diff_new_pack.LmPJsU/_new 2017-11-30 12:41:15.802923450 +0100 @@ -16,6 +16,11 @@ # +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + %define ntpfaqversion 3.4 Name: ntp Version: 4.2.8p10 @@ -212,8 +217,8 @@ # # fillup sysconfig.ntp # -install -m 644 -D %{SOURCE4} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.ntp -install -m 644 -D %{SOURCE5} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.syslog-ntp +install -m 644 -D %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.ntp +install -m 644 -D %{SOURCE5} %{buildroot}%{_fillupdir}/sysconfig.syslog-ntp # # install SLP reg file # @@ -353,7 +358,7 @@ %{_mandir}/man1/* %{_mandir}/man5/* %{_mandir}/man8/* -%{_localstatedir}/adm/fillup-templates/* +%{_fillupdir}/* %attr(0755,ntp,root) %{_localstatedir}/lib/ntp%{_localstatedir}/run/ntp %ghost %config(noreplace) %{_localstatedir}/log/ntp %{_datadir}/omc/svcinfo.d/ntp.xml

1 0