Hello community,
here is the log from the commit of package xen for openSUSE:Factory checked in
at 2019-10-22 15:40:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xen (Old)
and /work/SRC/openSUSE:Factory/.xen.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xen"
Tue Oct 22 15:40:58 2019 rev:273 rq:741160 version:4.13.0_01
Changes:
--------
--- /work/SRC/openSUSE:Factory/xen/xen.changes 2019-10-14 14:53:06.774197611
+0200
+++ /work/SRC/openSUSE:Factory/.xen.new.2352/xen.changes 2019-10-22
15:41:54.485474805 +0200
@@ -1,0 +2,76 @@
+Mon Oct 14 09:01:47 MDT 2019 - carn...@suse.com
+
+- Update to Xen 4.13.0 RC1 release
+ xen-4.13.0-testing-src.tar.bz2
+- Drop patches contained in new tarball or invalid
+ 5ca7660f-x86-entry-drop-unused-includes.patch
+ 5cab2a6b-x86-ACPI-also-parse-AMD-tables-early.patch
+ 5cab2ab7-x86-IOMMU-introduce-init-ops.patch
+ 5cab2ae8-x86-IOMMU-abstract-iommu_supports_eim.patch
+ 5cab2b4e-x86-IOMMU-abstract-iommu_enable_x2apic_IR.patch
+ 5cab2b95-x86-IOMMU-initialize-iommu_ops-in.patch
+ 5cac9a4b-x86-IOMMU-abstract-adjust_vtd_irq_affinities.patch
+ 5cdeac7f-AMD-IOMMU-adjust-IOMMU-list-head-init.patch
+ 5cf8da09-adjust-sysdom-creation-call-earlier-on-x86.patch
+ 5d0cf4e4-AMD-IOMMU-initialize-IRQ-tasklet-once.patch
+ 5d149bb0-AMD-IOMMU-dont-add-IOMMUs.patch
+ 5d1b3fab-AMD-IOMMU-restrict-feature-logging.patch
+ 5d358508-x86-IRQ-desc-affinity-represents-request.patch
+ 5d358534-x86-IRQ-consolidate-arch-cpu_mask-use.patch
+ 5d358a67-AMD-IOMMU-pass-IOMMU-to-iterate_ivrs_entries-cb.patch
+ 5d358a92-AMD-IOMMU-pass-IOMMU-to-amd_iommu_alloc_intremap_table.patch
+ 5d39811c-x86-IOMMU-dont-restrict-IRQ-affinities.patch
+ 5d417813-AMD-IOMMU-bitfield-extended-features.patch
+ 5d417838-AMD-IOMMU-bitfield-control-reg.patch
+ 5d41785b-AMD-IOMMU-bitfield-IRTE.patch
+ 5d41787e-AMD-IOMMU-pass-IOMMU-to-gfu-intremap-entry.patch
+ 5d4178ad-AMD-IOMMU-128bit-non-guest-APIC-IRTE.patch
+ 5d4178fc-AMD-IOMMU-split-amd_iommu_init_one.patch
+ 5d41793f-AMD-IOMMU-allow-enabling-without-IRQ.patch
+ 5d417a16-AMD-IOMMU-adjust-IRQ-setup-for-x2APIC.patch
+ 5d417ab6-AMD-IOMMU-enable-x2APIC-mode.patch
+ 5d417b38-AMD-IOMMU-correct-IRTE-updating.patch
+ 5d417b6a-AMD-IOMMU-dont-needlessly-log-headers.patch
+ 5d419d49-x86-spec-ctrl-report-proper-status.patch
+ 5d43253c-x86-ucode-always-collect_cpu_info-at-boot.patch
+ 5d4a9d25-AMD-IOMMU-drop-not-found-message.patch
+ 5d4aa36f-x86-apic-enable-x2APIC-mode-earlier.patch
+ 5d4afa7a-credit2-fix-memory-leak.patch
+ 5d4d850a-introduce-bss-percpu-page-aligned.patch
+ 5d516531-x86-xpti-dont-leak-TSS-adjacent-data.patch
+ 5d5bf475-x86-PV-fix-handling-of-iommu-mappings.patch
+ 5d6524ca-x86-mm-correctly-init-M2P-entries.patch
+ 5d67ceaf-x86-properly-gate-PKU-clearing.patch
+ 5d70bfba-x86-shadow-dont-enable-with-too-small-allocation.patch
+ 5d779811-x86-fix-CPUID7-0-eax-levelling-MSR.patch
+ 5d77b40f-fix-hvm_all_ioreq_servers_add_vcpu-cleanup.patch
+ 5d80e7c0-AMD-IOMMU-free-shared-IRT-once.patch
+ 5d80e80d-AMD-IOMMU-valid-flag-for-IVRS-mappings.patch
+ 5d80e82e-AMD-IOMMU-alloc_intremap_table-callers-handle-errors.patch
+ 5d80e857-x86-PCI-read-MSI-X-table-entry-count-early.patch
+ 5d80ea13-vpci-honor-read-only-devices.patch
+ 5d89d8d9-libxc-x86-avoid-overflow-in-CPUID-APIC-ID.patch
+ 5d8b715f-ACPI-cpuidle-bump-max-num-of-states.patch
+ 5d8b72e5-AMD-IOMMU-dont-blindly-alloc-intremap-tables.patch
+ 5d8b730e-AMD-IOMMU-phantom-funcs-share-intremap-tables.patch
+ 5d8b733b-x86-PCI-read-max-MSI-vector-count-early.patch
+ 5d8b736d-AMD-IOMMU-replace-INTREMAP_ENTRIES.patch
+ 5d8b7393-AMD-IOMMU-restrict-intremap-table-sizes.patch
+ 5d9ee2a8-AMD-IOMMU-alloc-1-devtab-per-PCI-seg.patch
+ 5d9ee2f0-AMD-IOMMU-allocate_buffer-avoid-memset.patch
+ 5d9ee312-AMD-IOMMU-prefill-all-DTEs.patch
+ CVE-2014-0222-blktap-qcow1-validate-l2-table-size.patch
+ blktap2-no-uninit.patch
+ libxl.prepare-environment-for-domcreate_stream_done.patch
+ pygrub-python3-conversion.patch
+ fix-xenpvnetboot.patch
+
+-------------------------------------------------------------------
+Thu Oct 10 08:39:52 MDT 2019 - carn...@suse.com
+
+- bsc#1135799 - Partner-L3: Xen crashes on AMD ROME based machines
+ 5d9ee2a8-AMD-IOMMU-alloc-1-devtab-per-PCI-seg.patch
+ 5d9ee2f0-AMD-IOMMU-allocate_buffer-avoid-memset.patch
+ 5d9ee312-AMD-IOMMU-prefill-all-DTEs.patch
+
+-------------------------------------------------------------------
@@ -81,0 +158 @@
+- Drop 5d419d49-x86-spec-ctrl-facilities-report-wrong-status.patch
@@ -145 +222,6 @@
- xen-tools.etc_pollution.patch
+
+-------------------------------------------------------------------
+Thu Aug 1 13:10:39 MDT 2019 - carn...@suse.com
+
+- bsc#1143563 - Speculative mitigation facilities report wrong status
+ 5d419d49-x86-spec-ctrl-facilities-report-wrong-status.patch
@@ -198 +280,2 @@
-- bsc#1138294 - VUL-0: XSA-295: Unlimited Arm Atomics Operations
+- bsc#1138294 - VUL-0: CVE-2019-17349: XSA-295: Unlimited Arm
+ Atomics Operations
Old:
----
5ca7660f-x86-entry-drop-unused-includes.patch
5cab2a6b-x86-ACPI-also-parse-AMD-tables-early.patch
5cab2ab7-x86-IOMMU-introduce-init-ops.patch
5cab2ae8-x86-IOMMU-abstract-iommu_supports_eim.patch
5cab2b4e-x86-IOMMU-abstract-iommu_enable_x2apic_IR.patch
5cab2b95-x86-IOMMU-initialize-iommu_ops-in.patch
5cac9a4b-x86-IOMMU-abstract-adjust_vtd_irq_affinities.patch
5cdeac7f-AMD-IOMMU-adjust-IOMMU-list-head-init.patch
5cf8da09-adjust-sysdom-creation-call-earlier-on-x86.patch
5d0cf4e4-AMD-IOMMU-initialize-IRQ-tasklet-once.patch
5d149bb0-AMD-IOMMU-dont-add-IOMMUs.patch
5d1b3fab-AMD-IOMMU-restrict-feature-logging.patch
5d358508-x86-IRQ-desc-affinity-represents-request.patch
5d358534-x86-IRQ-consolidate-arch-cpu_mask-use.patch
5d358a67-AMD-IOMMU-pass-IOMMU-to-iterate_ivrs_entries-cb.patch
5d358a92-AMD-IOMMU-pass-IOMMU-to-amd_iommu_alloc_intremap_table.patch
5d39811c-x86-IOMMU-dont-restrict-IRQ-affinities.patch
5d417813-AMD-IOMMU-bitfield-extended-features.patch
5d417838-AMD-IOMMU-bitfield-control-reg.patch
5d41785b-AMD-IOMMU-bitfield-IRTE.patch
5d41787e-AMD-IOMMU-pass-IOMMU-to-gfu-intremap-entry.patch
5d4178ad-AMD-IOMMU-128bit-non-guest-APIC-IRTE.patch
5d4178fc-AMD-IOMMU-split-amd_iommu_init_one.patch
5d41793f-AMD-IOMMU-allow-enabling-without-IRQ.patch
5d417a16-AMD-IOMMU-adjust-IRQ-setup-for-x2APIC.patch
5d417ab6-AMD-IOMMU-enable-x2APIC-mode.patch
5d417b38-AMD-IOMMU-correct-IRTE-updating.patch
5d417b6a-AMD-IOMMU-dont-needlessly-log-headers.patch
5d419d49-x86-spec-ctrl-report-proper-status.patch
5d43253c-x86-ucode-always-collect_cpu_info-at-boot.patch
5d4a9d25-AMD-IOMMU-drop-not-found-message.patch
5d4aa36f-x86-apic-enable-x2APIC-mode-earlier.patch
5d4afa7a-credit2-fix-memory-leak.patch
5d4d850a-introduce-bss-percpu-page-aligned.patch
5d516531-x86-xpti-dont-leak-TSS-adjacent-data.patch
5d5bf475-x86-PV-fix-handling-of-iommu-mappings.patch
5d6524ca-x86-mm-correctly-init-M2P-entries.patch
5d67ceaf-x86-properly-gate-PKU-clearing.patch
5d70bfba-x86-shadow-dont-enable-with-too-small-allocation.patch
5d779811-x86-fix-CPUID7-0-eax-levelling-MSR.patch
5d77b40f-fix-hvm_all_ioreq_servers_add_vcpu-cleanup.patch
5d80e7c0-AMD-IOMMU-free-shared-IRT-once.patch
5d80e80d-AMD-IOMMU-valid-flag-for-IVRS-mappings.patch
5d80e82e-AMD-IOMMU-alloc_intremap_table-callers-handle-errors.patch
5d80e857-x86-PCI-read-MSI-X-table-entry-count-early.patch
5d80ea13-vpci-honor-read-only-devices.patch
5d89d8d9-libxc-x86-avoid-overflow-in-CPUID-APIC-ID.patch
5d8b715f-ACPI-cpuidle-bump-max-num-of-states.patch
5d8b72e5-AMD-IOMMU-dont-blindly-alloc-intremap-tables.patch
5d8b730e-AMD-IOMMU-phantom-funcs-share-intremap-tables.patch
5d8b733b-x86-PCI-read-max-MSI-vector-count-early.patch
5d8b736d-AMD-IOMMU-replace-INTREMAP_ENTRIES.patch
5d8b7393-AMD-IOMMU-restrict-intremap-table-sizes.patch
CVE-2014-0222-blktap-qcow1-validate-l2-table-size.patch
blktap2-no-uninit.patch
fix-xenpvnetboot.patch
libxl.prepare-environment-for-domcreate_stream_done.patch
pygrub-python3-conversion.patch
xen-4.12.1-testing-src.tar.bz2
xen-tools.etc_pollution.patch
New:
----
etc_pam.d_xen-api
xen-4.13.0-testing-src.tar.bz2
xenapiusers
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xen.spec ++++++
--- /var/tmp/diff_new_pack.cBeA09/_old 2019-10-22 15:41:56.541477148 +0200
+++ /var/tmp/diff_new_pack.cBeA09/_new 2019-10-22 15:41:56.541477148 +0200
@@ -24,8 +24,8 @@
Name: xen
ExclusiveArch: %ix86 x86_64 aarch64
-%define changeset 38667
-%define xen_build_dir xen-4.12.1-testing
+%define changeset 40015
+%define xen_build_dir xen-4.13.0-testing
#
%define with_gdbsx 0
%define with_dom0_support 0
@@ -127,12 +127,12 @@
BuildRequires: pesign-obs-integration
%endif
-Version: 4.12.1_02
+Version: 4.13.0_01
Release: 0
Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel)
License: GPL-2.0-only
Group: System/Kernel
-Source0: xen-4.12.1-testing-src.tar.bz2
+Source0: xen-4.13.0-testing-src.tar.bz2
Source1: stubdom.tar.bz2
Source5: ipxe.tar.bz2
Source6: mini-os.tar.bz2
@@ -147,6 +147,9 @@
Source23: block-npiv-vport
Source26: init.xen_loop
Source29: block-dmmd
+# Xen API remote authentication sources
+Source30: etc_pam.d_xen-api
+Source31: xenapiusers
# Init script and sysconf file for pciback
Source34: init.pciback
Source35: sysconfig.pciback
@@ -159,60 +162,6 @@
# For xen-libs
Source99: baselibs.conf
# Upstream patches
-Patch1: 5d419d49-x86-spec-ctrl-report-proper-status.patch
-Patch2: 5d43253c-x86-ucode-always-collect_cpu_info-at-boot.patch
-Patch3: 5d4aa36f-x86-apic-enable-x2APIC-mode-earlier.patch
-Patch4: 5d4afa7a-credit2-fix-memory-leak.patch
-Patch5: 5d4d850a-introduce-bss-percpu-page-aligned.patch
-Patch6: 5d516531-x86-xpti-dont-leak-TSS-adjacent-data.patch
-Patch7: 5d5bf475-x86-PV-fix-handling-of-iommu-mappings.patch
-Patch8: 5d6524ca-x86-mm-correctly-init-M2P-entries.patch
-Patch9: 5d67ceaf-x86-properly-gate-PKU-clearing.patch
-Patch10: 5d70bfba-x86-shadow-dont-enable-with-too-small-allocation.patch
-Patch11: 5d779811-x86-fix-CPUID7-0-eax-levelling-MSR.patch
-Patch12: 5d77b40f-fix-hvm_all_ioreq_servers_add_vcpu-cleanup.patch
-Patch13: 5d80ea13-vpci-honor-read-only-devices.patch
-Patch14: 5d89d8d9-libxc-x86-avoid-overflow-in-CPUID-APIC-ID.patch
-Patch15: 5d8b715f-ACPI-cpuidle-bump-max-num-of-states.patch
-# AMD x2APIC
-Patch301: 5ca7660f-x86-entry-drop-unused-includes.patch
-Patch302: 5cf8da09-adjust-sysdom-creation-call-earlier-on-x86.patch
-Patch303: 5cab2a6b-x86-ACPI-also-parse-AMD-tables-early.patch
-Patch304: 5cab2ab7-x86-IOMMU-introduce-init-ops.patch
-Patch305: 5cab2ae8-x86-IOMMU-abstract-iommu_supports_eim.patch
-Patch306: 5cab2b4e-x86-IOMMU-abstract-iommu_enable_x2apic_IR.patch
-Patch307: 5cab2b95-x86-IOMMU-initialize-iommu_ops-in.patch
-Patch308: 5cac9a4b-x86-IOMMU-abstract-adjust_vtd_irq_affinities.patch
-Patch309: 5cdeac7f-AMD-IOMMU-adjust-IOMMU-list-head-init.patch
-Patch310: 5d0cf4e4-AMD-IOMMU-initialize-IRQ-tasklet-once.patch
-Patch311: 5d149bb0-AMD-IOMMU-dont-add-IOMMUs.patch
-Patch312: 5d1b3fab-AMD-IOMMU-restrict-feature-logging.patch
-Patch313: 5d358508-x86-IRQ-desc-affinity-represents-request.patch
-Patch314: 5d358534-x86-IRQ-consolidate-arch-cpu_mask-use.patch
-Patch315: 5d358a67-AMD-IOMMU-pass-IOMMU-to-iterate_ivrs_entries-cb.patch
-Patch316:
5d358a92-AMD-IOMMU-pass-IOMMU-to-amd_iommu_alloc_intremap_table.patch
-Patch317: 5d39811c-x86-IOMMU-dont-restrict-IRQ-affinities.patch
-Patch318: 5d417813-AMD-IOMMU-bitfield-extended-features.patch
-Patch319: 5d417838-AMD-IOMMU-bitfield-control-reg.patch
-Patch320: 5d41785b-AMD-IOMMU-bitfield-IRTE.patch
-Patch321: 5d41787e-AMD-IOMMU-pass-IOMMU-to-gfu-intremap-entry.patch
-Patch322: 5d4178ad-AMD-IOMMU-128bit-non-guest-APIC-IRTE.patch
-Patch323: 5d4178fc-AMD-IOMMU-split-amd_iommu_init_one.patch
-Patch324: 5d41793f-AMD-IOMMU-allow-enabling-without-IRQ.patch
-Patch325: 5d417a16-AMD-IOMMU-adjust-IRQ-setup-for-x2APIC.patch
-Patch326: 5d417ab6-AMD-IOMMU-enable-x2APIC-mode.patch
-Patch327: 5d417b38-AMD-IOMMU-correct-IRTE-updating.patch
-Patch328: 5d417b6a-AMD-IOMMU-dont-needlessly-log-headers.patch
-Patch329: 5d4a9d25-AMD-IOMMU-drop-not-found-message.patch
-Patch330: 5d80e7c0-AMD-IOMMU-free-shared-IRT-once.patch
-Patch331: 5d80e80d-AMD-IOMMU-valid-flag-for-IVRS-mappings.patch
-Patch332:
5d80e82e-AMD-IOMMU-alloc_intremap_table-callers-handle-errors.patch
-Patch333: 5d80e857-x86-PCI-read-MSI-X-table-entry-count-early.patch
-Patch334: 5d8b72e5-AMD-IOMMU-dont-blindly-alloc-intremap-tables.patch
-Patch335: 5d8b730e-AMD-IOMMU-phantom-funcs-share-intremap-tables.patch
-Patch336: 5d8b733b-x86-PCI-read-max-MSI-vector-count-early.patch
-Patch337: 5d8b736d-AMD-IOMMU-replace-INTREMAP_ENTRIES.patch
-Patch338: 5d8b7393-AMD-IOMMU-restrict-intremap-table-sizes.patch
# Our platform specific patches
Patch400: xen-destdir.patch
Patch401: vif-bridge-no-iptables.patch
@@ -226,7 +175,6 @@
Patch409: xenstore-launch.patch
# Needs to go upstream
Patch420: suspend_evtchn_lock.patch
-Patch421: xen-tools.etc_pollution.patch
Patch422: stubdom-have-iovec.patch
Patch423: vif-route.patch
# Other bug fixes or features
@@ -239,23 +187,18 @@
Patch457: pygrub-handle-one-line-menu-entries.patch
Patch458: aarch64-rename-PSR_MODE_ELxx-to-match-linux-headers.patch
Patch459: aarch64-maybe-uninitialized.patch
-Patch460: CVE-2014-0222-blktap-qcow1-validate-l2-table-size.patch
-Patch461: blktap2-no-uninit.patch
Patch462: libxc.sr.superpage.patch
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
-Patch468: libxl.prepare-environment-for-domcreate_stream_done.patch
Patch469: libxl.helper_done-crash.patch
Patch470: libxl.LIBXL_HOTPLUG_TIMEOUT.patch
# python3 conversion patches
Patch500: build-python3-conversion.patch
-Patch501: pygrub-python3-conversion.patch
-Patch502: migration-python3-conversion.patch
-Patch503: bin-python3-conversion.patch
-Patch504: fix-xenpvnetboot.patch
+Patch501: migration-python3-conversion.patch
+Patch502: bin-python3-conversion.patch
# Hypervisor and PV driver Patches
Patch600: xen.bug1026236.suse_vtsc_tolerance.patch
Patch601: x86-ioapic-ack-default.patch
@@ -413,59 +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
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch301 -p1
-%patch302 -p1
-%patch303 -p1
-%patch304 -p1
-%patch305 -p1
-%patch306 -p1
-%patch307 -p1
-%patch308 -p1
-%patch309 -p1
-%patch310 -p1
-%patch311 -p1
-%patch312 -p1
-%patch313 -p1
-%patch314 -p1
-%patch315 -p1
-%patch316 -p1
-%patch317 -p1
-%patch318 -p1
-%patch319 -p1
-%patch320 -p1
-%patch321 -p1
-%patch322 -p1
-%patch323 -p1
-%patch324 -p1
-%patch325 -p1
-%patch326 -p1
-%patch327 -p1
-%patch328 -p1
-%patch329 -p1
-%patch330 -p1
-%patch331 -p1
-%patch332 -p1
-%patch333 -p1
-%patch334 -p1
-%patch335 -p1
-%patch336 -p1
-%patch337 -p1
-%patch338 -p1
# Our platform specific patches
%patch400 -p1
%patch401 -p1
@@ -479,7 +369,6 @@
%patch409 -p1
# Needs to go upstream
%patch420 -p1
-%patch421 -p1
%patch422 -p1
%patch423 -p1
# Other bug fixes or features
@@ -492,23 +381,18 @@
%patch457 -p1
%patch458 -p1
%patch459 -p1
-%patch460 -p1
-%patch461 -p1
%patch462 -p1
%patch463 -p1
%patch464 -p1
%patch465 -p1
%patch466 -p1
%patch467 -p1
-%patch468 -p1
%patch469 -p1
%patch470 -p1
# python3 conversion patches
%patch500 -p1
%patch501 -p1
%patch502 -p1
-%patch503 -p1
-%patch504 -p1
# Hypervisor and PV driver Patches
%patch600 -p1
%patch601 -p1
@@ -631,10 +515,8 @@
DESTDIR=%{buildroot} \
SYSCONFIG_DIR=%{_fillupdir} \
PKG_INSTALLDIR=%{_libdir}/pkgconfig \
- BASH_COMPLETION_DIR=%{_datadir}/bash-completion/completions \
%{?_smp_mflags} \
install
-rm -rfv %{buildroot}/etc/xen
find %{buildroot} -ls
for i in %{buildroot}/%{_fillupdir}/*
do
@@ -896,21 +778,31 @@
install -m 644 docs/misc/$name %{buildroot}/%{_defaultdocdir}/xen/misc/
done
-mkdir -p %{buildroot}/lib/modprobe.d
-install -m644 %SOURCE26 %{buildroot}/lib/modprobe.d/xen_loop.conf
+mkdir -p %{buildroot}/etc/modprobe.d
+install -m644 %SOURCE26 %{buildroot}/etc/modprobe.d/xen_loop.conf
# xen-utils
make -C tools/xen-utils-0.1 install DESTDIR=%{buildroot} XEN_INTREE_BUILD=yes
XEN_ROOT=$PWD
install -m755 %SOURCE37 %{buildroot}/usr/sbin/xen2libvirt
-install -D -m644 tools/xentrace/formats
%{buildroot}%{_datadir}/xen/xentrace_formats.txt
+rm -f %{buildroot}/etc/xen/README*
+# Example config
+mkdir -p %{buildroot}/etc/xen/{vm,examples,scripts}
+mv %{buildroot}/etc/xen/xlexample* %{buildroot}/etc/xen/examples
+rm -f %{buildroot}/etc/xen/examples/*nbd
+install -m644 tools/xentrace/formats
%{buildroot}/etc/xen/examples/xentrace_formats.txt
# Scripts
-rm -f %{buildroot}%{_libexecdir}/xen/scripts/block-*nbd
-install -m755 %SOURCE21 %SOURCE22 %SOURCE23 %SOURCE29
%{buildroot}%{_libexecdir}/xen/scripts/
+rm -f %{buildroot}/etc/xen/scripts/block-*nbd
+install -m755 %SOURCE21 %SOURCE22 %SOURCE23 %SOURCE29
%{buildroot}/etc/xen/scripts/
mkdir -p %{buildroot}/usr/lib/supportconfig/plugins
install -m 755 %SOURCE13 %{buildroot}/usr/lib/supportconfig/plugins/xen
+# Xen API remote authentication files
+install -d %{buildroot}/etc/pam.d
+install -m644 %SOURCE30 %{buildroot}/etc/pam.d/xen-api
+install -m644 %SOURCE31 %{buildroot}/etc/xen/
+
# Logrotate
install -m644 -D %SOURCE15 %{buildroot}/etc/logrotate.d/xen
@@ -937,35 +829,10 @@
echo -n > $conf
done
`"
-> mods
for mod in $mods
do
- # load by alias, if possible, to handle pvops and xenlinux
- alias="$mod"
- case "$mod" in
- xen-evtchn) ;;
- xen-gntdev) ;;
- xen-gntalloc) ;;
- xen-blkback) alias='xen-backend:vbd' ;;
- xen-netback) alias='xen-backend:vif' ;;
- xen-pciback) alias='xen-backend:pci' ;;
- evtchn) unset alias ;;
- gntdev) unset alias ;;
- netbk) alias='xen-backend:vif' ;;
- blkbk) alias='xen-backend:vbd' ;;
- xen-scsibk) unset alias ;;
- usbbk) unset alias ;;
- pciback) alias='xen-backend:pci' ;;
- xen-acpi-processor) ;;
- blktap2) unset alias ;;
- *) ;;
- esac
- if test -n "${alias}"
- then
- echo "ExecStart=-/bin/sh -c 'modprobe $alias || :'" >> mods
- fi
+ echo "ExecStart=-/bin/sh -c 'modprobe $mod || :'" >>
%{buildroot}/%{_unitdir}/${bn}
done
-sort -u mods | tee -a %{buildroot}/%{_unitdir}/${bn}
rm -rfv %{buildroot}/%{_initddir}
install -m644 %SOURCE35 %{buildroot}/%{_fillupdir}/sysconfig.pciback
@@ -983,6 +850,7 @@
-name qemu-img-xen -o \
-name qemu-nbd-xen -o \
-name palcode-clipper -o \
+ -name xen-shim-syms -o \
-name "*.dtb" -o \
-name "openbios-*" -o \
-name "petalogix*" -o \
@@ -1010,7 +878,8 @@
# !with_dom0_support
# 32 bit hypervisor no longer supported. Remove dom0 tools.
-rm -rf %{buildroot}/%{_datadir}
+rm -rf %{buildroot}/%{_datadir}/doc
+rm -rf %{buildroot}/%{_datadir}/man
rm -rf %{buildroot}/%{_libdir}/xen
rm -rf %{buildroot}/%{_libdir}/python*
rm -rf %{buildroot}/%{_libdir}/ocaml*
@@ -1060,6 +929,7 @@
/usr/bin/xentrace_format
%ifarch x86_64
/usr/bin/xen-cpuid
+/usr/sbin/xen-ucode
%endif
/usr/sbin/xenbaked
/usr/sbin/xenconsoled
@@ -1070,7 +940,6 @@
/usr/sbin/xenpm
/usr/sbin/xenpmd
/usr/sbin/xenstored
-/usr/sbin/xen-tmem-list-parse
/usr/sbin/xentop
/usr/sbin/xentrace
/usr/sbin/xentrace_setsize
@@ -1098,21 +967,22 @@
/usr/sbin/xen-destroy
/usr/sbin/xen-livepatch
/usr/sbin/xen-diag
-%dir %{_libexecdir}/xen/scripts
-%{_libexecdir}/xen/scripts/block*
-%{_libexecdir}/xen/scripts/external-device-migrate
-%{_libexecdir}/xen/scripts/hotplugpath.sh
-%{_libexecdir}/xen/scripts/launch-xenstore
-%{_libexecdir}/xen/scripts/locking.sh
-%{_libexecdir}/xen/scripts/logging.sh
-%{_libexecdir}/xen/scripts/vif2
-%{_libexecdir}/xen/scripts/vif-*
-%{_libexecdir}/xen/scripts/vscsi
-%{_libexecdir}/xen/scripts/xen-hotplug-*
-%{_libexecdir}/xen/scripts/xen-network-common.sh
-%{_libexecdir}/xen/scripts/xen-script-common.sh
-%{_libexecdir}/xen/scripts/colo-proxy-setup
-%{_libexecdir}/xen/scripts/remus-netbuf-setup
+%dir %attr(700,root,root) /etc/xen
+%dir /etc/xen/scripts
+/etc/xen/scripts/block*
+/etc/xen/scripts/external-device-migrate
+/etc/xen/scripts/hotplugpath.sh
+/etc/xen/scripts/launch-xenstore
+/etc/xen/scripts/locking.sh
+/etc/xen/scripts/logging.sh
+/etc/xen/scripts/vif2
+/etc/xen/scripts/vif-*
+/etc/xen/scripts/vscsi
+/etc/xen/scripts/xen-hotplug-*
+/etc/xen/scripts/xen-network-common.sh
+/etc/xen/scripts/xen-script-common.sh
+/etc/xen/scripts/colo-proxy-setup
+/etc/xen/scripts/remus-netbuf-setup
%dir /usr/lib/supportconfig
%dir /usr/lib/supportconfig/plugins
/usr/lib/supportconfig/plugins/xen
@@ -1132,13 +1002,19 @@
%dir /var/log/xen
%dir /var/log/xen/console
%config /etc/logrotate.d/xen
-%dir /lib/modprobe.d
-/lib/modprobe.d/xen_loop.conf
+/etc/xen/auto
+%config /etc/xen/examples
+%config /etc/xen/cpupool
+%config /etc/xen/vm
+%config(noreplace) /etc/xen/xenapiusers
+%config(noreplace) /etc/xen/xl.conf
+%config /etc/pam.d/xen-api
+%config /etc/modprobe.d/xen_loop.conf
%config %{_unitdir}
%exclude %{_unitdir}/%{name}-vcpu-watch.service
%config %{with_systemd_modules_load}
-%{_datadir}/bash-completion
-%{_datadir}/xen
+%dir /etc/modprobe.d
+/etc/bash_completion.d/xl.sh
%dir %{_libdir}/python%{pyver}/site-packages/grub
%dir %{_libdir}/python%{pyver}/site-packages/xen
%dir %{_libdir}/python%{pyver}/site-packages/xen/lowlevel
@@ -1158,6 +1034,7 @@
%if %{with xen_oxenstored}
/usr/sbin/oxenstored
+/etc/xen/oxenstored.conf
%dir %{_libdir}/ocaml
%dir %{_libdir}/ocaml/xenbus
%dir %{_libdir}/ocaml/xenctrl
@@ -1269,17 +1146,6 @@
fi
%pre tools
-for empty_config_file in \
- logrotate.d/xen \
- modprobe.d/xen_loop.conf \
- pam.d/xen-api \
- xen/cpupool \
- xen/xenapiusers \
- xen/xl.conf
-do
- test -f /etc/${empty_config_file}.rpmsave && mv -v
/etc/${empty_config_file}.rpmsave /etc/${empty_config_file}.rpmsave.old ||:
-done
-
%service_add_pre xencommons.service
%service_add_pre xendomains.service
%service_add_pre xen-watchdog.service
@@ -1351,18 +1217,6 @@
%service_del_postun xen-init-dom0.service
%service_del_postun xen-qemu-dom0-disk-backend.service
-%posttrans tools
-for empty_config_file in \
- logrotate.d/xen \
- modprobe.d/xen_loop.conf \
- pam.d/xen-api \
- xen/cpupool \
- xen/xenapiusers \
- xen/xl.conf
-do
- test -f /etc/${empty_config_file}.rpmsave && mv -v
/etc/${empty_config_file}.rpmsave /etc/${empty_config_file}
-done
-
%endif
%post libs -p /sbin/ldconfig
++++++ aarch64-rename-PSR_MODE_ELxx-to-match-linux-headers.patch ++++++
--- /var/tmp/diff_new_pack.cBeA09/_old 2019-10-22 15:41:56.581477194 +0200
+++ /var/tmp/diff_new_pack.cBeA09/_new 2019-10-22 15:41:56.581477194 +0200
@@ -10,11 +10,11 @@
xen/include/public/arch-arm.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
-Index: xen-4.10.0-testing/xen/include/public/arch-arm.h
+Index: xen-4.13.0-testing/xen/include/public/arch-arm.h
===================================================================
---- 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;
+--- xen-4.13.0-testing.orig/xen/include/public/arch-arm.h
++++ xen-4.13.0-testing/xen/include/public/arch-arm.h
+@@ -371,13 +371,13 @@ typedef uint64_t xen_callback_t;
/* 64 bit modes */
#define PSR_MODE_BIT 0x10 /* Set iff AArch32 */
++++++ bin-python3-conversion.patch ++++++
--- /var/tmp/diff_new_pack.cBeA09/_old 2019-10-22 15:41:56.597477212 +0200
+++ /var/tmp/diff_new_pack.cBeA09/_new 2019-10-22 15:41:56.597477212 +0200
@@ -1,7 +1,7 @@
-Index: xen-4.10.0-testing/tools/misc/xencons
+Index: xen-4.13.0-testing/tools/misc/xencons
===================================================================
---- xen-4.10.0-testing.orig/tools/misc/xencons
-+++ xen-4.10.0-testing/tools/misc/xencons
+--- xen-4.13.0-testing.orig/tools/misc/xencons
++++ xen-4.13.0-testing/tools/misc/xencons
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
@@ -67,10 +67,10 @@
+ print(sys.argv[0] + " <host> <port>")
sys.exit(1)
connect(str(sys.argv[1]),int(sys.argv[2]))
-Index: xen-4.10.0-testing/tools/misc/xencov_split
+Index: xen-4.13.0-testing/tools/misc/xencov_split
===================================================================
---- xen-4.10.0-testing.orig/tools/misc/xencov_split
-+++ xen-4.10.0-testing/tools/misc/xencov_split
+--- xen-4.13.0-testing.orig/tools/misc/xencov_split
++++ xen-4.13.0-testing/tools/misc/xencov_split
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
@@ -97,10 +97,10 @@
sys.exit(1)
except KeyboardInterrupt:
sys.exit(1)
-Index: xen-4.10.0-testing/tools/misc/xenpvnetboot
+Index: xen-4.13.0-testing/tools/misc/xenpvnetboot
===================================================================
---- xen-4.10.0-testing.orig/tools/misc/xenpvnetboot
-+++ xen-4.10.0-testing/tools/misc/xenpvnetboot
+--- xen-4.13.0-testing.orig/tools/misc/xenpvnetboot
++++ xen-4.13.0-testing/tools/misc/xenpvnetboot
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
@@ -224,10 +224,10 @@
sys.exit(1)
sys.stdout.flush()
-Index: xen-4.10.0-testing/tools/python/scripts/convert-legacy-stream
+Index: xen-4.13.0-testing/tools/python/scripts/convert-legacy-stream
===================================================================
---- xen-4.10.0-testing.orig/tools/python/scripts/convert-legacy-stream
-+++ xen-4.10.0-testing/tools/python/scripts/convert-legacy-stream
+--- xen-4.13.0-testing.orig/tools/python/scripts/convert-legacy-stream
++++ xen-4.13.0-testing/tools/python/scripts/convert-legacy-stream
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
@@ -272,10 +272,10 @@
sys.exit(e.code)
except KeyboardInterrupt:
sys.exit(1)
-Index: xen-4.10.0-testing/tools/python/scripts/verify-stream-v2
+Index: xen-4.13.0-testing/tools/python/scripts/verify-stream-v2
===================================================================
---- xen-4.10.0-testing.orig/tools/python/scripts/verify-stream-v2
-+++ xen-4.10.0-testing/tools/python/scripts/verify-stream-v2
+--- xen-4.13.0-testing.orig/tools/python/scripts/verify-stream-v2
++++ xen-4.13.0-testing/tools/python/scripts/verify-stream-v2
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
@@ -327,40 +327,20 @@
sys.exit(e.code)
except KeyboardInterrupt:
sys.exit(2)
-Index: xen-4.10.0-testing/tools/xenmon/xenmon.py
+Index: xen-4.13.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
+--- xen-4.13.0-testing.orig/tools/xenmon/xenmon.py
++++ xen-4.13.0-testing/tools/xenmon/xenmon.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
#####################################################################
# xenmon is a front-end for xenbaked.
-@@ -248,8 +248,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 +704,7 @@ def main():
- try:
- writelog()
- except:
-- print 'Quitting.'
-+ print('Quitting.')
- stop_xenbaked()
-
- if __name__ == "__main__":
-Index: xen-4.10.0-testing/tools/xentrace/xentrace_format
+Index: xen-4.13.0-testing/tools/xentrace/xentrace_format
===================================================================
---- xen-4.10.0-testing.orig/tools/xentrace/xentrace_format
-+++ xen-4.10.0-testing/tools/xentrace/xentrace_format
+--- xen-4.13.0-testing.orig/tools/xentrace/xentrace_format
++++ xen-4.13.0-testing/tools/xentrace/xentrace_format
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
++++++ build-python3-conversion.patch ++++++
++++ 617 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/xen/build-python3-conversion.patch
++++ and /work/SRC/openSUSE:Factory/.xen.new.2352/build-python3-conversion.patch
++++++ disable-building-pv-shim.patch ++++++
--- /var/tmp/diff_new_pack.cBeA09/_old 2019-10-22 15:41:56.669477294 +0200
+++ /var/tmp/diff_new_pack.cBeA09/_new 2019-10-22 15:41:56.673477299 +0200
@@ -1,11 +1,13 @@
---- xen-4.11.0-testing/tools/firmware/Makefile.orig 2018-04-20
10:41:02.186884556 -0600
-+++ xen-4.11.0-testing/tools/firmware/Makefile 2018-04-20 10:41:24.675182540
-0600
-@@ -2,7 +2,7 @@ XEN_ROOT = $(CURDIR)/../..
- include $(XEN_ROOT)/tools/Rules.mk
-
- ifneq ($(XEN_TARGET_ARCH),x86_32)
--CONFIG_PV_SHIM := y
-+CONFIG_PV_SHIM := n
- endif
-
- # hvmloader is a 32-bit protected mode binary.
+--- xen-4.13.0-testing/xen/arch/x86/configs/pvshim_defconfig.orig
2019-10-14 09:46:44.567846243 -0600
++++ xen-4.13.0-testing/xen/arch/x86/configs/pvshim_defconfig 2019-10-14
09:47:17.722552005 -0600
+@@ -2,8 +2,8 @@
+ CONFIG_PV=y
+ CONFIG_XEN_GUEST=y
+ CONFIG_PVH_GUEST=y
+-CONFIG_PV_SHIM=y
+-CONFIG_PV_SHIM_EXCLUSIVE=y
++CONFIG_PV_SHIM=n
++CONFIG_PV_SHIM_EXCLUSIVE=n
+ CONFIG_NR_CPUS=32
+ # Disable features not used by the PV shim
+ # CONFIG_SHADOW_PAGING is not set
++++++ etc_pam.d_xen-api ++++++
#%PAM-1.0
auth required pam_listfile.so onerr=fail item=user \
sense=allow file=/etc/xen/xenapiusers
auth include common-auth
account include common-account
password include common-password
session include common-session
++++++ libxl.LIBXL_HOTPLUG_TIMEOUT.patch ++++++
--- /var/tmp/diff_new_pack.cBeA09/_old 2019-10-22 15:41:56.721477353 +0200
+++ /var/tmp/diff_new_pack.cBeA09/_new 2019-10-22 15:41:56.721477353 +0200
@@ -52,8 +52,10 @@
The change for libxl which handles this xenstore value will enable
additional logging if the key is found. That extra logging will show how
the execution time of each script.
---- a/tools/libxl/libxl_aoutils.c
-+++ b/tools/libxl/libxl_aoutils.c
+Index: xen-4.13.0-testing/tools/libxl/libxl_aoutils.c
+===================================================================
+--- xen-4.13.0-testing.orig/tools/libxl/libxl_aoutils.c
++++ xen-4.13.0-testing/tools/libxl/libxl_aoutils.c
@@ -529,6 +529,8 @@ static void async_exec_timeout(libxl__eg
{
libxl__async_exec_state *aes = CONTAINER_OF(ev, *aes, time);
@@ -83,9 +85,11 @@
libxl__ev_time_deregister(gc, &aes->time);
---- a/tools/libxl/libxl_create.c
-+++ b/tools/libxl/libxl_create.c
-@@ -986,6 +986,7 @@ static void initiate_domain_create(libxl
+Index: xen-4.13.0-testing/tools/libxl/libxl_create.c
+===================================================================
+--- xen-4.13.0-testing.orig/tools/libxl/libxl_create.c
++++ xen-4.13.0-testing/tools/libxl/libxl_create.c
+@@ -1024,6 +1024,7 @@ static void initiate_domain_create(libxl
* build info around just to know if the domain has a device model or not.
*/
store_libxl_entry(gc, domid, &d_config->b_info);
@@ -93,9 +97,11 @@
for (i = 0; i < d_config->num_disks; i++) {
ret = libxl__disk_devtype.set_default(gc, domid, &d_config->disks[i],
---- a/tools/libxl/libxl_device.c
-+++ b/tools/libxl/libxl_device.c
-@@ -1244,7 +1244,7 @@ static void device_hotplug(libxl__egc *e
+Index: xen-4.13.0-testing/tools/libxl/libxl_device.c
+===================================================================
+--- xen-4.13.0-testing.orig/tools/libxl/libxl_device.c
++++ xen-4.13.0-testing/tools/libxl/libxl_device.c
+@@ -1212,7 +1212,7 @@ static void device_hotplug(libxl__egc *e
}
aes->ao = ao;
@@ -104,7 +110,7 @@
aes->env = env;
aes->args = args;
aes->callback = device_hotplug_child_death_cb;
-@@ -1253,6 +1253,15 @@ static void device_hotplug(libxl__egc *e
+@@ -1221,6 +1221,15 @@ static void device_hotplug(libxl__egc *e
aes->stdfds[1] = 2;
aes->stdfds[2] = -1;
@@ -120,8 +126,10 @@
rc = libxl__async_exec_start(aes);
if (rc)
goto out;
---- a/tools/libxl/libxl_event.c
-+++ b/tools/libxl/libxl_event.c
+Index: xen-4.13.0-testing/tools/libxl/libxl_event.c
+===================================================================
+--- xen-4.13.0-testing.orig/tools/libxl/libxl_event.c
++++ xen-4.13.0-testing/tools/libxl/libxl_event.c
@@ -858,27 +858,29 @@ static void devstate_callback(libxl__egc
{
EGC_GC;
@@ -168,8 +176,10 @@
rc = libxl__xswait_start(gc, &ds->w);
if (rc) goto out;
---- a/tools/libxl/libxl_internal.c
-+++ b/tools/libxl/libxl_internal.c
+Index: xen-4.13.0-testing/tools/libxl/libxl_internal.c
+===================================================================
+--- xen-4.13.0-testing.orig/tools/libxl/libxl_internal.c
++++ xen-4.13.0-testing/tools/libxl/libxl_internal.c
@@ -17,6 +17,97 @@
#include "libxl_internal.h"
@@ -268,8 +278,10 @@
void libxl__alloc_failed(libxl_ctx *ctx, const char *func,
size_t nmemb, size_t size) {
#define M "libxl: FATAL ERROR: memory allocation failure"
---- a/tools/libxl/libxl_internal.h
-+++ b/tools/libxl/libxl_internal.h
+Index: xen-4.13.0-testing/tools/libxl/libxl_internal.h
+===================================================================
+--- xen-4.13.0-testing.orig/tools/libxl/libxl_internal.h
++++ xen-4.13.0-testing/tools/libxl/libxl_internal.h
@@ -50,6 +50,7 @@
#include <sys/un.h>
#include <sys/file.h>
@@ -278,7 +290,7 @@
#include <xenevtchn.h>
#include <xenstore.h>
-@@ -1442,6 +1443,7 @@ struct libxl__xswait_state {
+@@ -1496,6 +1497,7 @@ struct libxl__xswait_state {
const char *what; /* for error msgs: noun phrase, what we're waiting for
*/
const char *path;
int timeout_ms; /* as for poll(2) */
@@ -286,7 +298,7 @@
libxl__xswait_callback *callback;
/* remaining fields are private to xswait */
libxl__ev_time time_ev;
-@@ -2547,6 +2549,7 @@ struct libxl__async_exec_state {
+@@ -2554,6 +2556,7 @@ struct libxl__async_exec_state {
char **args; /* execution arguments */
char **env; /* execution environment */
@@ -294,8 +306,8 @@
/* private */
libxl__ev_time time;
libxl__ev_child child;
-@@ -4627,6 +4630,9 @@ static inline const char *libxl__qemu_qm
- }
+@@ -4732,6 +4735,9 @@ _hidden int libxl__domain_pvcontrol(libx
+
#endif
+_hidden void libxl__suse_domain_set_hotplug_timeout(libxl__gc *gc, uint32_t
domid, long d, long n);
++++++ libxl.add-option-to-disable-disk-cache-flushes-in-qdisk.patch ++++++
--- /var/tmp/diff_new_pack.cBeA09/_old 2019-10-22 15:41:56.733477367 +0200
+++ /var/tmp/diff_new_pack.cBeA09/_new 2019-10-22 15:41:56.733477367 +0200
@@ -7,10 +7,10 @@
tools/libxl/libxlu_disk_l.l | 1 +
5 files changed, 18 insertions(+), 1 deletion(-)
-Index: xen-4.12.0-testing/docs/man/xl-disk-configuration.5.pod
+Index: xen-4.13.0-testing/docs/man/xl-disk-configuration.5.pod
===================================================================
---- 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
+--- xen-4.13.0-testing.orig/docs/man/xl-disk-configuration.5.pod
++++ xen-4.13.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.12.0-testing/tools/libxl/libxl.h
+Index: xen-4.13.0-testing/tools/libxl/libxl.h
===================================================================
---- 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
+--- xen-4.13.0-testing.orig/tools/libxl/libxl.h
++++ xen-4.13.0-testing/tools/libxl/libxl.h
+@@ -430,6 +430,21 @@
+ #define LIBXL_HAVE_CREATEINFO_PASSTHROUGH 1
/*
+ * The libxl_device_disk has no way to indicate that cache=unsafe is
@@ -70,11 +70,11 @@
* libxl ABI compatibility
*
* The only guarantee which libxl makes regarding ABI compatibility
-Index: xen-4.12.0-testing/tools/libxl/libxl_disk.c
+Index: xen-4.13.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 *
+--- xen-4.13.0-testing.orig/tools/libxl/libxl_disk.c
++++ xen-4.13.0-testing/tools/libxl/libxl_disk.c
+@@ -386,6 +386,8 @@ static void device_disk_add(libxl__egc *
flexarray_append_pair(back, "discard-enable",
libxl_defbool_val(disk->discard_enable) ?
"1" : "0");
@@ -83,10 +83,10 @@
flexarray_append(front, "backend-id");
flexarray_append(front, GCSPRINTF("%d", disk->backend_domid));
-Index: xen-4.12.0-testing/tools/libxl/libxl_dm.c
+Index: xen-4.13.0-testing/tools/libxl/libxl_dm.c
===================================================================
---- xen-4.12.0-testing.orig/tools/libxl/libxl_dm.c
-+++ xen-4.12.0-testing/tools/libxl/libxl_dm.c
+--- xen-4.13.0-testing.orig/tools/libxl/libxl_dm.c
++++ xen-4.13.0-testing/tools/libxl/libxl_dm.c
@@ -984,14 +984,27 @@ enum {
LIBXL__COLO_SECONDARY,
};
@@ -164,7 +164,7 @@
break;
default:
abort();
-@@ -1890,8 +1905,8 @@ static int libxl__build_device_model_arg
+@@ -1881,8 +1896,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.12.0-testing/tools/libxl/libxlu_disk.c
+Index: xen-4.13.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
+--- xen-4.13.0-testing.orig/tools/libxl/libxlu_disk.c
++++ xen-4.13.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.12.0-testing/tools/libxl/libxlu_disk_i.h
+Index: xen-4.13.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
+--- xen-4.13.0-testing.orig/tools/libxl/libxlu_disk_i.h
++++ xen-4.13.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.12.0-testing/tools/libxl/libxlu_disk_l.l
+Index: xen-4.13.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
+--- xen-4.13.0-testing.orig/tools/libxl/libxlu_disk_l.l
++++ xen-4.13.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.cBeA09/_old 2019-10-22 15:41:56.741477376 +0200
+++ /var/tmp/diff_new_pack.cBeA09/_new 2019-10-22 15:41:56.745477381 +0200
@@ -34,13 +34,13 @@
tools/libxl/xl_cmdtable.c | 15
16 files changed, 2326 insertions(+), 4 deletions(-)
-Index: xen-4.12.1-testing/docs/man/xl.cfg.5.pod.in
+Index: xen-4.13.0-testing/docs/man/xl.cfg.5.pod.in
===================================================================
---- xen-4.12.1-testing.orig/docs/man/xl.cfg.5.pod.in
-+++ xen-4.12.1-testing/docs/man/xl.cfg.5.pod.in
-@@ -693,6 +693,62 @@ frontend to backend. It can be used as a
+--- xen-4.13.0-testing.orig/docs/man/xl.cfg.5.pod.in
++++ xen-4.13.0-testing/docs/man/xl.cfg.5.pod.in
+@@ -750,6 +750,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.
+ https://xenbits.xenproject.org/docs/unstable/misc/pvcalls.html.
+=item B<vscsi=[ "VSCSI_SPEC_STRING", "VSCSI_SPEC_STRING", ...]>
+
@@ -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.12.1-testing/docs/man/xl.1.pod.in
+Index: xen-4.13.0-testing/docs/man/xl.1.pod.in
===================================================================
---- xen-4.12.1-testing.orig/docs/man/xl.1.pod.in
-+++ xen-4.12.1-testing/docs/man/xl.1.pod.in
-@@ -1544,6 +1544,24 @@ List virtual network interfaces for a do
+--- xen-4.13.0-testing.orig/docs/man/xl.1.pod.in
++++ xen-4.13.0-testing/docs/man/xl.1.pod.in
+@@ -1575,6 +1575,24 @@ List virtual network interfaces for a do
=back
@@ -130,11 +130,11 @@
=head1 PCI PASS-THROUGH
=over 4
-Index: xen-4.12.1-testing/tools/libxl/Makefile
+Index: xen-4.13.0-testing/tools/libxl/Makefile
===================================================================
---- xen-4.12.1-testing.orig/tools/libxl/Makefile
-+++ xen-4.12.1-testing/tools/libxl/Makefile
-@@ -130,6 +130,7 @@ endif
+--- xen-4.13.0-testing.orig/tools/libxl/Makefile
++++ xen-4.13.0-testing/tools/libxl/Makefile
+@@ -127,6 +127,7 @@ endif
LIBXL_LIBS += -lyajl
LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o libxl_pci.o \
@@ -142,7 +142,7 @@
libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \
libxl_internal.o libxl_utils.o libxl_uuid.o \
libxl_json.o libxl_aoutils.o libxl_numa.o libxl_vnuma.o
\
-@@ -176,6 +177,7 @@ AUTOINCS= libxlu_cfg_y.h libxlu_cfg_l.h
+@@ -173,6 +174,7 @@ AUTOINCS= libxlu_cfg_y.h libxlu_cfg_l.h
AUTOSRCS= libxlu_cfg_y.c libxlu_cfg_l.c
AUTOSRCS += _libxl_save_msgs_callout.c _libxl_save_msgs_helper.c
LIBXLU_OBJS = libxlu_cfg_y.o libxlu_cfg_l.o libxlu_cfg.o \
@@ -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.12.1-testing/tools/libxl/libxl.h
+Index: xen-4.13.0-testing/tools/libxl/libxl.h
===================================================================
---- xen-4.12.1-testing.orig/tools/libxl/libxl.h
-+++ xen-4.12.1-testing/tools/libxl/libxl.h
-@@ -1061,6 +1061,13 @@ void libxl_mac_copy(libxl_ctx *ctx, libx
+--- xen-4.13.0-testing.orig/tools/libxl/libxl.h
++++ xen-4.13.0-testing/tools/libxl/libxl.h
+@@ -1124,6 +1124,13 @@ void libxl_mac_copy(libxl_ctx *ctx, libx
#define LIBXL_HAVE_PCITOPOLOGY 1
/*
@@ -168,8 +168,8 @@
* LIBXL_HAVE_SOCKET_BITMAP
*
* If this is defined, then libxl_socket_bitmap_alloc and
-@@ -1991,6 +1998,41 @@ int libxl_device_channel_getinfo(libxl_c
- libxl_device_channel *channel,
+@@ -2119,6 +2126,41 @@ int libxl_device_channel_getinfo(libxl_c
+ const libxl_device_channel *channel,
libxl_channelinfo *channelinfo);
+/* Virtual SCSI */
@@ -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.12.1-testing/tools/libxl/libxl_create.c
+Index: xen-4.13.0-testing/tools/libxl/libxl_create.c
===================================================================
---- xen-4.12.1-testing.orig/tools/libxl/libxl_create.c
-+++ xen-4.12.1-testing/tools/libxl/libxl_create.c
-@@ -1519,6 +1519,7 @@ const struct libxl_device_type *device_t
+--- xen-4.13.0-testing.orig/tools/libxl/libxl_create.c
++++ xen-4.13.0-testing/tools/libxl/libxl_create.c
+@@ -1563,6 +1563,7 @@ const libxl__device_type *device_type_tb
&libxl__disk_devtype,
&libxl__nic_devtype,
&libxl__vtpm_devtype,
@@ -222,23 +222,23 @@
&libxl__usbctrl_devtype,
&libxl__usbdev_devtype,
&libxl__pcidev_devtype,
-Index: xen-4.12.1-testing/tools/libxl/libxl_internal.h
+Index: xen-4.13.0-testing/tools/libxl/libxl_internal.h
===================================================================
---- xen-4.12.1-testing.orig/tools/libxl/libxl_internal.h
-+++ xen-4.12.1-testing/tools/libxl/libxl_internal.h
-@@ -3810,6 +3810,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;
-+extern const struct libxl_device_type libxl__vscsictrl_devtype;
- 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.12.1-testing/tools/libxl/libxl_types.idl
+--- xen-4.13.0-testing.orig/tools/libxl/libxl_internal.h
++++ xen-4.13.0-testing/tools/libxl/libxl_internal.h
+@@ -3838,6 +3838,7 @@ extern const libxl__device_type libxl__v
+ extern const libxl__device_type libxl__disk_devtype;
+ extern const libxl__device_type libxl__nic_devtype;
+ extern const libxl__device_type libxl__vtpm_devtype;
++extern const libxl__device_type libxl__vscsictrl_devtype;
+ extern const libxl__device_type libxl__usbctrl_devtype;
+ extern const libxl__device_type libxl__usbdev_devtype;
+ extern const libxl__device_type libxl__pcidev_devtype;
+Index: xen-4.13.0-testing/tools/libxl/libxl_types.idl
===================================================================
---- xen-4.12.1-testing.orig/tools/libxl/libxl_types.idl
-+++ xen-4.12.1-testing/tools/libxl/libxl_types.idl
-@@ -909,6 +909,43 @@ libxl_device_vsnd = Struct("device_vsnd"
+--- xen-4.13.0-testing.orig/tools/libxl/libxl_types.idl
++++ xen-4.13.0-testing/tools/libxl/libxl_types.idl
+@@ -928,6 +928,43 @@ libxl_device_vsnd = Struct("device_vsnd"
("pcms", Array(libxl_vsnd_pcm, "num_vsnd_pcms"))
])
@@ -282,7 +282,7 @@
libxl_domain_config = Struct("domain_config", [
("c_info", libxl_domain_create_info),
("b_info", libxl_domain_build_info),
-@@ -920,6 +957,7 @@ libxl_domain_config = Struct("domain_con
+@@ -939,6 +976,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")),
-@@ -961,6 +999,21 @@ libxl_nicinfo = Struct("nicinfo", [
+@@ -980,6 +1018,21 @@ libxl_nicinfo = Struct("nicinfo", [
("rref_rx", integer),
], dir=DIR_OUT)
@@ -312,11 +312,11 @@
libxl_vtpminfo = Struct("vtpminfo", [
("backend", string),
("backend_id", uint32),
-Index: xen-4.12.1-testing/tools/libxl/libxl_types_internal.idl
+Index: xen-4.13.0-testing/tools/libxl/libxl_types_internal.idl
===================================================================
---- xen-4.12.1-testing.orig/tools/libxl/libxl_types_internal.idl
-+++ xen-4.12.1-testing/tools/libxl/libxl_types_internal.idl
-@@ -30,6 +30,7 @@ libxl__device_kind = Enumeration("device
+--- xen-4.13.0-testing.orig/tools/libxl/libxl_types_internal.idl
++++ xen-4.13.0-testing/tools/libxl/libxl_types_internal.idl
+@@ -31,6 +31,7 @@ libxl__device_kind = Enumeration("device
(13, "VUART"),
(14, "PVCALLS"),
(15, "VSND"),
@@ -324,10 +324,10 @@
])
libxl__console_backend = Enumeration("console_backend", [
-Index: xen-4.12.1-testing/tools/libxl/libxl_vscsi.c
+Index: xen-4.13.0-testing/tools/libxl/libxl_vscsi.c
===================================================================
--- /dev/null
-+++ xen-4.12.1-testing/tools/libxl/libxl_vscsi.c
++++ xen-4.13.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.12.1-testing/tools/libxl/libxlu_vscsi.c
+Index: xen-4.13.0-testing/tools/libxl/libxlu_vscsi.c
===================================================================
--- /dev/null
-+++ xen-4.12.1-testing/tools/libxl/libxlu_vscsi.c
++++ xen-4.13.0-testing/tools/libxl/libxlu_vscsi.c
@@ -0,0 +1,668 @@
+/*
+ * libxlu_vscsi.c - xl configuration file parsing: setup and helper functions
@@ -2187,11 +2187,11 @@
+ return ERROR_INVAL;
+}
+#endif
-Index: xen-4.12.1-testing/tools/libxl/libxlutil.h
+Index: xen-4.13.0-testing/tools/libxl/libxlutil.h
===================================================================
---- xen-4.12.1-testing.orig/tools/libxl/libxlutil.h
-+++ xen-4.12.1-testing/tools/libxl/libxlutil.h
-@@ -118,6 +118,25 @@ int xlu_rdm_parse(XLU_Config *cfg, libxl
+--- xen-4.13.0-testing.orig/tools/libxl/libxlutil.h
++++ xen-4.13.0-testing/tools/libxl/libxlutil.h
+@@ -123,6 +123,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,23 +2217,23 @@
#endif /* LIBXLUTIL_H */
/*
-Index: xen-4.12.1-testing/tools/xl/Makefile
+Index: xen-4.13.0-testing/tools/xl/Makefile
===================================================================
---- xen-4.12.1-testing.orig/tools/xl/Makefile
-+++ xen-4.12.1-testing/tools/xl/Makefile
+--- xen-4.13.0-testing.orig/tools/xl/Makefile
++++ xen-4.13.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)
- XL_OBJS += xl_tmem.o xl_parse.o xl_cpupool.o xl_flask.o
+ XL_OBJS += xl_parse.o xl_cpupool.o xl_flask.o
-XL_OBJS += xl_vtpm.o xl_block.o xl_nic.o xl_usb.o
+XL_OBJS += xl_vtpm.o xl_vscsi.o xl_block.o xl_nic.o xl_usb.o
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.12.1-testing/tools/xl/xl.h
+Index: xen-4.13.0-testing/tools/xl/xl.h
===================================================================
---- xen-4.12.1-testing.orig/tools/xl/xl.h
-+++ xen-4.12.1-testing/tools/xl/xl.h
+--- xen-4.13.0-testing.orig/tools/xl/xl.h
++++ xen-4.13.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.12.1-testing/tools/xl/xl_parse.c
+Index: xen-4.13.0-testing/tools/xl/xl_parse.c
===================================================================
---- xen-4.12.1-testing.orig/tools/xl/xl_parse.c
-+++ xen-4.12.1-testing/tools/xl/xl_parse.c
-@@ -1211,7 +1211,8 @@ void parse_config_data(const char *confi
+--- xen-4.13.0-testing.orig/tools/xl/xl_parse.c
++++ xen-4.13.0-testing/tools/xl/xl_parse.c
+@@ -1212,7 +1212,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;
-@@ -1974,6 +1975,17 @@ void parse_config_data(const char *confi
+@@ -2104,6 +2105,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.12.1-testing/tools/xl/xl_vscsi.c
+Index: xen-4.13.0-testing/tools/xl/xl_vscsi.c
===================================================================
--- /dev/null
-+++ xen-4.12.1-testing/tools/xl/xl_vscsi.c
++++ xen-4.13.0-testing/tools/xl/xl_vscsi.c
@@ -0,0 +1,229 @@
+/*
+ * Copyright 2009-2017 Citrix Ltd and other contributors
@@ -2510,10 +2510,10 @@
+ return !!rc;
+}
+
-Index: xen-4.12.1-testing/tools/xl/xl_cmdtable.c
+Index: xen-4.13.0-testing/tools/xl/xl_cmdtable.c
===================================================================
---- xen-4.12.1-testing.orig/tools/xl/xl_cmdtable.c
-+++ xen-4.12.1-testing/tools/xl/xl_cmdtable.c
+--- xen-4.13.0-testing.orig/tools/xl/xl_cmdtable.c
++++ xen-4.13.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.cBeA09/_old 2019-10-22 15:41:56.753477390 +0200
+++ /var/tmp/diff_new_pack.cBeA09/_new 2019-10-22 15:41:56.753477390 +0200
@@ -89,11 +89,11 @@
tools/libxl/xl_cmdtable.c | 23 ++++++++++++++--------
13 files changed, 156 insertions(+), 28 deletions(-)
-Index: xen-4.12.0-testing/docs/man/xl.1.pod.in
+Index: xen-4.13.0-testing/docs/man/xl.1.pod.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
+--- xen-4.13.0-testing.orig/docs/man/xl.1.pod.in
++++ xen-4.13.0-testing/docs/man/xl.1.pod.in
+@@ -490,6 +490,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.12.0-testing/tools/libxc/include/xenguest.h
+Index: xen-4.13.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
+--- xen-4.13.0-testing.orig/tools/libxc/include/xenguest.h
++++ xen-4.13.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.12.0-testing/tools/libxc/xc_nomigrate.c
+Index: xen-4.13.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
+--- xen-4.13.0-testing.orig/tools/libxc/xc_nomigrate.c
++++ xen-4.13.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.12.0-testing/tools/libxc/xc_sr_save.c
+Index: xen-4.13.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
+--- xen-4.13.0-testing.orig/tools/libxc/xc_sr_save.c
++++ xen-4.13.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.12.0-testing/tools/libxl/libxl.h
+Index: xen-4.13.0-testing/tools/libxl/libxl.h
===================================================================
---- 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,
+--- xen-4.13.0-testing.orig/tools/libxl/libxl.h
++++ xen-4.13.0-testing/tools/libxl/libxl.h
+@@ -1623,8 +1623,23 @@ int libxl_domain_suspend(libxl_ctx *ctx,
int flags, /* LIBXL_SUSPEND_* */
const libxl_asyncop_how *ao_how)
LIBXL_EXTERNAL_CALLERS_ONLY;
@@ -324,11 +324,11 @@
/*
* Only suspend domain, do not save its state to file, do not destroy it.
-Index: xen-4.12.0-testing/tools/libxl/libxl_dom_save.c
+Index: xen-4.13.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,
+--- xen-4.13.0-testing.orig/tools/libxl/libxl_dom_save.c
++++ xen-4.13.0-testing/tools/libxl/libxl_dom_save.c
+@@ -423,6 +423,7 @@ void libxl__domain_save(libxl__egc *egc,
dss->xcflags = (live ? XCFLAGS_LIVE : 0)
| (debug ? XCFLAGS_DEBUG : 0)
@@ -336,11 +336,11 @@
| (dss->hvm ? XCFLAGS_HVM : 0);
/* Disallow saving a guest with vNUMA configured because migration
-Index: xen-4.12.0-testing/tools/libxl/libxl_domain.c
+Index: xen-4.13.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
+--- xen-4.13.0-testing.orig/tools/libxl/libxl_domain.c
++++ xen-4.13.0-testing/tools/libxl/libxl_domain.c
+@@ -503,8 +503,9 @@ static void domain_suspend_cb(libxl__egc
}
@@ -352,7 +352,7 @@
{
AO_CREATE(ctx, domid, ao_how);
int rc;
-@@ -507,9 +508,15 @@ int libxl_domain_suspend(libxl_ctx *ctx,
+@@ -524,9 +525,15 @@ int libxl_domain_suspend(libxl_ctx *ctx,
dss->domid = domid;
dss->fd = fd;
dss->type = type;
@@ -370,7 +370,7 @@
rc = libxl__fd_flags_modify_save(gc, dss->fd,
~(O_NONBLOCK|O_NDELAY), 0,
-@@ -557,6 +564,20 @@ int libxl_domain_suspend_only(libxl_ctx
+@@ -574,6 +581,20 @@ int libxl_domain_suspend_only(libxl_ctx
return AO_CREATE_FAIL(rc);
}
@@ -388,14 +388,14 @@
+ return do_libxl_domain_suspend(ctx, domid, fd, &props, ao_how);
+}
+
- int libxl_domain_pause(libxl_ctx *ctx, uint32_t domid)
+ int libxl_domain_pause(libxl_ctx *ctx, uint32_t domid,
+ const libxl_asyncop_how *ao_how)
{
- int ret;
-Index: xen-4.12.0-testing/tools/libxl/libxl_internal.h
+Index: xen-4.13.0-testing/tools/libxl/libxl_internal.h
===================================================================
---- 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 {
+--- xen-4.13.0-testing.orig/tools/libxl/libxl_internal.h
++++ xen-4.13.0-testing/tools/libxl/libxl_internal.h
+@@ -3498,6 +3498,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.12.0-testing/tools/libxl/libxl_save_callout.c
+Index: xen-4.13.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
+--- xen-4.13.0-testing.orig/tools/libxl/libxl_save_callout.c
++++ xen-4.13.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.12.0-testing/tools/libxl/libxl_save_helper.c
+Index: xen-4.13.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
+--- xen-4.13.0-testing.orig/tools/libxl/libxl_save_helper.c
++++ xen-4.13.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,10 +448,10 @@
complete(r);
} else if (!strcmp(mode,"--restore-domain")) {
-Index: xen-4.12.0-testing/tools/xl/xl_cmdtable.c
+Index: xen-4.13.0-testing/tools/xl/xl_cmdtable.c
===================================================================
---- xen-4.12.0-testing.orig/tools/xl/xl_cmdtable.c
-+++ xen-4.12.0-testing/tools/xl/xl_cmdtable.c
+--- xen-4.13.0-testing.orig/tools/xl/xl_cmdtable.c
++++ xen-4.13.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",
@@ -484,10 +484,10 @@
},
{ "restore",
&main_restore, 0, 1,
-Index: xen-4.12.0-testing/tools/xl/xl_migrate.c
+Index: xen-4.13.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
+--- xen-4.13.0-testing.orig/tools/xl/xl_migrate.c
++++ xen-4.13.0-testing/tools/xl/xl_migrate.c
@@ -177,6 +177,8 @@ static void migrate_do_preamble(int send
}
++++++ pygrub-boot-legacy-sles.patch ++++++
--- /var/tmp/diff_new_pack.cBeA09/_old 2019-10-22 15:41:56.769477408 +0200
+++ /var/tmp/diff_new_pack.cBeA09/_new 2019-10-22 15:41:56.777477417 +0200
@@ -1,17 +1,17 @@
-Index: xen-4.7.1-testing/tools/pygrub/src/pygrub
+Index: xen-4.13.0-testing/tools/pygrub/src/pygrub
===================================================================
---- xen-4.7.1-testing.orig/tools/pygrub/src/pygrub
-+++ xen-4.7.1-testing/tools/pygrub/src/pygrub
-@@ -454,7 +454,7 @@ class Grub:
+--- xen-4.13.0-testing.orig/tools/pygrub/src/pygrub
++++ xen-4.13.0-testing/tools/pygrub/src/pygrub
+@@ -453,7 +453,7 @@ class Grub:
self.cf.filename = f
break
if self.__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.")
+ return
f = fs.open_file(self.cf.filename)
# limit read size to avoid pathological cases
buf = f.read(FS_READ_MAX)
-@@ -626,6 +626,20 @@ def run_grub(file, entry, fs, cfg_args):
+@@ -628,6 +628,20 @@ def run_grub(file, entry, fs, cfg_args):
g = Grub(file, fs)
@@ -25,14 +25,14 @@
+ 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]
-@@ -721,6 +735,19 @@ def sniff_netware(fs, cfg):
+@@ -723,6 +737,19 @@ def sniff_netware(fs, cfg):
return cfg
@@ -52,7 +52,7 @@
def format_sxp(kernel, ramdisk, args):
s = "linux (kernel %s)" % repr(kernel)
if ramdisk:
-@@ -804,7 +831,7 @@ if __name__ == "__main__":
+@@ -806,7 +833,7 @@ if __name__ == "__main__":
debug = False
not_really = False
output_format = "sxp"
++++++ pygrub-handle-one-line-menu-entries.patch ++++++
--- /var/tmp/diff_new_pack.cBeA09/_old 2019-10-22 15:41:56.785477426 +0200
+++ /var/tmp/diff_new_pack.cBeA09/_new 2019-10-22 15:41:56.785477426 +0200
@@ -5,11 +5,11 @@
Force it to fall through where it will handle the closing brace.
Also change warning to debug to cut down on verbose output.
-Index: xen-4.7.0-testing/tools/pygrub/src/GrubConf.py
+Index: xen-4.13.0-testing/tools/pygrub/src/GrubConf.py
===================================================================
---- xen-4.7.0-testing.orig/tools/pygrub/src/GrubConf.py
-+++ xen-4.7.0-testing/tools/pygrub/src/GrubConf.py
-@@ -147,7 +147,7 @@ class GrubImage(_GrubImage):
+--- xen-4.13.0-testing.orig/tools/pygrub/src/GrubConf.py
++++ xen-4.13.0-testing/tools/pygrub/src/GrubConf.py
+@@ -150,7 +150,7 @@ class GrubImage(_GrubImage):
else:
logging.info("Ignored image directive %s" %(com,))
else:
@@ -18,7 +18,7 @@
# now put the line in the list of lines
if replace is None:
-@@ -302,7 +302,7 @@ class GrubConfigFile(_GrubConfigFile):
+@@ -309,7 +309,7 @@ class GrubConfigFile(_GrubConfigFile):
else:
logging.info("Ignored directive %s" %(com,))
else:
@@ -27,7 +27,7 @@
if img:
self.add_image(GrubImage(title, img))
-@@ -336,7 +336,7 @@ class Grub2Image(_GrubImage):
+@@ -343,7 +343,7 @@ class Grub2Image(_GrubImage):
elif com.startswith('set:'):
pass
else:
@@ -36,8 +36,8 @@
# now put the line in the list of lines
if replace is None:
-@@ -401,7 +401,10 @@ class Grub2ConfigFile(_GrubConfigFile):
- raise RuntimeError, "syntax error: cannot nest menuentry
(%d %s)" % (len(img),img)
+@@ -408,7 +408,10 @@ class Grub2ConfigFile(_GrubConfigFile):
+ raise RuntimeError("syntax error: cannot nest menuentry
(%d %s)" % (len(img),img))
img = []
title = title_match.group(1)
- continue
@@ -48,7 +48,7 @@
if l.startswith("submenu"):
menu_level += 1
-@@ -440,7 +443,7 @@ class Grub2ConfigFile(_GrubConfigFile):
+@@ -447,7 +450,7 @@ class Grub2ConfigFile(_GrubConfigFile):
elif com.startswith('set:'):
pass
else:
@@ -56,4 +56,4 @@
+ 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))
++++++ pygrub-netware-xnloader.patch ++++++
--- /var/tmp/diff_new_pack.cBeA09/_old 2019-10-22 15:41:56.789477431 +0200
+++ /var/tmp/diff_new_pack.cBeA09/_new 2019-10-22 15:41:56.789477431 +0200
@@ -1,8 +1,8 @@
-Index: xen-4.7.1-testing/tools/pygrub/src/pygrub
+Index: xen-4.13.0-testing/tools/pygrub/src/pygrub
===================================================================
---- xen-4.7.1-testing.orig/tools/pygrub/src/pygrub
-+++ xen-4.7.1-testing/tools/pygrub/src/pygrub
-@@ -25,6 +25,7 @@ import fsimage
+--- xen-4.13.0-testing.orig/tools/pygrub/src/pygrub
++++ xen-4.13.0-testing/tools/pygrub/src/pygrub
+@@ -27,6 +27,7 @@ import xenfsimage
import grub.GrubConf
import grub.LiloConf
import grub.ExtLinuxConf
@@ -10,7 +10,7 @@
PYGRUB_VER = 0.6
FS_READ_MAX = 1024 * 1024
-@@ -766,6 +767,8 @@ if __name__ == "__main__":
+@@ -768,6 +769,8 @@ if __name__ == "__main__":
if len(data) == 0:
os.close(tfd)
del datafile
++++++ reproducible.patch ++++++
--- /var/tmp/diff_new_pack.cBeA09/_old 2019-10-22 15:41:56.797477440 +0200
+++ /var/tmp/diff_new_pack.cBeA09/_new 2019-10-22 15:41:56.797477440 +0200
@@ -11,10 +11,10 @@
Signed-off-by: Bernhard M. Wiedemann <bwiedem...@suse.de>
-Index: xen-4.12.0-testing/Config.mk
+Index: xen-4.13.0-testing/Config.mk
===================================================================
---- xen-4.12.0-testing.orig/Config.mk
-+++ xen-4.12.0-testing/Config.mk
+--- xen-4.13.0-testing.orig/Config.mk
++++ xen-4.13.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.12.0-testing/xen/arch/x86/Makefile
+Index: xen-4.13.0-testing/xen/arch/x86/Makefile
===================================================================
---- 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
+--- xen-4.13.0-testing.orig/xen/arch/x86/Makefile
++++ xen-4.13.0-testing/xen/arch/x86/Makefile
+@@ -162,6 +162,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
++++++ x86-ioapic-ack-default.patch ++++++
--- /var/tmp/diff_new_pack.cBeA09/_old 2019-10-22 15:41:56.833477481 +0200
+++ /var/tmp/diff_new_pack.cBeA09/_new 2019-10-22 15:41:56.833477481 +0200
@@ -1,10 +1,10 @@
Change default IO-APIC ack mode for single IO-APIC systems to old-style.
-Index: xen-4.12.1-testing/xen/arch/x86/io_apic.c
+Index: xen-4.13.0-testing/xen/arch/x86/io_apic.c
===================================================================
---- xen-4.12.1-testing.orig/xen/arch/x86/io_apic.c
-+++ xen-4.12.1-testing/xen/arch/x86/io_apic.c
-@@ -2028,7 +2028,10 @@ void __init setup_IO_APIC(void)
+--- xen-4.13.0-testing.orig/xen/arch/x86/io_apic.c
++++ xen-4.13.0-testing/xen/arch/x86/io_apic.c
+@@ -2027,7 +2027,10 @@ void __init setup_IO_APIC(void)
io_apic_irqs = ~PIC_IRQS;
printk("ENABLING IO-APIC IRQs\n");
++++++ xen-4.12.1-testing-src.tar.bz2 -> xen-4.13.0-testing-src.tar.bz2 ++++++
++++ 150203 lines of diff (skipped)
++++++ xen.build-compare.doc_html.patch ++++++
--- /var/tmp/diff_new_pack.cBeA09/_old 2019-10-22 15:42:01.565482875 +0200
+++ /var/tmp/diff_new_pack.cBeA09/_new 2019-10-22 15:42:01.593482906 +0200
@@ -5,11 +5,11 @@
docs/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
-Index: xen-4.12.0-testing/docs/Makefile
+Index: xen-4.13.0-testing/docs/Makefile
===================================================================
---- xen-4.12.0-testing.orig/docs/Makefile
-+++ xen-4.12.0-testing/docs/Makefile
-@@ -179,7 +179,7 @@ uninstall: uninstall-man-pages uninstall
+--- xen-4.13.0-testing.orig/docs/Makefile
++++ xen-4.13.0-testing/docs/Makefile
+@@ -188,7 +188,7 @@ uninstall: uninstall-man-pages uninstall
# Individual file build targets
html/index.html: $(DOC_HTML) $(CURDIR)/gen-html-index INDEX
@@ -18,7 +18,7 @@
html/%.txt: %.txt
@$(INSTALL_DIR) $(@D)
-@@ -194,8 +194,8 @@ html/hypercall/%/index.html: $(CURDIR)/x
+@@ -203,8 +203,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.cBeA09/_old 2019-10-22 15:42:01.741483075 +0200
+++ /var/tmp/diff_new_pack.cBeA09/_new 2019-10-22 15:42:01.761483098 +0200
@@ -7,10 +7,10 @@
tools/libxl/libxlu_disk_l.l | 2 ++
4 files changed, 37 insertions(+), 6 deletions(-)
-Index: xen-4.12.0-testing/tools/libxl/libxl_disk.c
+Index: xen-4.13.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
+--- xen-4.13.0-testing.orig/tools/libxl/libxl_disk.c
++++ xen-4.13.0-testing/tools/libxl/libxl_disk.c
@@ -178,7 +178,7 @@ static int libxl__device_disk_setdefault
return rc;
}
@@ -20,9 +20,9 @@
const libxl_device_disk *disk,
libxl__device *device)
{
-@@ -355,6 +355,10 @@ static void device_disk_add(libxl__egc *
- /* now create a phy device to export the device to the guest
*/
- goto do_backend_phy;
+@@ -336,6 +336,10 @@ static void device_disk_add(libxl__egc *
+ rc = ERROR_FAIL;
+ goto out;
case LIBXL_DISK_BACKEND_QDISK:
+ if (disk->script) {
+ script = libxl__abs_path(gc, disk->script,
libxl__xen_script_dir_path());
@@ -31,12 +31,12 @@
flexarray_append(back, "params");
flexarray_append(back, GCSPRINTF("%s:%s",
libxl__device_disk_string_of_format(disk->format),
-Index: xen-4.12.0-testing/tools/libxl/libxl_device.c
+Index: xen-4.13.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;
+--- xen-4.13.0-testing.orig/tools/libxl/libxl_device.c
++++ xen-4.13.0-testing/tools/libxl/libxl_device.c
+@@ -326,7 +326,8 @@ static int disk_try_backend(disk_try_bac
+ return 0;
case LIBXL_DISK_BACKEND_QDISK:
- if (a->disk->script) goto bad_script;
@@ -45,10 +45,22 @@
return backend;
default:
-Index: xen-4.12.0-testing/tools/libxl/libxl_dm.c
+@@ -343,11 +344,6 @@ static int disk_try_backend(disk_try_bac
+ libxl_disk_format_to_string(a->disk->format));
+ return 0;
+
+- bad_script:
+- LOG(DEBUG, "Disk vdev=%s, backend %s not compatible with script=...",
+- a->disk->vdev, libxl_disk_backend_to_string(backend));
+- return 0;
+-
+ bad_colo:
+ LOG(DEBUG, "Disk vdev=%s, backend %s not compatible with colo",
+ a->disk->vdev, libxl_disk_backend_to_string(backend));
+Index: xen-4.13.0-testing/tools/libxl/libxl_dm.c
===================================================================
---- xen-4.12.0-testing.orig/tools/libxl/libxl_dm.c
-+++ xen-4.12.0-testing/tools/libxl/libxl_dm.c
+--- xen-4.13.0-testing.orig/tools/libxl/libxl_dm.c
++++ xen-4.13.0-testing/tools/libxl/libxl_dm.c
@@ -1162,6 +1162,30 @@ out:
return rc;
}
@@ -80,7 +92,7 @@
static int libxl__build_device_model_args_new(libxl__gc *gc,
const char *dm, int guest_domid,
const libxl_domain_config
*guest_config,
-@@ -1793,9 +1817,11 @@ static int libxl__build_device_model_arg
+@@ -1795,9 +1819,11 @@ static int libxl__build_device_model_arg
libxl__device_disk_dev_number(disks[i].vdev, &disk, &part);
const char *format;
char *drive;
@@ -93,19 +105,10 @@
if (dev_number == -1) {
LOGD(WARN, guest_domid, "unable to determine"" disk number
for %s",
disks[i].vdev);
-@@ -1836,7 +1862,7 @@ static int libxl__build_device_model_arg
- * the bootloader path.
- */
- if (disks[i].backend == LIBXL_DISK_BACKEND_TAP)
-- target_path = libxl__blktap_devpath(gc,
disks[i].pdev_path,
-+ target_path = libxl__blktap_devpath(gc, target_path,
- disks[i].format);
- else
- target_path = libxl__device_disk_find_local_path(gc,
-Index: xen-4.12.0-testing/tools/libxl/libxlu_disk_l.l
+Index: xen-4.13.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
+--- xen-4.13.0-testing.orig/tools/libxl/libxlu_disk_l.l
++++ xen-4.13.0-testing/tools/libxl/libxlu_disk_l.l
@@ -230,6 +230,8 @@ target=.* { STRIP(','); SAVESTRING("targ
free(newscript);
}
@@ -115,13 +118,13 @@
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.12.0-testing/tools/libxl/libxl_internal.h
+Index: xen-4.13.0-testing/tools/libxl/libxl_internal.h
===================================================================
---- 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-4.13.0-testing.orig/tools/libxl/libxl_internal.h
++++ xen-4.13.0-testing/tools/libxl/libxl_internal.h
+@@ -1945,6 +1945,10 @@ struct libxl__cpuid_policy {
+ char *policy[4];
+ };
+_hidden int libxl__device_from_disk(libxl__gc *gc, uint32_t domid,
+ const libxl_device_disk *disk,
++++++ xenapiusers ++++++
root
