Hello community, here is the log from the commit of package xen for openSUSE:Factory checked in at 2019-02-06 15:45:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xen (Old) and /work/SRC/openSUSE:Factory/.xen.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xen" Wed Feb 6 15:45:56 2019 rev:261 rq:671220 version:4.12.0_02 Changes: -------- --- /work/SRC/openSUSE:Factory/xen/xen.changes 2019-01-15 13:16:29.504352260 +0100 +++ /work/SRC/openSUSE:Factory/.xen.new.28833/xen.changes 2019-02-06 15:46:04.299308182 +0100 @@ -1,0 +2,55 @@ +Mon Feb 4 12:34:57 MST 2019 - carn...@suse.com + +- Update to Xen 4.12.0 RC2 release (fate#325107, fate#323901) + xen-4.12.0-testing-src.tar.bz2 + +------------------------------------------------------------------- +Fri Jan 25 12:53:37 MST 2019 - carn...@suse.com + +- bsc#1121391 - GCC 9: xen build fails + gcc9-ignore-warnings.patch + +------------------------------------------------------------------- +Thu Jan 24 09:39:18 MST 2019 - carn...@suse.com + +- bsc#1122563 - Virtualization/xen: Bug no Xen on boot, missing + /proc/xen, after 4.11 -> 4.12 upgrade on X86_64/efi. + Keep xen.efi in /usr/lib64/efi for booting older distros. + xen.spec + +------------------------------------------------------------------- +Fri Jan 18 10:51:12 MST 2019 - carn...@suse.com + +- fate#326960: Package grub2 as noarch. + As part of the effort to have a unified bootloader across + architectures, modify the xen.spec file to move the Xen efi files + to /usr/share/efi/$(uname -m) from /usr/lib64/efi. + +------------------------------------------------------------------- +Wed Jan 16 11:24:49 MST 2019 - carn...@suse.com + +- Update to Xen 4.12.0 RC1 release (fate#325107, fate#323901) + xen-4.12.0-testing-src.tar.bz2 +- Drop + 5b505d59-tools-xentop-replace-use-of-deprecated-vwprintw.patch + 5b76ec82-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch + 5b8fae26-tools-libxl-correct-vcpu-affinity-output-with-sparse-physical-cpu-map.patch + 5b8fae26-xen-fill-topology-info-for-all-present-cpus.patch + 5b8fb5af-tools-xl-refuse-to-set-number-of-vcpus-to-0-via-xl-vcpu-set.patch + 5b9784ad-x86-HVM-drop-hvm_fetch_from_guest_linear.patch + 5b9784d2-x86-HVM-add-known_gla-helper.patch + 5b9784f2-x86-HVM-split-page-straddling-accesses.patch + 5bdc31d5-VMX-fix-vmx_handle_eoi.patch + gcc8-fix-array-warning-on-i586.patch + gcc8-fix-format-warning-on-i586.patch + gcc8-inlining-failed.patch + xen.bug1079730.patch + +------------------------------------------------------------------- +Tue Jan 15 13:38:13 MST 2019 - carn...@suse.com + +- bsc#1121960 - xen: sync with Factory + xen.spec + xen.changes + +------------------------------------------------------------------- @@ -120,2 +175,3 @@ -- bsc#1115040 - VUL-0: xen: insufficient TLB flushing / improper - large page mappings with AMD IOMMUs (XSA-275) +- bsc#1115040 - VUL-0: CVE-2018-19961 CVE-2018-19962: xen: + insufficient TLB flushing / improper large page mappings with AMD + IOMMUs (XSA-275) @@ -124,2 +180,2 @@ -- bsc#1115043 - VUL-0: xen: resource accounting issues in x86 IOREQ - server handling (XSA-276) +- bsc#1115043 - VUL-0: CVE-2018-19963: xen: resource accounting + issues in x86 IOREQ server handling (XSA-276) @@ -128,2 +184,2 @@ -- bsc#1115044 - VUL-0: xen: x86: incorrect error handling for guest - p2m page removals (XSA-277) +- bsc#1115044 - VUL-0: CVE-2018-19964: xen: x86: incorrect error + handling for guest p2m page removals (XSA-277) @@ -134,2 +190,2 @@ -- bsc#1115045 - VUL-0: xen: x86: DoS from attempting to use INVPCID - with a non-canonical addresses (XSA-279) +- bsc#1115045 - VUL-0: xen: CVE-2018-19965: x86: DoS from attempting + to use INVPCID with a non-canonical addresses (XSA-279) @@ -137,2 +193,2 @@ -- bsc#1115047 - VUL-0: xen: Fix for XSA-240 conflicts with shadow - paging (XSA-280) +- bsc#1115047 - VUL-0: CVE-2018-19966: xen: Fix for XSA-240 + conflicts with shadow paging (XSA-280) @@ -141,2 +197,2 @@ -- bsc#1114988 - VUL-0: xen: guest use of HLE constructs may lock up - host (XSA-282) +- bsc#1114988 - VUL-0: CVE-2018-19967: xen: guest use of HLE + constructs may lock up host (XSA-282) Old: ---- 5b505d59-tools-xentop-replace-use-of-deprecated-vwprintw.patch 5b76ec82-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch 5b8fae26-tools-libxl-correct-vcpu-affinity-output-with-sparse-physical-cpu-map.patch 5b8fae26-xen-fill-topology-info-for-all-present-cpus.patch 5b8fb5af-tools-xl-refuse-to-set-number-of-vcpus-to-0-via-xl-vcpu-set.patch 5b9784ad-x86-HVM-drop-hvm_fetch_from_guest_linear.patch 5b9784d2-x86-HVM-add-known_gla-helper.patch 5b9784f2-x86-HVM-split-page-straddling-accesses.patch 5bdc31d5-VMX-fix-vmx_handle_eoi.patch gcc8-fix-array-warning-on-i586.patch gcc8-fix-format-warning-on-i586.patch gcc8-inlining-failed.patch xen-4.11.1-testing-src.tar.bz2 xen.bug1079730.patch New: ---- gcc9-ignore-warnings.patch xen-4.12.0-testing-src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.UAOhdK/_old 2019-02-06 15:46:06.187307035 +0100 +++ /var/tmp/diff_new_pack.UAOhdK/_new 2019-02-06 15:46:06.191307033 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # needssslcertforbuild @@ -24,8 +24,8 @@ Name: xen ExclusiveArch: %ix86 x86_64 %arm aarch64 -%define changeset 35349 -%define xen_build_dir xen-4.11.1-testing +%define changeset 38667 +%define xen_build_dir xen-4.12.0-testing # %define with_gdbsx 0 %define with_dom0_support 0 @@ -127,12 +127,12 @@ BuildRequires: pesign-obs-integration %endif -Version: 4.11.1_02 +Version: 4.12.0_02 Release: 0 Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel) License: GPL-2.0-only Group: System/Kernel -Source0: xen-4.11.1-testing-src.tar.bz2 +Source0: xen-4.12.0-testing-src.tar.bz2 Source1: stubdom.tar.bz2 Source5: ipxe.tar.bz2 Source6: mini-os.tar.bz2 @@ -162,15 +162,6 @@ # For xen-libs Source99: baselibs.conf # Upstream patches -Patch1: 5b505d59-tools-xentop-replace-use-of-deprecated-vwprintw.patch -Patch2: 5b76ec82-libxl-arm-Fix-build-on-arm64-acpi-w-gcc-8.2.patch -Patch3: 5b8fae26-tools-libxl-correct-vcpu-affinity-output-with-sparse-physical-cpu-map.patch -Patch4: 5b8fae26-xen-fill-topology-info-for-all-present-cpus.patch -Patch5: 5b8fb5af-tools-xl-refuse-to-set-number-of-vcpus-to-0-via-xl-vcpu-set.patch -Patch6: 5b9784ad-x86-HVM-drop-hvm_fetch_from_guest_linear.patch -Patch7: 5b9784d2-x86-HVM-add-known_gla-helper.patch -Patch8: 5b9784f2-x86-HVM-split-page-straddling-accesses.patch -Patch9: 5bdc31d5-VMX-fix-vmx_handle_eoi.patch # Our platform specific patches Patch400: xen-destdir.patch Patch401: vif-bridge-no-iptables.patch @@ -185,9 +176,7 @@ Patch421: xenpaging.doc.patch Patch422: stubdom-have-iovec.patch Patch423: vif-route.patch -Patch424: gcc8-fix-format-warning-on-i586.patch -Patch425: gcc8-fix-array-warning-on-i586.patch -Patch426: gcc8-inlining-failed.patch +Patch424: gcc9-ignore-warnings.patch # Other bug fixes or features Patch451: xenconsole-no-multiple-connections.patch Patch452: hibernate.patch @@ -206,7 +195,6 @@ Patch465: xen.libxl.dmmd.patch Patch466: libxl.set-migration-constraints-from-cmdline.patch Patch467: xenstore-run-in-studomain.patch -Patch468: xen.bug1079730.patch # python3 conversion patches Patch500: build-python3-conversion.patch Patch501: pygrub-python3-conversion.patch @@ -368,15 +356,6 @@ %prep %setup -q -n %xen_build_dir -a 1 -a 5 -a 6 -a 57 # Upstream patches -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 # Our platform specific patches %patch400 -p1 %patch401 -p1 @@ -392,8 +371,6 @@ %patch422 -p1 %patch423 -p1 %patch424 -p1 -%patch425 -p1 -%patch426 -p1 # Other bug fixes or features %patch451 -p1 %patch452 -p1 @@ -412,7 +389,6 @@ %patch465 -p1 %patch466 -p1 %patch467 -p1 -%patch468 -p1 # python3 conversion patches %patch500 -p1 %patch501 -p1 @@ -714,6 +690,7 @@ # EFI %if %{?with_dom0_support}0 +arch=`uname -m` install_xen() { local ext="" @@ -730,6 +707,11 @@ ln -sf xen${ext}-${XEN_FULLVERSION}.efi %{buildroot}/%{_libdir}/efi/xen${ext}-$XEN_VERSION.efi ln -sf xen${ext}-${XEN_FULLVERSION}.efi %{buildroot}/%{_libdir}/efi/xen${ext}.efi fi + elif test -d %{buildroot}/%{_libdir}/efi; then + # Move the efi files to /usr/share/efi/<arch> (fate#326960) + mkdir -p %{buildroot}/%{_datadir}/efi/$arch + mv %{buildroot}/%{_libdir}/efi/xen*.efi %{buildroot}/%{_datadir}/efi/$arch/ + ln -s %{_datadir}/efi/$arch/xen-${XEN_FULLVERSION}.efi %{buildroot}/%{_libdir}/efi/xen.efi fi rm %{buildroot}/boot/xen-$XEN_VERSION.$XEN_SUBVERSION%{xen_install_suffix} rm %{buildroot}/boot/xen-$XEN_VERSION%{xen_install_suffix} @@ -765,10 +747,10 @@ install_xen make -C xen clean echo > xen.files.txt -# EFI depends on gcc47 -if test -d %{buildroot}/%{_libdir}/efi +# EFI depends on gcc47 or newer +if test -d %{buildroot}/%{_datadir}/efi/$arch then - echo %{_libdir}/efi >> xen.files.txt + echo %{_datadir}/efi/$arch >> xen.files.txt fi %endif @@ -795,7 +777,7 @@ install -m 644 $name %{buildroot}/%{_defaultdocdir}/xen/ done for name in vtpm-platforms.txt crashdb.txt xenpaging.txt \ - xen-command-line.markdown xenstore-paths.markdown; do + xen-command-line.pandoc xenstore-paths.pandoc; do install -m 644 docs/misc/$name %{buildroot}/%{_defaultdocdir}/xen/misc/ done @@ -835,7 +817,6 @@ mkdir -p %{buildroot}/var/lib/xen/dump mkdir -p %{buildroot}/var/log/xen mkdir -p %{buildroot}/var/log/xen/console -ln -s /var/lib/xen/images %{buildroot}/etc/xen/images # Bootloader install -m644 %SOURCE36 %{buildroot}/%{_libdir}/python%{pyver}/site-packages @@ -893,7 +874,7 @@ # Create hardlinks for 3 .txt files and 1 .py %fdupes %{buildroot}/%{_prefix} -find %{buildroot} -size 0 -delete +find %{buildroot} -type f -size 0 -delete -print %else # !with_dom0_support @@ -928,21 +909,21 @@ %files -f xen.files.txt %defattr(-,root,root) /boot/* +%{_libdir}/efi +%{_datadir}/efi %endif %files libs %defattr(-,root,root) -%{_libdir}/fs/ +%{_libdir}/xenfsimage/ %{_libdir}/*.so.* %if %{?with_dom0_support}0 %files tools %defattr(-,root,root) -%ifarch %ix86 x86_64 /usr/bin/xenalyze -%endif /usr/bin/xencons /usr/bin/xenstore* /usr/bin/pygrub @@ -951,12 +932,11 @@ %ifarch x86_64 /usr/bin/xen-cpuid %endif -#/usr/sbin/tap* /usr/sbin/xenbaked /usr/sbin/xenconsoled /usr/sbin/xencov /usr/sbin/xenlockprof -/usr/sbin/xenmon.py +/usr/sbin/xenmon /usr/sbin/xenperf /usr/sbin/xenpm /usr/sbin/xenpmd @@ -968,10 +948,6 @@ /usr/sbin/xentrace_setsize /usr/sbin/xentrace_setmask /usr/sbin/xenwatchdogd -#/usr/sbin/lock-util -#/usr/sbin/td-util -#/usr/sbin/vhd-update -#/usr/sbin/vhd-util /usr/sbin/flask-get-bool /usr/sbin/flask-getenforce /usr/sbin/flask-label-pci @@ -988,7 +964,7 @@ /usr/sbin/xen-hvmcrash /usr/sbin/xen-hvmctx /usr/sbin/xen-lowmemd -/usr/sbin/kdd +/usr/sbin/xen-kdd %endif /usr/sbin/xen-list /usr/sbin/xen-destroy @@ -1032,7 +1008,6 @@ %config /etc/logrotate.d/xen /etc/xen/auto %config /etc/xen/examples -/etc/xen/images %config /etc/xen/cpupool %config /etc/xen/vm %config(noreplace) /etc/xen/xenapiusers ++++++ aarch64-maybe-uninitialized.patch ++++++ --- /var/tmp/diff_new_pack.UAOhdK/_old 2019-02-06 15:46:06.243307001 +0100 +++ /var/tmp/diff_new_pack.UAOhdK/_new 2019-02-06 15:46:06.243307001 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.9.0-testing/tools/libxl/libxl_arm_acpi.c +Index: xen-4.12.0-testing/tools/libxl/libxl_arm_acpi.c =================================================================== ---- xen-4.9.0-testing.orig/tools/libxl/libxl_arm_acpi.c -+++ xen-4.9.0-testing/tools/libxl/libxl_arm_acpi.c +--- xen-4.12.0-testing.orig/tools/libxl/libxl_arm_acpi.c ++++ xen-4.12.0-testing/tools/libxl/libxl_arm_acpi.c @@ -99,7 +99,7 @@ int libxl__get_acpi_size(libxl__gc *gc, const libxl_domain_build_info *info, uint64_t *out) ++++++ build-python3-conversion.patch ++++++ --- /var/tmp/diff_new_pack.UAOhdK/_old 2019-02-06 15:46:06.315306957 +0100 +++ /var/tmp/diff_new_pack.UAOhdK/_new 2019-02-06 15:46:06.319306955 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.11.0-testing/Config.mk +Index: xen-4.12.0-testing/Config.mk =================================================================== ---- xen-4.11.0-testing.orig/Config.mk -+++ xen-4.11.0-testing/Config.mk +--- xen-4.12.0-testing.orig/Config.mk ++++ xen-4.12.0-testing/Config.mk @@ -82,7 +82,7 @@ EXTRA_INCLUDES += $(EXTRA_PREFIX)/includ EXTRA_LIB += $(EXTRA_PREFIX)/lib endif @@ -11,11 +11,11 @@ PYTHON_PREFIX_ARG ?= --prefix="$(prefix)" # The above requires that prefix contains *no spaces*. This variable is here # to permit the user to set PYTHON_PREFIX_ARG to '' to workaround this bug: -Index: xen-4.11.0-testing/tools/configure +Index: xen-4.12.0-testing/tools/configure =================================================================== ---- xen-4.11.0-testing.orig/tools/configure -+++ xen-4.11.0-testing/tools/configure -@@ -6888,7 +6888,7 @@ if echo "$PYTHON" | grep -q "^/"; then : +--- xen-4.12.0-testing.orig/tools/configure ++++ xen-4.12.0-testing/tools/configure +@@ -6953,7 +6953,7 @@ if echo "$PYTHON" | grep -q "^/"; then : PYTHON=`basename $PYTHONPATH` elif test -z "$PYTHON"; then : @@ -24,7 +24,7 @@ else as_fn_error $? "PYTHON specified, but is not an absolute path" "$LINENO" 5 fi -@@ -6937,15 +6937,15 @@ if test x"${PYTHONPATH}" = x"no" +@@ -7002,15 +7002,15 @@ if test x"${PYTHONPATH}" = x"no" then as_fn_error $? "Unable to find $PYTHON, please install $PYTHON" "$LINENO" 5 fi @@ -43,7 +43,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } -@@ -7354,7 +7354,7 @@ if test "$cross_compiling" != yes; then +@@ -7419,7 +7419,7 @@ if test "$cross_compiling" != yes; then ac_previous_cppflags=$CPPFLAGS ac_previous_ldflags=$LDFLAGS ac_python_version=`$PYTHON -c 'import distutils.sysconfig; \ @@ -52,7 +52,7 @@ # Extract the first word of "$PYTHON-config", so it can be a program name with args. set dummy $PYTHON-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -@@ -7399,20 +7399,20 @@ fi +@@ -7464,20 +7464,20 @@ fi if test x"$pyconfig" = x"no"; then : CPPFLAGS="$CFLAGS `$PYTHON -c 'import distutils.sysconfig; \ @@ -81,7 +81,7 @@ else -@@ -7429,7 +7429,6 @@ else +@@ -7494,7 +7494,6 @@ else as_fn_error $? "Unable to find Python development headers" "$LINENO" 5 fi @@ -89,10 +89,10 @@ as_ac_Lib=`$as_echo "ac_cv_lib_python$ac_python_version''_PyArg_ParseTuple" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PyArg_ParseTuple in -lpython$ac_python_version" >&5 $as_echo_n "checking for PyArg_ParseTuple in -lpython$ac_python_version... " >&6; } -Index: xen-4.11.0-testing/tools/python/test.py +Index: xen-4.12.0-testing/tools/python/test.py =================================================================== ---- xen-4.11.0-testing.orig/tools/python/test.py -+++ xen-4.11.0-testing/tools/python/test.py +--- xen-4.12.0-testing.orig/tools/python/test.py ++++ xen-4.12.0-testing/tools/python/test.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python2.3 +#!/usr/bin/python3 @@ -409,11 +409,11 @@ raise -Index: xen-4.11.0-testing/tools/configure.ac +Index: xen-4.12.0-testing/tools/configure.ac =================================================================== ---- xen-4.11.0-testing.orig/tools/configure.ac -+++ xen-4.11.0-testing/tools/configure.ac -@@ -320,10 +320,10 @@ esac +--- xen-4.12.0-testing.orig/tools/configure.ac ++++ xen-4.12.0-testing/tools/configure.ac +@@ -355,10 +355,10 @@ esac AS_IF([echo "$PYTHON" | grep -q "^/"], [ PYTHONPATH=$PYTHON PYTHON=`basename $PYTHONPATH` @@ -426,10 +426,10 @@ AS_IF([test "$cross_compiling" != yes], [ AX_CHECK_PYTHON_DEVEL() -Index: xen-4.11.0-testing/m4/python_devel.m4 +Index: xen-4.12.0-testing/m4/python_devel.m4 =================================================================== ---- xen-4.11.0-testing.orig/m4/python_devel.m4 -+++ xen-4.11.0-testing/m4/python_devel.m4 +--- xen-4.12.0-testing.orig/m4/python_devel.m4 ++++ xen-4.12.0-testing/m4/python_devel.m4 @@ -2,25 +2,25 @@ AC_DEFUN([AX_CHECK_PYTHON_DEVEL], [ ac_previous_cppflags=$CPPFLAGS ac_previous_ldflags=$LDFLAGS @@ -475,10 +475,10 @@ CPPFLAGS=$ac_previous_cppflags LDFLAGS=$ac_previous_ldflags ]) -Index: xen-4.11.0-testing/tools/libxl/idl.py +Index: xen-4.12.0-testing/tools/libxl/idl.py =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/idl.py -+++ xen-4.11.0-testing/tools/libxl/idl.py +--- xen-4.12.0-testing.orig/tools/libxl/idl.py ++++ xen-4.12.0-testing/tools/libxl/idl.py @@ -11,7 +11,7 @@ DIR_BOTH = 3 _default_namespace = "" def namespace(s): @@ -537,10 +537,10 @@ types = [t for t in locs.ordered_values() if isinstance(t,Type)] -Index: xen-4.11.0-testing/tools/libxl/gentest.py +Index: xen-4.12.0-testing/tools/libxl/gentest.py =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/gentest.py -+++ xen-4.11.0-testing/tools/libxl/gentest.py +--- xen-4.12.0-testing.orig/tools/libxl/gentest.py ++++ xen-4.12.0-testing/tools/libxl/gentest.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 @@ -556,10 +556,10 @@ sys.exit(1) random.seed(os.getenv('LIBXL_TESTIDL_SEED')) -Index: xen-4.11.0-testing/tools/libxl/gentypes.py +Index: xen-4.12.0-testing/tools/libxl/gentypes.py =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/gentypes.py -+++ xen-4.11.0-testing/tools/libxl/gentypes.py +--- xen-4.12.0-testing.orig/tools/libxl/gentypes.py ++++ xen-4.12.0-testing/tools/libxl/gentypes.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 @@ -610,10 +610,10 @@ f = open(impl, "w") f.write(""" -Index: xen-4.11.0-testing/tools/ocaml/libs/xl/genwrap.py +Index: xen-4.12.0-testing/tools/ocaml/libs/xl/genwrap.py =================================================================== ---- xen-4.11.0-testing.orig/tools/ocaml/libs/xl/genwrap.py -+++ xen-4.11.0-testing/tools/ocaml/libs/xl/genwrap.py +--- xen-4.12.0-testing.orig/tools/ocaml/libs/xl/genwrap.py ++++ xen-4.12.0-testing/tools/ocaml/libs/xl/genwrap.py @@ -1,8 +1,9 @@ -#!/usr/bin/python +#!/usr/bin/python3 @@ -686,7 +686,7 @@ + print("unknown type %s in blacklist" % t) types = [ty for ty in types if not ty.rawname in blacklist] - + @@ -564,7 +565,7 @@ if __name__ == '__main__': cinc.write("\n") cinc.write(gen_Val_ocaml(ty)) @@ -696,10 +696,10 @@ cinc.write(gen_c_stub_prototype(ty, functions[ty.rawname])) cinc.write("\n") if ty.init_fn is not None: -Index: xen-4.11.0-testing/tools/ocaml/libs/xentoollog/genlevels.py +Index: xen-4.12.0-testing/tools/ocaml/libs/xentoollog/genlevels.py =================================================================== ---- xen-4.11.0-testing.orig/tools/ocaml/libs/xentoollog/genlevels.py -+++ xen-4.11.0-testing/tools/ocaml/libs/xentoollog/genlevels.py +--- xen-4.12.0-testing.orig/tools/ocaml/libs/xentoollog/genlevels.py ++++ xen-4.12.0-testing/tools/ocaml/libs/xentoollog/genlevels.py @@ -1,6 +1,7 @@ -#!/usr/bin/python +#!/usr/bin/python3 @@ -726,10 +726,10 @@ sys.exit(1) levels, olevels = read_levels() -Index: xen-4.11.0-testing/tools/include/xen-foreign/mkheader.py +Index: xen-4.12.0-testing/tools/include/xen-foreign/mkheader.py =================================================================== ---- xen-4.11.0-testing.orig/tools/include/xen-foreign/mkheader.py -+++ xen-4.11.0-testing/tools/include/xen-foreign/mkheader.py +--- xen-4.12.0-testing.orig/tools/include/xen-foreign/mkheader.py ++++ xen-4.12.0-testing/tools/include/xen-foreign/mkheader.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 @@ -747,10 +747,10 @@ for type in integers: output = re.sub("\\b%s\\b" % type, inttypes[arch][type], output); -Index: xen-4.11.0-testing/tools/include/xen-foreign/mkchecker.py +Index: xen-4.12.0-testing/tools/include/xen-foreign/mkchecker.py =================================================================== ---- xen-4.11.0-testing.orig/tools/include/xen-foreign/mkchecker.py -+++ xen-4.11.0-testing/tools/include/xen-foreign/mkchecker.py +--- xen-4.12.0-testing.orig/tools/include/xen-foreign/mkchecker.py ++++ xen-4.12.0-testing/tools/include/xen-foreign/mkchecker.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 @@ -766,10 +766,10 @@ compat = compat_arches[a] c = struct + "_" + compat; else: -Index: xen-4.11.0-testing/xen/tools/gen-cpuid.py +Index: xen-4.12.0-testing/xen/tools/gen-cpuid.py =================================================================== ---- xen-4.11.0-testing.orig/xen/tools/gen-cpuid.py -+++ xen-4.11.0-testing/xen/tools/gen-cpuid.py +--- xen-4.12.0-testing.orig/xen/tools/gen-cpuid.py ++++ xen-4.12.0-testing/xen/tools/gen-cpuid.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 @@ -785,7 +785,7 @@ state.common_1d = featureset_to_uint32s(common_1d, 1)[0] state.special = featureset_to_uint32s(state.raw_special, nr_entries) state.pv = featureset_to_uint32s(state.raw_pv, nr_entries) -@@ -303,11 +303,11 @@ def crunch_numbers(state): +@@ -308,11 +308,11 @@ def crunch_numbers(state): state.deep_deps[feat] = seen[1:] @@ -800,7 +800,7 @@ except AttributeError: _tmp = state.deep_deps.items() -@@ -315,10 +315,10 @@ def crunch_numbers(state): +@@ -320,10 +320,10 @@ def crunch_numbers(state): state.deep_deps[k] = featureset_to_uint32s(v, nr_entries) # Calculate the bitfield name declarations @@ -813,50 +813,50 @@ name = state.names.get(word * 32 + bit, "") -Index: xen-4.11.0-testing/xen/tools/compat-build-source.py +Index: xen-4.12.0-testing/xen/tools/compat-build-source.py =================================================================== ---- xen-4.11.0-testing.orig/xen/tools/compat-build-source.py -+++ xen-4.11.0-testing/xen/tools/compat-build-source.py +--- xen-4.12.0-testing.orig/xen/tools/compat-build-source.py ++++ xen-4.12.0-testing/xen/tools/compat-build-source.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 import re,sys -Index: xen-4.11.0-testing/xen/tools/compat-build-header.py +Index: xen-4.12.0-testing/xen/tools/compat-build-header.py =================================================================== ---- xen-4.11.0-testing.orig/xen/tools/compat-build-header.py -+++ xen-4.11.0-testing/xen/tools/compat-build-header.py +--- xen-4.12.0-testing.orig/xen/tools/compat-build-header.py ++++ xen-4.12.0-testing/xen/tools/compat-build-header.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 import re,sys -Index: xen-4.11.0-testing/xen/xsm/flask/gen-policy.py +Index: xen-4.12.0-testing/xen/xsm/flask/gen-policy.py =================================================================== ---- xen-4.11.0-testing.orig/xen/xsm/flask/gen-policy.py -+++ xen-4.11.0-testing/xen/xsm/flask/gen-policy.py +--- xen-4.12.0-testing.orig/xen/xsm/flask/gen-policy.py ++++ xen-4.12.0-testing/xen/xsm/flask/gen-policy.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 import sys policy_size = 0 -Index: xen-4.11.0-testing/xen/tools/fig-to-oct.py +Index: xen-4.12.0-testing/xen/tools/fig-to-oct.py =================================================================== ---- xen-4.11.0-testing.orig/xen/tools/fig-to-oct.py -+++ xen-4.11.0-testing/xen/tools/fig-to-oct.py +--- xen-4.12.0-testing.orig/xen/tools/fig-to-oct.py ++++ xen-4.12.0-testing/xen/tools/fig-to-oct.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 import sys chars_per_line = 18 -Index: xen-4.11.0-testing/tools/misc/xensymoops +Index: xen-4.12.0-testing/tools/misc/xensymoops =================================================================== ---- xen-4.11.0-testing.orig/tools/misc/xensymoops -+++ xen-4.11.0-testing/tools/misc/xensymoops +--- xen-4.12.0-testing.orig/tools/misc/xensymoops ++++ xen-4.12.0-testing/tools/misc/xensymoops @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 ++++++ gcc9-ignore-warnings.patch ++++++ References: bsc#1121391 Error in trace.c: trace.c: In function '__trace_hypercall': trace.c:826:19: error: taking address of packed member of 'struct <anonymous>' may result in an unaligned pointer value [-Werror=address-of-packed-member] 826 | uint32_t *a = d.args; Error in e820.c: e820.c: In function 'clip_to_limit': /home/abuild/rpmbuild/BUILD/xen-4.11.1-testing/xen/include/asm/string.h:10:26: error: '__builtin_memmove' offset [-16, -36] is out of the bounds [0, 20484] of object 'e820' with type 'struct e820map' [-Werror=array-bounds] 10 | #define memmove(d, s, n) __builtin_memmove(d, s, n) | ^~~~~~~~~~~~~~~~~~~~~~~~~~ e820.c:404:13: note: in expansion of macro 'memmove' 404 | memmove(&e820.map[i], &e820.map[i+1], Error in generic.c: generic.c: In function 'print_mtrr_state': generic.c:177:11: error: '%0*lx' directive output between 1 and 1073741823 bytes may cause result to exceed 'INT_MAX' [-Werror=format-overflow=] 177 | printk("%s %u base %0*"PRIx64"000 mask %0*"PRIx64"000 %s\n", Error in utils.c: utils.c: In function 'vtd_dump_iommu_info': utils.c:286:33: error: converting a packed 'struct IO_APIC_route_entry' pointer (alignment 1) to a 'struct IO_APIC_route_remap_entry' pointer (alignment 8) may result in an unaligned pointer value [-Werror=address-of-packed-member] 286 | remap = (struct IO_APIC_route_remap_entry *) &rte; | ^~~~~~~~~~~~~~~~~~~~~~~~~ Error in intremap.c: intremap.c: In function 'ioapic_rte_to_remap_entry': intremap.c:338:25: error: converting a packed 'struct IO_APIC_route_entry' pointer (alignment 1) to a 'struct IO_APIC_route_remap_entry' pointer (alignment 8) may result in an unaligned pointer value [-Werror=address-of-packed-member] 338 | remap_rte = (struct IO_APIC_route_remap_entry *) old_rte; | ^~~~~~~~~~~~~~~~~~~~~~~~~ Index: xen-4.12.0-testing/xen/common/trace.c =================================================================== --- xen-4.12.0-testing.orig/xen/common/trace.c +++ xen-4.12.0-testing/xen/common/trace.c @@ -816,6 +816,9 @@ unlock: tasklet_schedule(&trace_notify_dom0_tasklet); } +#if __GNUC__ > 8 +#pragma GCC diagnostic ignored "-Waddress-of-packed-member" +#endif void __trace_hypercall(uint32_t event, unsigned long op, const xen_ulong_t *args) { @@ -824,6 +827,7 @@ void __trace_hypercall(uint32_t event, u uint32_t args[6]; } d; uint32_t *a = d.args; + /* __attribute__((aligned(32))) uint32_t *a = d.args; */ #define APPEND_ARG32(i) \ do { \ Index: xen-4.12.0-testing/xen/arch/x86/e820.c =================================================================== --- xen-4.12.0-testing.orig/xen/arch/x86/e820.c +++ xen-4.12.0-testing/xen/arch/x86/e820.c @@ -366,7 +366,7 @@ static unsigned long __init find_max_pfn static void __init clip_to_limit(uint64_t limit, char *warnmsg) { - int i; + unsigned int i; char _warnmsg[160]; uint64_t old_limit = 0; Index: xen-4.12.0-testing/xen/arch/x86/cpu/mtrr/generic.c =================================================================== --- xen-4.12.0-testing.orig/xen/arch/x86/cpu/mtrr/generic.c +++ xen-4.12.0-testing/xen/arch/x86/cpu/mtrr/generic.c @@ -179,6 +179,7 @@ static void __init print_fixed(unsigned } } +#pragma GCC diagnostic ignored "-Wformat-overflow" static void __init print_mtrr_state(const char *level) { unsigned int i; Index: xen-4.12.0-testing/xen/drivers/passthrough/vtd/utils.c =================================================================== --- xen-4.12.0-testing.orig/xen/drivers/passthrough/vtd/utils.c +++ xen-4.12.0-testing/xen/drivers/passthrough/vtd/utils.c @@ -172,6 +172,9 @@ void print_vtd_entries(struct iommu *iom } while ( --level ); } +#if __GNUC__ > 8 +#pragma GCC diagnostic ignored "-Waddress-of-packed-member" +#endif void vtd_dump_iommu_info(unsigned char key) { struct acpi_drhd_unit *drhd; Index: xen-4.12.0-testing/xen/drivers/passthrough/vtd/intremap.c =================================================================== --- xen-4.12.0-testing.orig/xen/drivers/passthrough/vtd/intremap.c +++ xen-4.12.0-testing/xen/drivers/passthrough/vtd/intremap.c @@ -322,6 +322,9 @@ static int remap_entry_to_ioapic_rte( return 0; } +#if __GNUC__ > 8 +#pragma GCC diagnostic ignored "-Waddress-of-packed-member" +#endif static int ioapic_rte_to_remap_entry(struct iommu *iommu, int apic, unsigned int ioapic_pin, struct IO_xAPIC_route_entry *old_rte, unsigned int rte_upper, unsigned int value) ++++++ ipxe.tar.bz2 ++++++ Binary files old/tools/firmware/etherboot/ipxe.tar.gz and new/tools/firmware/etherboot/ipxe.tar.gz differ ++++++ libxc.sr.superpage.patch ++++++ --- /var/tmp/diff_new_pack.UAOhdK/_old 2019-02-06 15:46:07.263306381 +0100 +++ /var/tmp/diff_new_pack.UAOhdK/_new 2019-02-06 15:46:07.263306381 +0100 @@ -12,10 +12,10 @@ must be freed on the receiving side to avoid over-allocation. The existing code for x86_pv is moved unmodified into its own file. -Index: xen-4.11.0-testing/tools/libxc/xc_dom_x86.c +Index: xen-4.12.0-testing/tools/libxc/xc_dom_x86.c =================================================================== ---- xen-4.11.0-testing.orig/tools/libxc/xc_dom_x86.c -+++ xen-4.11.0-testing/tools/libxc/xc_dom_x86.c +--- xen-4.12.0-testing.orig/tools/libxc/xc_dom_x86.c ++++ xen-4.12.0-testing/tools/libxc/xc_dom_x86.c @@ -45,11 +45,6 @@ #define SUPERPAGE_BATCH_SIZE 512 @@ -28,11 +28,11 @@ #define X86_CR0_PE 0x01 #define X86_CR0_ET 0x10 -Index: xen-4.11.0-testing/tools/libxc/xc_private.h +Index: xen-4.12.0-testing/tools/libxc/xc_private.h =================================================================== ---- xen-4.11.0-testing.orig/tools/libxc/xc_private.h -+++ xen-4.11.0-testing/tools/libxc/xc_private.h -@@ -69,6 +69,11 @@ struct iovec { +--- xen-4.12.0-testing.orig/tools/libxc/xc_private.h ++++ xen-4.12.0-testing/tools/libxc/xc_private.h +@@ -71,6 +71,11 @@ struct iovec { #define DECLARE_FLASK_OP struct xen_flask_op op #define DECLARE_PLATFORM_OP struct xen_platform_op platform_op @@ -44,10 +44,10 @@ #undef PAGE_SHIFT #undef PAGE_SIZE #undef PAGE_MASK -Index: xen-4.11.0-testing/tools/libxc/xc_sr_common.c +Index: xen-4.12.0-testing/tools/libxc/xc_sr_common.c =================================================================== ---- xen-4.11.0-testing.orig/tools/libxc/xc_sr_common.c -+++ xen-4.11.0-testing/tools/libxc/xc_sr_common.c +--- xen-4.12.0-testing.orig/tools/libxc/xc_sr_common.c ++++ xen-4.12.0-testing/tools/libxc/xc_sr_common.c @@ -156,6 +156,47 @@ static void __attribute__((unused)) buil } @@ -96,10 +96,10 @@ * Local variables: * mode: C * c-file-style: "BSD" -Index: xen-4.11.0-testing/tools/libxc/xc_sr_common.h +Index: xen-4.12.0-testing/tools/libxc/xc_sr_common.h =================================================================== ---- xen-4.11.0-testing.orig/tools/libxc/xc_sr_common.h -+++ xen-4.11.0-testing/tools/libxc/xc_sr_common.h +--- xen-4.12.0-testing.orig/tools/libxc/xc_sr_common.h ++++ xen-4.12.0-testing/tools/libxc/xc_sr_common.h @@ -140,6 +140,16 @@ struct xc_sr_restore_ops int (*setup)(struct xc_sr_context *ctx); @@ -247,10 +247,10 @@ #endif /* * Local variables: -Index: xen-4.11.0-testing/tools/libxc/xc_sr_restore.c +Index: xen-4.12.0-testing/tools/libxc/xc_sr_restore.c =================================================================== ---- xen-4.11.0-testing.orig/tools/libxc/xc_sr_restore.c -+++ xen-4.11.0-testing/tools/libxc/xc_sr_restore.c +--- xen-4.12.0-testing.orig/tools/libxc/xc_sr_restore.c ++++ xen-4.12.0-testing/tools/libxc/xc_sr_restore.c @@ -69,132 +69,6 @@ static int read_headers(struct xc_sr_con } @@ -428,10 +428,10 @@ if ( ctx.dominfo.hvm ) { -Index: xen-4.11.0-testing/tools/libxc/xc_sr_restore_x86_hvm.c +Index: xen-4.12.0-testing/tools/libxc/xc_sr_restore_x86_hvm.c =================================================================== ---- xen-4.11.0-testing.orig/tools/libxc/xc_sr_restore_x86_hvm.c -+++ xen-4.11.0-testing/tools/libxc/xc_sr_restore_x86_hvm.c +--- xen-4.12.0-testing.orig/tools/libxc/xc_sr_restore_x86_hvm.c ++++ xen-4.12.0-testing/tools/libxc/xc_sr_restore_x86_hvm.c @@ -135,6 +135,8 @@ static int x86_hvm_localise_page(struct static int x86_hvm_setup(struct xc_sr_context *ctx) { @@ -806,10 +806,10 @@ .process_record = x86_hvm_process_record, .stream_complete = x86_hvm_stream_complete, .cleanup = x86_hvm_cleanup, -Index: xen-4.11.0-testing/tools/libxc/xc_sr_restore_x86_pv.c +Index: xen-4.12.0-testing/tools/libxc/xc_sr_restore_x86_pv.c =================================================================== ---- xen-4.11.0-testing.orig/tools/libxc/xc_sr_restore_x86_pv.c -+++ xen-4.11.0-testing/tools/libxc/xc_sr_restore_x86_pv.c +--- xen-4.12.0-testing.orig/tools/libxc/xc_sr_restore_x86_pv.c ++++ xen-4.12.0-testing/tools/libxc/xc_sr_restore_x86_pv.c @@ -938,6 +938,75 @@ static void x86_pv_set_gfn(struct xc_sr_ } ++++++ libxl.add-option-to-disable-disk-cache-flushes-in-qdisk.patch ++++++ --- /var/tmp/diff_new_pack.UAOhdK/_old 2019-02-06 15:46:07.275306374 +0100 +++ /var/tmp/diff_new_pack.UAOhdK/_new 2019-02-06 15:46:07.275306374 +0100 @@ -7,10 +7,10 @@ tools/libxl/libxlu_disk_l.l | 1 + 5 files changed, 18 insertions(+), 1 deletion(-) -Index: xen-4.11.0-testing/docs/man/xl-disk-configuration.pod.5 +Index: xen-4.12.0-testing/docs/man/xl-disk-configuration.5.pod =================================================================== ---- xen-4.11.0-testing.orig/docs/man/xl-disk-configuration.pod.5 -+++ xen-4.11.0-testing/docs/man/xl-disk-configuration.pod.5 +--- xen-4.12.0-testing.orig/docs/man/xl-disk-configuration.5.pod ++++ xen-4.12.0-testing/docs/man/xl-disk-configuration.5.pod @@ -344,6 +344,32 @@ can be used to disable "hole punching" f were intentionally created non-sparse to avoid fragmentation of the file. @@ -44,12 +44,12 @@ =back -Index: xen-4.11.0-testing/tools/libxl/libxl.h +Index: xen-4.12.0-testing/tools/libxl/libxl.h =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxl.h -+++ xen-4.11.0-testing/tools/libxl/libxl.h -@@ -355,6 +355,21 @@ - #define LIBXL_HAVE_BUILDINFO_BOOTLOADER_ARGS 1 +--- xen-4.12.0-testing.orig/tools/libxl/libxl.h ++++ xen-4.12.0-testing/tools/libxl/libxl.h +@@ -377,6 +377,21 @@ + #define LIBXL_HAVE_EXTENDED_VKB 1 /* + * The libxl_device_disk has no way to indicate that cache=unsafe is @@ -70,10 +70,10 @@ * libxl ABI compatibility * * The only guarantee which libxl makes regarding ABI compatibility -Index: xen-4.11.0-testing/tools/libxl/libxl_disk.c +Index: xen-4.12.0-testing/tools/libxl/libxl_disk.c =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxl_disk.c -+++ xen-4.11.0-testing/tools/libxl/libxl_disk.c +--- xen-4.12.0-testing.orig/tools/libxl/libxl_disk.c ++++ xen-4.12.0-testing/tools/libxl/libxl_disk.c @@ -405,6 +405,8 @@ static void device_disk_add(libxl__egc * flexarray_append_pair(back, "discard-enable", libxl_defbool_val(disk->discard_enable) ? @@ -83,11 +83,11 @@ flexarray_append(front, "backend-id"); flexarray_append(front, GCSPRINTF("%d", disk->backend_domid)); -Index: xen-4.11.0-testing/tools/libxl/libxl_dm.c +Index: xen-4.12.0-testing/tools/libxl/libxl_dm.c =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxl_dm.c -+++ xen-4.11.0-testing/tools/libxl/libxl_dm.c -@@ -792,14 +792,27 @@ enum { +--- xen-4.12.0-testing.orig/tools/libxl/libxl_dm.c ++++ xen-4.12.0-testing/tools/libxl/libxl_dm.c +@@ -984,14 +984,27 @@ enum { LIBXL__COLO_SECONDARY, }; @@ -117,7 +117,7 @@ const char *exportname = disk->colo_export; const char *active_disk = disk->active_disk; const char *hidden_disk = disk->hidden_disk; -@@ -858,8 +871,8 @@ static char *qemu_disk_ide_drive_string( +@@ -1050,8 +1063,8 @@ static char *qemu_disk_ide_drive_string( switch (colo_mode) { case LIBXL__COLO_NONE: drive = GCSPRINTF @@ -128,7 +128,7 @@ break; case LIBXL__COLO_PRIMARY: /* -@@ -872,13 +885,14 @@ static char *qemu_disk_ide_drive_string( +@@ -1064,13 +1077,14 @@ static char *qemu_disk_ide_drive_string( * vote-threshold=1 */ drive = GCSPRINTF( @@ -145,7 +145,7 @@ break; case LIBXL__COLO_SECONDARY: /* -@@ -892,7 +906,7 @@ static char *qemu_disk_ide_drive_string( +@@ -1084,7 +1098,7 @@ static char *qemu_disk_ide_drive_string( * file.backing.backing=exportname, */ drive = GCSPRINTF( @@ -154,7 +154,7 @@ "driver=replication," "mode=secondary," "top-id=top-colo," -@@ -901,7 +915,8 @@ static char *qemu_disk_ide_drive_string( +@@ -1093,7 +1107,8 @@ static char *qemu_disk_ide_drive_string( "file.backing.driver=qcow2," "file.backing.file.filename=%s," "file.backing.backing=%s", @@ -164,7 +164,7 @@ break; default: abort(); -@@ -1602,8 +1617,8 @@ static int libxl__build_device_model_arg +@@ -1890,8 +1905,8 @@ static int libxl__build_device_model_arg return ERROR_INVAL; } flexarray_vappend(dm_args, "-drive", @@ -175,10 +175,10 @@ "-device", GCSPRINTF("ide-hd,bus=ahci0.%d,unit=0,drive=ahcidisk-%d", disk, disk), NULL); continue; -Index: xen-4.11.0-testing/tools/libxl/libxlu_disk.c +Index: xen-4.12.0-testing/tools/libxl/libxlu_disk.c =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxlu_disk.c -+++ xen-4.11.0-testing/tools/libxl/libxlu_disk.c +--- xen-4.12.0-testing.orig/tools/libxl/libxlu_disk.c ++++ xen-4.12.0-testing/tools/libxl/libxlu_disk.c @@ -79,6 +79,8 @@ int xlu_disk_parse(XLU_Config *cfg, if (!disk->pdev_path || !strcmp(disk->pdev_path, "")) disk->format = LIBXL_DISK_FORMAT_EMPTY; @@ -188,10 +188,10 @@ if (!disk->vdev) { xlu__disk_err(&dpc,0, "no vdev specified"); -Index: xen-4.11.0-testing/tools/libxl/libxlu_disk_i.h +Index: xen-4.12.0-testing/tools/libxl/libxlu_disk_i.h =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxlu_disk_i.h -+++ xen-4.11.0-testing/tools/libxl/libxlu_disk_i.h +--- xen-4.12.0-testing.orig/tools/libxl/libxlu_disk_i.h ++++ xen-4.12.0-testing/tools/libxl/libxlu_disk_i.h @@ -10,7 +10,7 @@ typedef struct { void *scanner; YY_BUFFER_STATE buf; @@ -201,10 +201,10 @@ const char *spec; } DiskParseContext; -Index: xen-4.11.0-testing/tools/libxl/libxlu_disk_l.l +Index: xen-4.12.0-testing/tools/libxl/libxlu_disk_l.l =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxlu_disk_l.l -+++ xen-4.11.0-testing/tools/libxl/libxlu_disk_l.l +--- xen-4.12.0-testing.orig/tools/libxl/libxlu_disk_l.l ++++ xen-4.12.0-testing/tools/libxl/libxlu_disk_l.l @@ -196,6 +196,7 @@ colo-port=[^,]*,? { STRIP(','); setcolop colo-export=[^,]*,? { STRIP(','); SAVESTRING("colo-export", colo_export, FROMEQUALS); } active-disk=[^,]*,? { STRIP(','); SAVESTRING("active-disk", active_disk, FROMEQUALS); } ++++++ libxl.pvscsi.patch ++++++ --- /var/tmp/diff_new_pack.UAOhdK/_old 2019-02-06 15:46:07.283306370 +0100 +++ /var/tmp/diff_new_pack.UAOhdK/_new 2019-02-06 15:46:07.283306370 +0100 @@ -34,11 +34,11 @@ tools/libxl/xl_cmdtable.c | 15 16 files changed, 2326 insertions(+), 4 deletions(-) -Index: xen-4.11.0-testing/docs/man/xl.cfg.pod.5.in +Index: xen-4.12.0-testing/docs/man/xl.cfg.5.pod.in =================================================================== ---- xen-4.11.0-testing.orig/docs/man/xl.cfg.pod.5.in -+++ xen-4.11.0-testing/docs/man/xl.cfg.pod.5.in -@@ -692,6 +692,62 @@ frontend to backend. It can be used as a +--- xen-4.12.0-testing.orig/docs/man/xl.cfg.5.pod.in ++++ xen-4.12.0-testing/docs/man/xl.cfg.5.pod.in +@@ -693,6 +693,62 @@ frontend to backend. It can be used as a For more information about the protocol, see https://xenbits.xen.org/docs/unstable/misc/pvcalls.html. @@ -101,11 +101,11 @@ =item B<vfb=[ "VFB_SPEC_STRING", "VFB_SPEC_STRING", ...]> Specifies the paravirtual framebuffer devices which should be supplied -Index: xen-4.11.0-testing/docs/man/xl.pod.1.in +Index: xen-4.12.0-testing/docs/man/xl.1.pod.in =================================================================== ---- xen-4.11.0-testing.orig/docs/man/xl.pod.1.in -+++ xen-4.11.0-testing/docs/man/xl.pod.1.in -@@ -1492,6 +1492,24 @@ List virtual displays for a domain. +--- xen-4.12.0-testing.orig/docs/man/xl.1.pod.in ++++ xen-4.12.0-testing/docs/man/xl.1.pod.in +@@ -1544,6 +1544,24 @@ List virtual network interfaces for a do =back @@ -130,10 +130,10 @@ =head1 PCI PASS-THROUGH =over 4 -Index: xen-4.11.0-testing/tools/libxl/Makefile +Index: xen-4.12.0-testing/tools/libxl/Makefile =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/Makefile -+++ xen-4.11.0-testing/tools/libxl/Makefile +--- xen-4.12.0-testing.orig/tools/libxl/Makefile ++++ xen-4.12.0-testing/tools/libxl/Makefile @@ -130,6 +130,7 @@ endif LIBXL_LIBS += -lyajl @@ -150,11 +150,11 @@ libxlu_disk_l.o libxlu_disk.o libxlu_vif.o libxlu_pci.o $(LIBXLU_OBJS): CFLAGS += $(CFLAGS_libxenctrl) # For xentoollog.h -Index: xen-4.11.0-testing/tools/libxl/libxl.h +Index: xen-4.12.0-testing/tools/libxl/libxl.h =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxl.h -+++ xen-4.11.0-testing/tools/libxl/libxl.h -@@ -1039,6 +1039,13 @@ void libxl_mac_copy(libxl_ctx *ctx, libx +--- xen-4.12.0-testing.orig/tools/libxl/libxl.h ++++ xen-4.12.0-testing/tools/libxl/libxl.h +@@ -1061,6 +1061,13 @@ void libxl_mac_copy(libxl_ctx *ctx, libx #define LIBXL_HAVE_PCITOPOLOGY 1 /* @@ -168,7 +168,7 @@ * LIBXL_HAVE_SOCKET_BITMAP * * If this is defined, then libxl_socket_bitmap_alloc and -@@ -1969,6 +1976,41 @@ int libxl_device_channel_getinfo(libxl_c +@@ -1991,6 +1998,41 @@ int libxl_device_channel_getinfo(libxl_c libxl_device_channel *channel, libxl_channelinfo *channelinfo); @@ -210,11 +210,11 @@ /* Virtual TPMs */ int libxl_device_vtpm_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vtpm *vtpm, const libxl_asyncop_how *ao_how) -Index: xen-4.11.0-testing/tools/libxl/libxl_create.c +Index: xen-4.12.0-testing/tools/libxl/libxl_create.c =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxl_create.c -+++ xen-4.11.0-testing/tools/libxl/libxl_create.c -@@ -1496,6 +1496,7 @@ const struct libxl_device_type *device_t +--- xen-4.12.0-testing.orig/tools/libxl/libxl_create.c ++++ xen-4.12.0-testing/tools/libxl/libxl_create.c +@@ -1519,6 +1519,7 @@ const struct libxl_device_type *device_t &libxl__disk_devtype, &libxl__nic_devtype, &libxl__vtpm_devtype, @@ -222,11 +222,11 @@ &libxl__usbctrl_devtype, &libxl__usbdev_devtype, &libxl__pcidev_devtype, -Index: xen-4.11.0-testing/tools/libxl/libxl_internal.h +Index: xen-4.12.0-testing/tools/libxl/libxl_internal.h =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxl_internal.h -+++ xen-4.11.0-testing/tools/libxl/libxl_internal.h -@@ -3647,6 +3647,7 @@ extern const struct libxl_device_type li +--- xen-4.12.0-testing.orig/tools/libxl/libxl_internal.h ++++ xen-4.12.0-testing/tools/libxl/libxl_internal.h +@@ -3808,6 +3808,7 @@ extern const struct libxl_device_type li extern const struct libxl_device_type libxl__disk_devtype; extern const struct libxl_device_type libxl__nic_devtype; extern const struct libxl_device_type libxl__vtpm_devtype; @@ -234,12 +234,12 @@ extern const struct libxl_device_type libxl__usbctrl_devtype; extern const struct libxl_device_type libxl__usbdev_devtype; extern const struct libxl_device_type libxl__pcidev_devtype; -Index: xen-4.11.0-testing/tools/libxl/libxl_types.idl +Index: xen-4.12.0-testing/tools/libxl/libxl_types.idl =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxl_types.idl -+++ xen-4.11.0-testing/tools/libxl/libxl_types.idl -@@ -822,6 +822,43 @@ libxl_device_vdispl = Struct("device_vdi - ("connectors", Array(libxl_connector_param, "num_connectors")) +--- xen-4.12.0-testing.orig/tools/libxl/libxl_types.idl ++++ xen-4.12.0-testing/tools/libxl/libxl_types.idl +@@ -909,6 +909,43 @@ libxl_device_vsnd = Struct("device_vsnd" + ("pcms", Array(libxl_vsnd_pcm, "num_vsnd_pcms")) ]) +libxl_vscsi_pdev_type = Enumeration("vscsi_pdev_type", [ @@ -282,7 +282,7 @@ libxl_domain_config = Struct("domain_config", [ ("c_info", libxl_domain_create_info), ("b_info", libxl_domain_build_info), -@@ -833,6 +870,7 @@ libxl_domain_config = Struct("domain_con +@@ -920,6 +957,7 @@ libxl_domain_config = Struct("domain_con ("dtdevs", Array(libxl_device_dtdev, "num_dtdevs")), ("vfbs", Array(libxl_device_vfb, "num_vfbs")), ("vkbs", Array(libxl_device_vkb, "num_vkbs")), @@ -290,7 +290,7 @@ ("vtpms", Array(libxl_device_vtpm, "num_vtpms")), ("p9s", Array(libxl_device_p9, "num_p9s")), ("pvcallsifs", Array(libxl_device_pvcallsif, "num_pvcallsifs")), -@@ -873,6 +911,21 @@ libxl_nicinfo = Struct("nicinfo", [ +@@ -961,6 +999,21 @@ libxl_nicinfo = Struct("nicinfo", [ ("rref_rx", integer), ], dir=DIR_OUT) @@ -312,22 +312,22 @@ libxl_vtpminfo = Struct("vtpminfo", [ ("backend", string), ("backend_id", uint32), -Index: xen-4.11.0-testing/tools/libxl/libxl_types_internal.idl +Index: xen-4.12.0-testing/tools/libxl/libxl_types_internal.idl =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxl_types_internal.idl -+++ xen-4.11.0-testing/tools/libxl/libxl_types_internal.idl -@@ -29,6 +29,7 @@ libxl__device_kind = Enumeration("device - (12, "VDISPL"), +--- xen-4.12.0-testing.orig/tools/libxl/libxl_types_internal.idl ++++ xen-4.12.0-testing/tools/libxl/libxl_types_internal.idl +@@ -30,6 +30,7 @@ libxl__device_kind = Enumeration("device (13, "VUART"), (14, "PVCALLS"), -+ (15, "VSCSI"), + (15, "VSND"), ++ (16, "VSCSI"), ]) libxl__console_backend = Enumeration("console_backend", [ -Index: xen-4.11.0-testing/tools/libxl/libxl_vscsi.c +Index: xen-4.12.0-testing/tools/libxl/libxl_vscsi.c =================================================================== --- /dev/null -+++ xen-4.11.0-testing/tools/libxl/libxl_vscsi.c ++++ xen-4.12.0-testing/tools/libxl/libxl_vscsi.c @@ -0,0 +1,1185 @@ +/* + * Copyright (C) 2016 SUSE Linux GmbH @@ -1514,10 +1514,10 @@ + * indent-tabs-mode: nil + * End: + */ -Index: xen-4.11.0-testing/tools/libxl/libxlu_vscsi.c +Index: xen-4.12.0-testing/tools/libxl/libxlu_vscsi.c =================================================================== --- /dev/null -+++ xen-4.11.0-testing/tools/libxl/libxlu_vscsi.c ++++ xen-4.12.0-testing/tools/libxl/libxlu_vscsi.c @@ -0,0 +1,668 @@ +/* + * libxlu_vscsi.c - xl configuration file parsing: setup and helper functions @@ -2187,10 +2187,10 @@ + return ERROR_INVAL; +} +#endif -Index: xen-4.11.0-testing/tools/libxl/libxlutil.h +Index: xen-4.12.0-testing/tools/libxl/libxlutil.h =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxlutil.h -+++ xen-4.11.0-testing/tools/libxl/libxlutil.h +--- xen-4.12.0-testing.orig/tools/libxl/libxlutil.h ++++ xen-4.12.0-testing/tools/libxl/libxlutil.h @@ -118,6 +118,25 @@ int xlu_rdm_parse(XLU_Config *cfg, libxl int xlu_vif_parse_rate(XLU_Config *cfg, const char *rate, libxl_device_nic *nic); @@ -2217,10 +2217,10 @@ #endif /* LIBXLUTIL_H */ /* -Index: xen-4.11.0-testing/tools/xl/Makefile +Index: xen-4.12.0-testing/tools/xl/Makefile =================================================================== ---- xen-4.11.0-testing.orig/tools/xl/Makefile -+++ xen-4.11.0-testing/tools/xl/Makefile +--- xen-4.12.0-testing.orig/tools/xl/Makefile ++++ xen-4.12.0-testing/tools/xl/Makefile @@ -18,7 +18,7 @@ CFLAGS_XL += -Wshadow XL_OBJS-$(CONFIG_X86) = xl_psr.o XL_OBJS = xl.o xl_cmdtable.o xl_sxp.o xl_utils.o $(XL_OBJS-y) @@ -2230,10 +2230,10 @@ XL_OBJS += xl_sched.o xl_pci.o xl_vcpu.o xl_cdrom.o xl_mem.o XL_OBJS += xl_info.o xl_console.o xl_misc.o XL_OBJS += xl_vmcontrol.o xl_saverestore.o xl_migrate.o -Index: xen-4.11.0-testing/tools/xl/xl.h +Index: xen-4.12.0-testing/tools/xl/xl.h =================================================================== ---- xen-4.11.0-testing.orig/tools/xl/xl.h -+++ xen-4.11.0-testing/tools/xl/xl.h +--- xen-4.12.0-testing.orig/tools/xl/xl.h ++++ xen-4.12.0-testing/tools/xl/xl.h @@ -165,6 +165,9 @@ int main_channellist(int argc, char **ar int main_blockattach(int argc, char **argv); int main_blocklist(int argc, char **argv); @@ -2244,11 +2244,11 @@ int main_vtpmattach(int argc, char **argv); int main_vtpmlist(int argc, char **argv); int main_vtpmdetach(int argc, char **argv); -Index: xen-4.11.0-testing/tools/xl/xl_parse.c +Index: xen-4.12.0-testing/tools/xl/xl_parse.c =================================================================== ---- xen-4.11.0-testing.orig/tools/xl/xl_parse.c -+++ xen-4.11.0-testing/tools/xl/xl_parse.c -@@ -860,7 +860,8 @@ void parse_config_data(const char *confi +--- xen-4.12.0-testing.orig/tools/xl/xl_parse.c ++++ xen-4.12.0-testing/tools/xl/xl_parse.c +@@ -1211,7 +1211,8 @@ void parse_config_data(const char *confi long l, vcpus = 0; XLU_Config *config; XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids, *vtpms, @@ -2258,7 +2258,7 @@ XLU_ConfigList *channels, *ioports, *irqs, *iomem, *viridian, *dtdevs, *mca_caps; int num_ioports, num_irqs, num_iomem, num_cpus, num_viridian, num_mca_caps; -@@ -1619,6 +1620,17 @@ void parse_config_data(const char *confi +@@ -1974,6 +1975,17 @@ void parse_config_data(const char *confi } } @@ -2276,10 +2276,10 @@ if (!xlu_cfg_get_list(config, "vtpm", &vtpms, 0, 0)) { d_config->num_vtpms = 0; d_config->vtpms = NULL; -Index: xen-4.11.0-testing/tools/xl/xl_vscsi.c +Index: xen-4.12.0-testing/tools/xl/xl_vscsi.c =================================================================== --- /dev/null -+++ xen-4.11.0-testing/tools/xl/xl_vscsi.c ++++ xen-4.12.0-testing/tools/xl/xl_vscsi.c @@ -0,0 +1,229 @@ +/* + * Copyright 2009-2017 Citrix Ltd and other contributors @@ -2510,11 +2510,11 @@ + return !!rc; +} + -Index: xen-4.11.0-testing/tools/xl/xl_cmdtable.c +Index: xen-4.12.0-testing/tools/xl/xl_cmdtable.c =================================================================== ---- xen-4.11.0-testing.orig/tools/xl/xl_cmdtable.c -+++ xen-4.11.0-testing/tools/xl/xl_cmdtable.c -@@ -367,6 +367,21 @@ struct cmd_spec cmd_table[] = { +--- xen-4.12.0-testing.orig/tools/xl/xl_cmdtable.c ++++ xen-4.12.0-testing/tools/xl/xl_cmdtable.c +@@ -368,6 +368,21 @@ struct cmd_spec cmd_table[] = { "Destroy a domain's virtual block device", "<Domain> <DevId>", }, ++++++ libxl.set-migration-constraints-from-cmdline.patch ++++++ --- /var/tmp/diff_new_pack.UAOhdK/_old 2019-02-06 15:46:07.299306359 +0100 +++ /var/tmp/diff_new_pack.UAOhdK/_new 2019-02-06 15:46:07.303306357 +0100 @@ -89,10 +89,10 @@ tools/libxl/xl_cmdtable.c | 23 ++++++++++++++-------- 13 files changed, 156 insertions(+), 28 deletions(-) -Index: xen-4.11.0-testing/docs/man/xl.pod.1.in +Index: xen-4.12.0-testing/docs/man/xl.1.pod.in =================================================================== ---- xen-4.11.0-testing.orig/docs/man/xl.pod.1.in -+++ xen-4.11.0-testing/docs/man/xl.pod.1.in +--- xen-4.12.0-testing.orig/docs/man/xl.1.pod.in ++++ xen-4.12.0-testing/docs/man/xl.1.pod.in @@ -459,6 +459,26 @@ Display huge (!) amount of debug informa Leave the domain on the receive side paused after migration. @@ -120,10 +120,10 @@ =back =item B<remus> [I<OPTIONS>] I<domain-id> I<host> -Index: xen-4.11.0-testing/tools/libxc/include/xenguest.h +Index: xen-4.12.0-testing/tools/libxc/include/xenguest.h =================================================================== ---- xen-4.11.0-testing.orig/tools/libxc/include/xenguest.h -+++ xen-4.11.0-testing/tools/libxc/include/xenguest.h +--- xen-4.12.0-testing.orig/tools/libxc/include/xenguest.h ++++ xen-4.12.0-testing/tools/libxc/include/xenguest.h @@ -29,6 +29,7 @@ #define XCFLAGS_HVM (1 << 2) #define XCFLAGS_STDVGA (1 << 3) @@ -154,10 +154,10 @@ /* callbacks provided by xc_domain_restore */ struct restore_callbacks { -Index: xen-4.11.0-testing/tools/libxc/xc_nomigrate.c +Index: xen-4.12.0-testing/tools/libxc/xc_nomigrate.c =================================================================== ---- xen-4.11.0-testing.orig/tools/libxc/xc_nomigrate.c -+++ xen-4.11.0-testing/tools/libxc/xc_nomigrate.c +--- xen-4.12.0-testing.orig/tools/libxc/xc_nomigrate.c ++++ xen-4.12.0-testing/tools/libxc/xc_nomigrate.c @@ -20,9 +20,11 @@ #include <xenctrl.h> #include <xenguest.h> @@ -173,10 +173,10 @@ { errno = ENOSYS; return -1; -Index: xen-4.11.0-testing/tools/libxc/xc_sr_save.c +Index: xen-4.12.0-testing/tools/libxc/xc_sr_save.c =================================================================== ---- xen-4.11.0-testing.orig/tools/libxc/xc_sr_save.c -+++ xen-4.11.0-testing/tools/libxc/xc_sr_save.c +--- xen-4.12.0-testing.orig/tools/libxc/xc_sr_save.c ++++ xen-4.12.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++; @@ -296,11 +296,11 @@ /* If altering migration_stream update this assert too. */ assert(stream_type == XC_MIG_STREAM_NONE || stream_type == XC_MIG_STREAM_REMUS || -Index: xen-4.11.0-testing/tools/libxl/libxl.h +Index: xen-4.12.0-testing/tools/libxl/libxl.h =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxl.h -+++ xen-4.11.0-testing/tools/libxl/libxl.h -@@ -1511,8 +1511,23 @@ int libxl_domain_suspend(libxl_ctx *ctx, +--- xen-4.12.0-testing.orig/tools/libxl/libxl.h ++++ xen-4.12.0-testing/tools/libxl/libxl.h +@@ -1533,8 +1533,23 @@ int libxl_domain_suspend(libxl_ctx *ctx, int flags, /* LIBXL_SUSPEND_* */ const libxl_asyncop_how *ao_how) LIBXL_EXTERNAL_CALLERS_ONLY; @@ -324,10 +324,10 @@ /* * Only suspend domain, do not save its state to file, do not destroy it. -Index: xen-4.11.0-testing/tools/libxl/libxl_dom_save.c +Index: xen-4.12.0-testing/tools/libxl/libxl_dom_save.c =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxl_dom_save.c -+++ xen-4.11.0-testing/tools/libxl/libxl_dom_save.c +--- xen-4.12.0-testing.orig/tools/libxl/libxl_dom_save.c ++++ xen-4.12.0-testing/tools/libxl/libxl_dom_save.c @@ -380,6 +380,7 @@ void libxl__domain_save(libxl__egc *egc, dss->xcflags = (live ? XCFLAGS_LIVE : 0) @@ -336,10 +336,10 @@ | (dss->hvm ? XCFLAGS_HVM : 0); /* Disallow saving a guest with vNUMA configured because migration -Index: xen-4.11.0-testing/tools/libxl/libxl_domain.c +Index: xen-4.12.0-testing/tools/libxl/libxl_domain.c =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxl_domain.c -+++ xen-4.11.0-testing/tools/libxl/libxl_domain.c +--- xen-4.12.0-testing.orig/tools/libxl/libxl_domain.c ++++ xen-4.12.0-testing/tools/libxl/libxl_domain.c @@ -486,8 +486,9 @@ static void domain_suspend_cb(libxl__egc } @@ -391,11 +391,11 @@ int libxl_domain_pause(libxl_ctx *ctx, uint32_t domid) { int ret; -Index: xen-4.11.0-testing/tools/libxl/libxl_internal.h +Index: xen-4.12.0-testing/tools/libxl/libxl_internal.h =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxl_internal.h -+++ xen-4.11.0-testing/tools/libxl/libxl_internal.h -@@ -3309,6 +3309,10 @@ struct libxl__domain_save_state { +--- xen-4.12.0-testing.orig/tools/libxl/libxl_internal.h ++++ xen-4.12.0-testing/tools/libxl/libxl_internal.h +@@ -3470,6 +3470,10 @@ struct libxl__domain_save_state { /* private */ int rc; int hvm; @@ -406,10 +406,10 @@ int xcflags; libxl__domain_suspend_state dsps; union { -Index: xen-4.11.0-testing/tools/libxl/libxl_save_callout.c +Index: xen-4.12.0-testing/tools/libxl/libxl_save_callout.c =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxl_save_callout.c -+++ xen-4.11.0-testing/tools/libxl/libxl_save_callout.c +--- xen-4.12.0-testing.orig/tools/libxl/libxl_save_callout.c ++++ xen-4.12.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); @@ -421,10 +421,10 @@ dss->checkpointed_stream, }; -Index: xen-4.11.0-testing/tools/libxl/libxl_save_helper.c +Index: xen-4.12.0-testing/tools/libxl/libxl_save_helper.c =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxl_save_helper.c -+++ xen-4.11.0-testing/tools/libxl/libxl_save_helper.c +--- xen-4.12.0-testing.orig/tools/libxl/libxl_save_helper.c ++++ xen-4.12.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); @@ -448,11 +448,11 @@ complete(r); } else if (!strcmp(mode,"--restore-domain")) { -Index: xen-4.11.0-testing/tools/xl/xl_cmdtable.c +Index: xen-4.12.0-testing/tools/xl/xl_cmdtable.c =================================================================== ---- xen-4.11.0-testing.orig/tools/xl/xl_cmdtable.c -+++ xen-4.11.0-testing/tools/xl/xl_cmdtable.c -@@ -158,15 +158,22 @@ struct cmd_spec cmd_table[] = { +--- xen-4.12.0-testing.orig/tools/xl/xl_cmdtable.c ++++ xen-4.12.0-testing/tools/xl/xl_cmdtable.c +@@ -159,15 +159,22 @@ struct cmd_spec cmd_table[] = { &main_migrate, 0, 1, "Migrate a domain to another host", "[options] <Domain> <host>", @@ -484,10 +484,10 @@ }, { "restore", &main_restore, 0, 1, -Index: xen-4.11.0-testing/tools/xl/xl_migrate.c +Index: xen-4.12.0-testing/tools/xl/xl_migrate.c =================================================================== ---- xen-4.11.0-testing.orig/tools/xl/xl_migrate.c -+++ xen-4.11.0-testing/tools/xl/xl_migrate.c +--- xen-4.12.0-testing.orig/tools/xl/xl_migrate.c ++++ xen-4.12.0-testing/tools/xl/xl_migrate.c @@ -177,6 +177,8 @@ static void migrate_do_preamble(int send } ++++++ mini-os.tar.bz2 ++++++ ++++++ pygrub-python3-conversion.patch ++++++ --- /var/tmp/diff_new_pack.UAOhdK/_old 2019-02-06 15:46:07.547306209 +0100 +++ /var/tmp/diff_new_pack.UAOhdK/_new 2019-02-06 15:46:07.547306209 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.10.0-testing/tools/pygrub/src/pygrub +Index: xen-4.12.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 +--- xen-4.12.0-testing.orig/tools/pygrub/src/pygrub ++++ xen-4.12.0-testing/tools/pygrub/src/pygrub @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/python3 @@ -17,7 +17,7 @@ +from curses import wrapper import getopt - import fsimage + import xenfsimage @@ -51,7 +52,7 @@ def enable_cursor(ison): except _curses.error: pass @@ -255,10 +255,10 @@ - os.write(fd, ostring) + os.write(fd, ostring.encode('utf-8')) -Index: xen-4.10.0-testing/tools/pygrub/src/GrubConf.py +Index: xen-4.12.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 +--- xen-4.12.0-testing.orig/tools/pygrub/src/GrubConf.py ++++ xen-4.12.0-testing/tools/pygrub/src/GrubConf.py @@ -44,7 +44,7 @@ def get_path(s): return (None, s) idx = s.find(')') @@ -412,10 +412,10 @@ 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 +Index: xen-4.12.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 +--- xen-4.12.0-testing.orig/tools/pygrub/src/ExtLinuxConf.py ++++ xen-4.12.0-testing/tools/pygrub/src/ExtLinuxConf.py @@ -12,7 +12,7 @@ import sys, re, os @@ -473,10 +473,10 @@ - print g.default + print(i) + print(g.default) -Index: xen-4.10.0-testing/tools/pygrub/src/LiloConf.py +Index: xen-4.12.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 +--- xen-4.12.0-testing.orig/tools/pygrub/src/LiloConf.py ++++ xen-4.12.0-testing/tools/pygrub/src/LiloConf.py @@ -4,7 +4,7 @@ import sys, re, os @@ -531,10 +531,10 @@ - print g.default + print(i) #, i.title, i.root, i.kernel, i.args, i.initrd + print(g.default) -Index: xen-4.10.0-testing/tools/pygrub/src/fsimage/fsimage.c +Index: xen-4.12.0-testing/tools/pygrub/src/fsimage/fsimage.c =================================================================== ---- xen-4.10.0-testing.orig/tools/pygrub/src/fsimage/fsimage.c -+++ xen-4.10.0-testing/tools/pygrub/src/fsimage/fsimage.c +--- xen-4.12.0-testing.orig/tools/pygrub/src/fsimage/fsimage.c ++++ xen-4.12.0-testing/tools/pygrub/src/fsimage/fsimage.c @@ -66,12 +66,12 @@ fsimage_file_read(fsimage_file_t *file, bufsize = size ? size : 4096; @@ -596,7 +596,7 @@ - PyObject_HEAD_INIT(&PyType_Type) - 0, /* ob_size */ + PyVarObject_HEAD_INIT(&PyType_Type, 0) - "fsimage.file", /* tp_name */ + "xenfsimage.file", /* tp_name */ sizeof(fsimage_file_t), /* tp_size */ 0, /* tp_itemsize */ @@ -207,7 +212,7 @@ PyDoc_STRVAR(fsimage_fs_file_exists__doc @@ -630,7 +630,7 @@ - PyObject_HEAD_INIT(&PyType_Type) - 0, /* ob_size */ + PyVarObject_HEAD_INIT(&PyType_Type, 0) - "fsimage.fs", /* tp_name */ + "xenfsimage.fs", /* tp_name */ sizeof(fsimage_fs_t), /* tp_size */ 0, /* tp_itemsize */ @@ -308,7 +318,7 @@ PyDoc_STRVAR(fsimage_getbootstring__doc_ @@ -656,9 +656,9 @@ +}; + PyMODINIT_FUNC --initfsimage(void) +-initxenfsimage(void) +PyInit_fsimage(void) { -- Py_InitModule("fsimage", fsimage_module_methods); +- Py_InitModule("xenfsimage", fsimage_module_methods); + return PyModule_Create(&fsimage_module); } ++++++ reproducible.patch ++++++ --- /var/tmp/diff_new_pack.UAOhdK/_old 2019-02-06 15:46:07.563306199 +0100 +++ /var/tmp/diff_new_pack.UAOhdK/_new 2019-02-06 15:46:07.563306199 +0100 @@ -11,10 +11,10 @@ Signed-off-by: Bernhard M. Wiedemann <bwiedem...@suse.de> -Index: xen-4.11.0-testing/Config.mk +Index: xen-4.12.0-testing/Config.mk =================================================================== ---- xen-4.11.0-testing.orig/Config.mk -+++ xen-4.11.0-testing/Config.mk +--- xen-4.12.0-testing.orig/Config.mk ++++ xen-4.12.0-testing/Config.mk @@ -151,6 +151,14 @@ export XEN_HAS_BUILD_ID=y build_id_linker := --build-id=sha1 endif @@ -30,11 +30,11 @@ ifndef XEN_HAS_CHECKPOLICY CHECKPOLICY ?= checkpolicy XEN_HAS_CHECKPOLICY := $(shell $(CHECKPOLICY) -h 2>&1 | grep -q xen && echo y || echo n) -Index: xen-4.11.0-testing/xen/arch/x86/Makefile +Index: xen-4.12.0-testing/xen/arch/x86/Makefile =================================================================== ---- xen-4.11.0-testing.orig/xen/arch/x86/Makefile -+++ xen-4.11.0-testing/xen/arch/x86/Makefile -@@ -157,6 +157,7 @@ note.o: $(TARGET)-syms +--- xen-4.12.0-testing.orig/xen/arch/x86/Makefile ++++ xen-4.12.0-testing/xen/arch/x86/Makefile +@@ -155,6 +155,7 @@ note.o: $(TARGET)-syms EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(LDFLAGS)) --subsystem=10 EFI_LDFLAGS += --image-base=$(1) --stack=0,0 --heap=0,0 --strip-debug ++++++ stubdom-have-iovec.patch ++++++ --- /var/tmp/diff_new_pack.UAOhdK/_old 2019-02-06 15:46:07.571306195 +0100 +++ /var/tmp/diff_new_pack.UAOhdK/_new 2019-02-06 15:46:07.571306195 +0100 @@ -3,11 +3,11 @@ when building qemu traditional xen_platform.c which includes hw.h which includes qemu-common.h which already has a definition of iovec -Index: xen-4.9.0-testing/tools/libxc/xc_private.h +Index: xen-4.12.0-testing/tools/libxc/xc_private.h =================================================================== ---- xen-4.9.0-testing.orig/tools/libxc/xc_private.h -+++ xen-4.9.0-testing/tools/libxc/xc_private.h -@@ -48,6 +48,8 @@ +--- xen-4.12.0-testing.orig/tools/libxc/xc_private.h ++++ xen-4.12.0-testing/tools/libxc/xc_private.h +@@ -50,6 +50,8 @@ #endif #if defined(__MINIOS__) @@ -16,7 +16,7 @@ /* * MiniOS's libc doesn't know about sys/uio.h or writev(). * Declare enough of sys/uio.h to compile. -@@ -56,6 +58,7 @@ struct iovec { +@@ -58,6 +60,7 @@ struct iovec { void *iov_base; size_t iov_len; }; ++++++ stubdom.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/xen/stubdom.tar.bz2 /work/SRC/openSUSE:Factory/.xen.new.28833/stubdom.tar.bz2 differ: char 11, line 1 ++++++ tmp_build.patch ++++++ --- /var/tmp/diff_new_pack.UAOhdK/_old 2019-02-06 15:46:07.627306161 +0100 +++ /var/tmp/diff_new_pack.UAOhdK/_new 2019-02-06 15:46:07.631306158 +0100 @@ -14,10 +14,10 @@ tools/xenstore/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -Index: xen-4.11.0-testing/tools/xenstore/Makefile +Index: xen-4.11.1-testing/tools/xenstore/Makefile =================================================================== ---- xen-4.11.0-testing.orig/tools/xenstore/Makefile -+++ xen-4.11.0-testing/tools/xenstore/Makefile +--- xen-4.11.1-testing.orig/tools/xenstore/Makefile ++++ xen-4.11.1-testing/tools/xenstore/Makefile @@ -93,6 +93,7 @@ $(CLIENTS_DOMU): xenstore xenstore: xenstore_client.o $(LIBXENSTORE) ++++++ x86-cpufreq-report.patch ++++++ --- /var/tmp/diff_new_pack.UAOhdK/_old 2019-02-06 15:46:07.639306153 +0100 +++ /var/tmp/diff_new_pack.UAOhdK/_new 2019-02-06 15:46:07.639306153 +0100 @@ -1,7 +1,7 @@ -Index: xen-4.11.0-testing/xen/arch/x86/platform_hypercall.c +Index: xen-4.12.0-testing/xen/arch/x86/platform_hypercall.c =================================================================== ---- xen-4.11.0-testing.orig/xen/arch/x86/platform_hypercall.c -+++ xen-4.11.0-testing/xen/arch/x86/platform_hypercall.c +--- xen-4.12.0-testing.orig/xen/arch/x86/platform_hypercall.c ++++ xen-4.12.0-testing/xen/arch/x86/platform_hypercall.c @@ -25,7 +25,7 @@ #include <xen/symbols.h> #include <asm/current.h> @@ -11,7 +11,7 @@ #include <asm/edd.h> #include <asm/mtrr.h> #include <asm/io_apic.h> -@@ -822,6 +822,41 @@ ret_t do_platform_op(XEN_GUEST_HANDLE_PA +@@ -807,6 +807,41 @@ ret_t do_platform_op(XEN_GUEST_HANDLE_PA ret = -EFAULT; } break; @@ -53,10 +53,10 @@ default: ret = -ENOSYS; -Index: xen-4.11.0-testing/xen/include/public/platform.h +Index: xen-4.12.0-testing/xen/include/public/platform.h =================================================================== ---- xen-4.11.0-testing.orig/xen/include/public/platform.h -+++ xen-4.11.0-testing/xen/include/public/platform.h +--- xen-4.12.0-testing.orig/xen/include/public/platform.h ++++ xen-4.12.0-testing/xen/include/public/platform.h @@ -553,6 +553,16 @@ struct xenpf_core_parking { typedef struct xenpf_core_parking xenpf_core_parking_t; DEFINE_XEN_GUEST_HANDLE(xenpf_core_parking_t); ++++++ xen-4.11.1-testing-src.tar.bz2 -> xen-4.12.0-testing-src.tar.bz2 ++++++ ++++ 117479 lines of diff (skipped) ++++++ xen-arch-kconfig-nr_cpus.patch ++++++ --- /var/tmp/diff_new_pack.UAOhdK/_old 2019-02-06 15:46:11.171304008 +0100 +++ /var/tmp/diff_new_pack.UAOhdK/_new 2019-02-06 15:46:11.171304008 +0100 @@ -1,11 +1,13 @@ ---- xen-4.7.0-testing/xen/arch/Kconfig.orig 2016-11-02 09:45:22.827366951 -0600 -+++ xen-4.7.0-testing/xen/arch/Kconfig 2016-11-02 09:45:43.107366773 -0600 +Index: xen-4.12.0-testing/xen/arch/Kconfig +=================================================================== +--- xen-4.12.0-testing.orig/xen/arch/Kconfig ++++ xen-4.12.0-testing/xen/arch/Kconfig @@ -2,7 +2,7 @@ config NR_CPUS int "Maximum number of physical CPUs" range 1 4095 - default "256" if X86 + default "1024" if X86 - default "128" if ARM - ---help--- - Specifies the maximum number of physical CPUs which Xen will support. + default "8" if ARM && RCAR3 + default "4" if ARM && QEMU + default "4" if ARM && MPSOC ++++++ xen.build-compare.doc_html.patch ++++++ --- /var/tmp/diff_new_pack.UAOhdK/_old 2019-02-06 15:46:11.223303976 +0100 +++ /var/tmp/diff_new_pack.UAOhdK/_new 2019-02-06 15:46:11.223303976 +0100 @@ -5,20 +5,20 @@ docs/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -Index: xen-4.11.0-testing/docs/Makefile +Index: xen-4.12.0-testing/docs/Makefile =================================================================== ---- xen-4.11.0-testing.orig/docs/Makefile -+++ xen-4.11.0-testing/docs/Makefile -@@ -199,7 +199,7 @@ uninstall: uninstall-man-pages uninstall +--- xen-4.12.0-testing.orig/docs/Makefile ++++ xen-4.12.0-testing/docs/Makefile +@@ -179,7 +179,7 @@ uninstall: uninstall-man-pages uninstall # Individual file build targets html/index.html: $(DOC_HTML) $(CURDIR)/gen-html-index INDEX - $(PERL) -w -- $(CURDIR)/gen-html-index -i INDEX html $(DOC_HTML) + $(PERL) -w -- $(CURDIR)/gen-html-index -i INDEX html $(sort $(DOC_HTML)) - html/%.html: %.markdown - ifneq ($(MARKDOWN),) -@@ -222,8 +222,8 @@ html/hypercall/%/index.html: $(CURDIR)/x + html/%.txt: %.txt + @$(INSTALL_DIR) $(@D) +@@ -194,8 +194,8 @@ html/hypercall/%/index.html: $(CURDIR)/x $(INSTALL_DIR) $(@D) $(PERL) -w $(CURDIR)/xen-headers -O $(@D) \ -T 'arch-$* - Xen public headers' \ ++++++ xen.libxl.dmmd.patch ++++++ --- /var/tmp/diff_new_pack.UAOhdK/_old 2019-02-06 15:46:11.235303969 +0100 +++ /var/tmp/diff_new_pack.UAOhdK/_new 2019-02-06 15:46:11.235303969 +0100 @@ -7,10 +7,10 @@ tools/libxl/libxlu_disk_l.l | 2 ++ 4 files changed, 37 insertions(+), 6 deletions(-) -Index: xen-4.11.0-testing/tools/libxl/libxl_disk.c +Index: xen-4.12.0-testing/tools/libxl/libxl_disk.c =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxl_disk.c -+++ xen-4.11.0-testing/tools/libxl/libxl_disk.c +--- xen-4.12.0-testing.orig/tools/libxl/libxl_disk.c ++++ xen-4.12.0-testing/tools/libxl/libxl_disk.c @@ -178,7 +178,7 @@ static int libxl__device_disk_setdefault return rc; } @@ -31,10 +31,10 @@ flexarray_append(back, "params"); flexarray_append(back, GCSPRINTF("%s:%s", libxl__device_disk_string_of_format(disk->format), -Index: xen-4.11.0-testing/tools/libxl/libxl_device.c +Index: xen-4.12.0-testing/tools/libxl/libxl_device.c =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxl_device.c -+++ xen-4.11.0-testing/tools/libxl/libxl_device.c +--- xen-4.12.0-testing.orig/tools/libxl/libxl_device.c ++++ xen-4.12.0-testing/tools/libxl/libxl_device.c @@ -343,7 +343,8 @@ static int disk_try_backend(disk_try_bac return backend; @@ -45,12 +45,12 @@ return backend; default: -Index: xen-4.11.0-testing/tools/libxl/libxl_dm.c +Index: xen-4.12.0-testing/tools/libxl/libxl_dm.c =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxl_dm.c -+++ xen-4.11.0-testing/tools/libxl/libxl_dm.c -@@ -925,6 +925,30 @@ static char *qemu_disk_ide_drive_string( - return drive; +--- xen-4.12.0-testing.orig/tools/libxl/libxl_dm.c ++++ xen-4.12.0-testing/tools/libxl/libxl_dm.c +@@ -1162,6 +1162,30 @@ out: + return rc; } +static void libxl__suse_node_to_path(libxl__gc *gc, int domid, const libxl_device_disk *dp, const char **pdev_path) @@ -80,7 +80,7 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, const char *dm, int guest_domid, const libxl_domain_config *guest_config, -@@ -1505,9 +1529,11 @@ static int libxl__build_device_model_arg +@@ -1793,9 +1817,11 @@ static int libxl__build_device_model_arg libxl__device_disk_dev_number(disks[i].vdev, &disk, &part); const char *format; char *drive; @@ -93,7 +93,7 @@ if (dev_number == -1) { LOGD(WARN, guest_domid, "unable to determine"" disk number for %s", disks[i].vdev); -@@ -1548,7 +1574,7 @@ static int libxl__build_device_model_arg +@@ -1836,7 +1862,7 @@ static int libxl__build_device_model_arg * the bootloader path. */ if (disks[i].backend == LIBXL_DISK_BACKEND_TAP) @@ -102,10 +102,10 @@ disks[i].format); else target_path = libxl__device_disk_find_local_path(gc, -Index: xen-4.11.0-testing/tools/libxl/libxlu_disk_l.l +Index: xen-4.12.0-testing/tools/libxl/libxlu_disk_l.l =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxlu_disk_l.l -+++ xen-4.11.0-testing/tools/libxl/libxlu_disk_l.l +--- xen-4.12.0-testing.orig/tools/libxl/libxlu_disk_l.l ++++ xen-4.12.0-testing/tools/libxl/libxlu_disk_l.l @@ -230,6 +230,8 @@ target=.* { STRIP(','); SAVESTRING("targ free(newscript); } @@ -115,11 +115,11 @@ tapdisk:/.* { DPC->had_depr_prefix=1; DEPRECATE(0); } tap2?:/.* { DPC->had_depr_prefix=1; DEPRECATE(0); } aio:/.* { DPC->had_depr_prefix=1; DEPRECATE(0); } -Index: xen-4.11.0-testing/tools/libxl/libxl_internal.h +Index: xen-4.12.0-testing/tools/libxl/libxl_internal.h =================================================================== ---- xen-4.11.0-testing.orig/tools/libxl/libxl_internal.h -+++ xen-4.11.0-testing/tools/libxl/libxl_internal.h -@@ -1772,6 +1772,10 @@ _hidden char *libxl__blktap_devpath(libx +--- xen-4.12.0-testing.orig/tools/libxl/libxl_internal.h ++++ xen-4.12.0-testing/tools/libxl/libxl_internal.h +@@ -1916,6 +1916,10 @@ _hidden char *libxl__blktap_devpath(libx */ _hidden int libxl__device_destroy_tapdisk(libxl__gc *gc, const char *params); ++++++ xen.stubdom.newlib.patch ++++++ --- /var/tmp/diff_new_pack.UAOhdK/_old 2019-02-06 15:46:11.255303957 +0100 +++ /var/tmp/diff_new_pack.UAOhdK/_new 2019-02-06 15:46:11.255303957 +0100 @@ -24,23 +24,23 @@ Signed-off-by: Olaf Hering <o...@aepfle.de> -Index: xen-4.11.0-testing/stubdom/Makefile +Index: xen-4.12.0-testing/stubdom/Makefile =================================================================== ---- xen-4.11.0-testing.orig/stubdom/Makefile -+++ xen-4.11.0-testing/stubdom/Makefile -@@ -87,6 +87,8 @@ newlib-$(NEWLIB_VERSION): newlib-$(NEWLI - patch -d $@ -p0 < newlib.patch +--- xen-4.12.0-testing.orig/stubdom/Makefile ++++ xen-4.12.0-testing/stubdom/Makefile +@@ -88,6 +88,8 @@ newlib-$(NEWLIB_VERSION): newlib-$(NEWLI patch -d $@ -p0 < newlib-chk.patch patch -d $@ -p1 < newlib-stdint-size_max-fix-from-1.17.0.patch + patch -d $@ -p1 < newlib-disable-texinfo.patch + patch -d $@ -p1 < newlib-cygmon-gmon.patch + patch -d $@ -p1 < newlib-makedoc.patch find $@ -type f | xargs perl -i.bak \ -pe 's/\b_(tzname|daylight|timezone)\b/$$1/g' touch $@ -Index: xen-4.11.0-testing/stubdom/newlib-cygmon-gmon.patch +Index: xen-4.12.0-testing/stubdom/newlib-cygmon-gmon.patch =================================================================== --- /dev/null -+++ xen-4.11.0-testing/stubdom/newlib-cygmon-gmon.patch ++++ xen-4.12.0-testing/stubdom/newlib-cygmon-gmon.patch @@ -0,0 +1,60 @@ + +I: A function uses a 'return;' statement, but has actually a value @@ -102,10 +102,10 @@ + moncontrol(mode) + int mode; + { -Index: xen-4.11.0-testing/stubdom/newlib-makedoc.patch +Index: xen-4.12.0-testing/stubdom/newlib-makedoc.patch =================================================================== --- /dev/null -+++ xen-4.11.0-testing/stubdom/newlib-makedoc.patch ++++ xen-4.12.0-testing/stubdom/newlib-makedoc.patch @@ -0,0 +1,10 @@ +--- newlib-1.16.0/newlib/doc/makedoc.c.orig 2015-04-08 11:56:39.283090914 +0200 ++++ newlib-1.16.0/newlib/doc/makedoc.c 2015-04-08 11:56:51.245227742 +0200
