Hello community,
here is the log from the commit of package xen for openSUSE:Factory checked in
at 2017-11-03 16:22:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xen (Old)
and /work/SRC/openSUSE:Factory/.xen.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xen"
Fri Nov 3 16:22:52 2017 rev:236 rq:538517 version:4.10.0_01
Changes:
--------
--- /work/SRC/openSUSE:Factory/xen/xen.changes 2017-10-17 01:49:56.645669334
+0200
+++ /work/SRC/openSUSE:Factory/.xen.new/xen.changes 2017-11-03
16:23:00.656227202 +0100
@@ -1,0 +2,103 @@
+Thu Nov 2 14:14:02 MDT 2017 - carn...@suse.com
+
+- Update to Xen 4.10.0-rc3 (fate#321394, fate#322686)
+ xen-4.10.0-testing-src.tar.bz2
+- Drop 59f31268-libxc-remove-stale-error-check-for-domain-size.patch
+
+-------------------------------------------------------------------
+Thu Nov 2 11:36:27 UTC 2017 - oher...@suse.de
+
+- Adjust xen-dom0-modules.service to ignore errors (bsc#1065187)
+
+-------------------------------------------------------------------
+Fri Oct 27 07:48:55 MDT 2017 - carn...@suse.com
+
+- fate#324052 Support migration of Xen HVM domains larger than 1TB
+ 59f31268-libxc-remove-stale-error-check-for-domain-size.patch
+
+-------------------------------------------------------------------
+Wed Oct 25 16:26:33 MDT 2017 - carn...@suse.com
+
+- Update to Xen 4.10.0-rc2 (fate#321394, fate#322686)
+ xen-4.10.0-testing-src.tar.bz2
+- Drop until further notice
+ libxl.set-migration-constraints-from-cmdline.patch
+
+-------------------------------------------------------------------
+Mon Oct 16 09:34:23 MDT 2017 - carn...@suse.com
+
+- Update to Xen 4.10.0-rc1 (fate#321394, fate#322686)
+ xen-4.10.0-testing-src.tar.bz2
+- Drop patches included in new tarball
+ 592fd5f0-stop_machine-fill-result-only-in-case-of-error.patch
+ 596f257e-x86-fix-hvmemul_insn_fetch.patch
+ 5982fd99-VT-d-don-t-panic-warn-on-iommu-no-igfx.patch
+ 598c3630-VT-d-PI-disable-when-CPU-side-PI-is-off.patch
+ 598c3706-cpufreq-only-stop-ondemand-governor-if-started.patch
+ 5992f1e5-x86-grant-disallow-misaligned-PTEs.patch
+ 5992f20d-gnttab-split-maptrack-lock-to-make-it-useful-again.patch
+ 5992f233-gnttab-correct-pin-status-fixup-for-copy.patch
+ 59958e76-gnttab-dont-use-possibly-unbounded-tail-calls.patch
+ 59958ebf-gnttab-fix-transitive-grant-handling.patch
+ 59958edd-gnttab-avoid-spurious-maptrack-handle-alloc-failures.patch
+ 599da329-arm-mm-release-grant-lock-on-xatp1-error-paths.patch
+ 59a01223-x86-check-for-alloc-errors-in-modify_xen_mappings.patch
+ 59a0130c-x86-efi-dont-write-relocs-in-efi_arch_relocate_image-1st-pass.patch
+ 59a9221f-VT-d-use-correct-BDF-for-VF-to-search-VT-d-unit.patch
+ 59ae9177-x86-emul-fix-handling-of-unimplemented-Grp7-insns.patch
+ 59aec335-x86emul-correct-VEX-W-handling-for-VPINSRD.patch
+ 59aec375-x86emul-correct-VEX-L-handling-for-VCVTx2SI.patch
+ 59afcea0-x86-introduce-and-use-setup_force_cpu_cap.patch
+ 59b2a7f2-x86-HVM-correct-repeat-count-update-linear-phys.patch
+ 59b7d664-mm-make-sure-node-is-less-than-MAX_NUMNODES.patch
+ 59b7d69b-grant_table-fix-GNTTABOP_cache_flush-handling.patch
+ 59b7d6c8-xenstore-dont-unlink-connection-object-twice.patch
+ 59b7d6d9-gnttab-also-validate-PTE-perms-upon-destroy-replace.patch
+ gcc7-arm.patch
+ gcc7-mini-os.patch
+
+-------------------------------------------------------------------
+Tue Oct 3 09:03:57 MDT 2017 - carn...@suse.com
+
+- bsc#1061084 - VUL-0: xen: page type reference leak on x86
+ (XSA-242)
+ xsa242.patch
+- bsc#1061086 - VUL-0: xen: x86: Incorrect handling of self-linear
+ shadow mappings with translated guests (XSA-243)
+ xsa243.patch
+- bsc#1061087 - VUL-0: xen: x86: Incorrect handling of IST settings
+ during CPU hotplug (XSA-244)
+ xsa244.patch
+
+-------------------------------------------------------------------
+Mon Oct 2 13:26:08 MDT 2017 - carn...@suse.com
+
+- bsc#1061077 - VUL-0: xen: DMOP map/unmap missing argument checks
+ (XSA-238)
+ xsa238.patch
+- bsc#1061080 - VUL-0: xen: hypervisor stack leak in x86 I/O
+ intercept code (XSA-239)
+ xsa239.patch
+- bsc#1061081 - VUL-0: xen: Unlimited recursion in linear pagetable
+ de-typing (XSA-240)
+ xsa240-1.patch
+ xsa240-2.patch
+- bsc#1061082 - VUL-0: xen: Stale TLB entry due to page type
+ release race (XSA-241)
+ xsa241.patch
+
+-------------------------------------------------------------------
+Fri Sep 29 10:57:35 MDT 2017 - carn...@suse.com
+
+- bsc#1061075 - VUL-0: xen: pin count / page reference race in
+ grant table code (XSA-236)
+ xsa236.patch
+- bsc#1061076 - VUL-0: xen: multiple MSI mapping issues on x86
+ (XSA-237)
+ xsa237-1.patch
+ xsa237-2.patch
+ xsa237-3.patch
+ xsa237-4.patch
+ xsa237-5.patch
+
+-------------------------------------------------------------------
Old:
----
592fd5f0-stop_machine-fill-result-only-in-case-of-error.patch
596f257e-x86-fix-hvmemul_insn_fetch.patch
5982fd99-VT-d-don-t-panic-warn-on-iommu-no-igfx.patch
598c3630-VT-d-PI-disable-when-CPU-side-PI-is-off.patch
598c3706-cpufreq-only-stop-ondemand-governor-if-started.patch
5992f1e5-x86-grant-disallow-misaligned-PTEs.patch
5992f20d-gnttab-split-maptrack-lock-to-make-it-useful-again.patch
5992f233-gnttab-correct-pin-status-fixup-for-copy.patch
59958e76-gnttab-dont-use-possibly-unbounded-tail-calls.patch
59958ebf-gnttab-fix-transitive-grant-handling.patch
59958edd-gnttab-avoid-spurious-maptrack-handle-alloc-failures.patch
599da329-arm-mm-release-grant-lock-on-xatp1-error-paths.patch
59a01223-x86-check-for-alloc-errors-in-modify_xen_mappings.patch
59a0130c-x86-efi-dont-write-relocs-in-efi_arch_relocate_image-1st-pass.patch
59a9221f-VT-d-use-correct-BDF-for-VF-to-search-VT-d-unit.patch
59ae9177-x86-emul-fix-handling-of-unimplemented-Grp7-insns.patch
59aec335-x86emul-correct-VEX-W-handling-for-VPINSRD.patch
59aec375-x86emul-correct-VEX-L-handling-for-VCVTx2SI.patch
59afcea0-x86-introduce-and-use-setup_force_cpu_cap.patch
59b2a7f2-x86-HVM-correct-repeat-count-update-linear-phys.patch
59b7d664-mm-make-sure-node-is-less-than-MAX_NUMNODES.patch
59b7d69b-grant_table-fix-GNTTABOP_cache_flush-handling.patch
59b7d6c8-xenstore-dont-unlink-connection-object-twice.patch
59b7d6d9-gnttab-also-validate-PTE-perms-upon-destroy-replace.patch
gcc7-arm.patch
gcc7-mini-os.patch
libxl.set-migration-constraints-from-cmdline.patch
xen-4.9.0-testing-src.tar.bz2
New:
----
xen-4.10.0-testing-src.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xen.spec ++++++
--- /var/tmp/diff_new_pack.vE8JNr/_old 2017-11-03 16:23:03.496123841 +0100
+++ /var/tmp/diff_new_pack.vE8JNr/_new 2017-11-03 16:23:03.496123841 +0100
@@ -21,7 +21,7 @@
Name: xen
ExclusiveArch: %ix86 x86_64 %arm aarch64
%define changeset 35349
-%define xen_build_dir xen-4.9.0-testing
+%define xen_build_dir xen-4.10.0-testing
#
%define with_gdbsx 0
%define with_dom0_support 0
@@ -126,12 +126,12 @@
BuildRequires: pesign-obs-integration
%endif
-Version: 4.9.0_50
+Version: 4.10.0_01
Release: 0
Summary: Xen Virtualization: Hypervisor (aka VMM aka Microkernel)
License: GPL-2.0
Group: System/Kernel
-Source0: xen-4.9.0-testing-src.tar.bz2
+Source0: xen-4.10.0-testing-src.tar.bz2
Source1: stubdom.tar.bz2
Source5: ipxe.tar.bz2
Source6: mini-os.tar.bz2
@@ -161,30 +161,6 @@
# For xen-libs
Source99: baselibs.conf
# Upstream patches
-Patch1: 592fd5f0-stop_machine-fill-result-only-in-case-of-error.patch
-Patch2: 596f257e-x86-fix-hvmemul_insn_fetch.patch
-Patch3: 5982fd99-VT-d-don-t-panic-warn-on-iommu-no-igfx.patch
-Patch4: 598c3630-VT-d-PI-disable-when-CPU-side-PI-is-off.patch
-Patch5: 598c3706-cpufreq-only-stop-ondemand-governor-if-started.patch
-Patch6: 5992f1e5-x86-grant-disallow-misaligned-PTEs.patch
-Patch7:
5992f20d-gnttab-split-maptrack-lock-to-make-it-useful-again.patch
-Patch8: 5992f233-gnttab-correct-pin-status-fixup-for-copy.patch
-Patch9: 59958e76-gnttab-dont-use-possibly-unbounded-tail-calls.patch
-Patch10: 59958ebf-gnttab-fix-transitive-grant-handling.patch
-Patch11:
59958edd-gnttab-avoid-spurious-maptrack-handle-alloc-failures.patch
-Patch12: 599da329-arm-mm-release-grant-lock-on-xatp1-error-paths.patch
-Patch13:
59a01223-x86-check-for-alloc-errors-in-modify_xen_mappings.patch
-Patch14:
59a0130c-x86-efi-dont-write-relocs-in-efi_arch_relocate_image-1st-pass.patch
-Patch15: 59a9221f-VT-d-use-correct-BDF-for-VF-to-search-VT-d-unit.patch
-Patch16:
59ae9177-x86-emul-fix-handling-of-unimplemented-Grp7-insns.patch
-Patch17: 59aec335-x86emul-correct-VEX-W-handling-for-VPINSRD.patch
-Patch18: 59aec375-x86emul-correct-VEX-L-handling-for-VCVTx2SI.patch
-Patch19: 59afcea0-x86-introduce-and-use-setup_force_cpu_cap.patch
-Patch20: 59b2a7f2-x86-HVM-correct-repeat-count-update-linear-phys.patch
-Patch21: 59b7d664-mm-make-sure-node-is-less-than-MAX_NUMNODES.patch
-Patch22: 59b7d69b-grant_table-fix-GNTTABOP_cache_flush-handling.patch
-Patch23: 59b7d6c8-xenstore-dont-unlink-connection-object-twice.patch
-Patch24:
59b7d6d9-gnttab-also-validate-PTE-perms-upon-destroy-replace.patch
# Our platform specific patches
Patch400: xen-destdir.patch
Patch401: vif-bridge-no-iptables.patch
@@ -198,8 +174,6 @@
Patch421: xenpaging.doc.patch
Patch422: stubdom-have-iovec.patch
Patch423: vif-route.patch
-Patch424: gcc7-mini-os.patch
-Patch425: gcc7-arm.patch
# Other bug fixes or features
Patch451: xenconsole-no-multiple-connections.patch
Patch452: hibernate.patch
@@ -211,12 +185,11 @@
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: libxl.pvscsi.patch
-Patch462: xen.libxl.dmmd.patch
+Patch461: blktap2-no-uninit.patch
+Patch462: libxc.sr.superpage.patch
Patch463: libxl.add-option-to-disable-disk-cache-flushes-in-qdisk.patch
-Patch464: blktap2-no-uninit.patch
-Patch465: libxl.set-migration-constraints-from-cmdline.patch
-Patch467: libxc.sr.superpage.patch
+Patch464: libxl.pvscsi.patch
+Patch465: xen.libxl.dmmd.patch
# Hypervisor and PV driver Patches
Patch601: x86-ioapic-ack-default.patch
Patch602: x86-cpufreq-report.patch
@@ -369,30 +342,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
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
# Our platform specific patches
%patch400 -p1
%patch401 -p1
@@ -406,8 +355,6 @@
%patch421 -p1
%patch422 -p1
%patch423 -p1
-%patch424 -p1
-%patch425 -p1
# Other bug fixes or features
%patch451 -p1
%patch452 -p1
@@ -418,14 +365,12 @@
%patch457 -p1
%patch458 -p1
%patch459 -p1
-# libxl.pvscsi.patch
%patch460 -p1
%patch461 -p1
%patch462 -p1
%patch463 -p1
%patch464 -p1
%patch465 -p1
-%patch467 -p1
# Hypervisor and PV driver Patches
%patch601 -p1
%patch602 -p1
@@ -754,7 +699,7 @@
`"
for mod in $mods
do
- echo "ExecStart=-/usr/bin/env modprobe $mod" >>
$RPM_BUILD_ROOT%{_unitdir}/${bn}
+ echo "ExecStart=-/bin/sh -c 'modprobe $mod || :'" >>
$RPM_BUILD_ROOT%{_unitdir}/${bn}
done
rm -rfv $RPM_BUILD_ROOT%{_initddir}
install -m644 %SOURCE35
$RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.pciback
@@ -847,7 +792,7 @@
%ifarch x86_64
/usr/bin/xen-cpuid
%endif
-/usr/sbin/tap*
+#/usr/sbin/tap*
/usr/sbin/xenbaked
/usr/sbin/xenconsoled
/usr/sbin/xencov
@@ -864,10 +809,10 @@
/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/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
@@ -890,6 +835,7 @@
/usr/sbin/xen-destroy
/usr/sbin/xen-bugtool
/usr/sbin/xen-livepatch
+/usr/sbin/xen-diag
%dir %attr(700,root,root) /etc/xen
%dir /etc/xen/scripts
/etc/xen/scripts/block*
@@ -1037,7 +983,7 @@
/usr/include/*
%{_datadir}/pkgconfig/xenlight.pc
%{_datadir}/pkgconfig/xlutil.pc
-%{_datadir}/pkgconfig/xenblktapctl.pc
+#%{_datadir}/pkgconfig/xenblktapctl.pc
%{_datadir}/pkgconfig/xencall.pc
%{_datadir}/pkgconfig/xencontrol.pc
%{_datadir}/pkgconfig/xendevicemodel.pc
@@ -1047,6 +993,7 @@
%{_datadir}/pkgconfig/xenguest.pc
%{_datadir}/pkgconfig/xenstat.pc
%{_datadir}/pkgconfig/xenstore.pc
+%{_datadir}/pkgconfig/xentoolcore.pc
%{_datadir}/pkgconfig/xentoollog.pc
%{_datadir}/pkgconfig/xenvchan.pc
++++++ 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.vE8JNr/_old 2017-11-03 16:23:04.220097491 +0100
+++ /var/tmp/diff_new_pack.vE8JNr/_new 2017-11-03 16:23:04.220097491 +0100
@@ -12,8 +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.
---- a/tools/libxc/xc_dom_x86.c
-+++ b/tools/libxc/xc_dom_x86.c
+Index: xen-4.10.0-testing/tools/libxc/xc_dom_x86.c
+===================================================================
+--- xen-4.10.0-testing.orig/tools/libxc/xc_dom_x86.c
++++ xen-4.10.0-testing/tools/libxc/xc_dom_x86.c
@@ -43,11 +43,6 @@
#define SUPERPAGE_BATCH_SIZE 512
@@ -26,8 +28,10 @@
#define X86_CR0_PE 0x01
#define X86_CR0_ET 0x10
---- a/tools/libxc/xc_private.h
-+++ b/tools/libxc/xc_private.h
+Index: xen-4.10.0-testing/tools/libxc/xc_private.h
+===================================================================
+--- xen-4.10.0-testing.orig/tools/libxc/xc_private.h
++++ xen-4.10.0-testing/tools/libxc/xc_private.h
@@ -69,6 +69,11 @@ struct iovec {
#define DECLARE_FLASK_OP struct xen_flask_op op
#define DECLARE_PLATFORM_OP struct xen_platform_op platform_op
@@ -40,8 +44,10 @@
#undef PAGE_SHIFT
#undef PAGE_SIZE
#undef PAGE_MASK
---- a/tools/libxc/xc_sr_common.c
-+++ b/tools/libxc/xc_sr_common.c
+Index: xen-4.10.0-testing/tools/libxc/xc_sr_common.c
+===================================================================
+--- xen-4.10.0-testing.orig/tools/libxc/xc_sr_common.c
++++ xen-4.10.0-testing/tools/libxc/xc_sr_common.c
@@ -156,6 +156,47 @@ static void __attribute__((unused)) buil
}
@@ -90,8 +96,10 @@
* Local variables:
* mode: C
* c-file-style: "BSD"
---- a/tools/libxc/xc_sr_common.h
-+++ b/tools/libxc/xc_sr_common.h
+Index: xen-4.10.0-testing/tools/libxc/xc_sr_common.h
+===================================================================
+--- xen-4.10.0-testing.orig/tools/libxc/xc_sr_common.h
++++ xen-4.10.0-testing/tools/libxc/xc_sr_common.h
@@ -140,6 +140,16 @@ struct xc_sr_restore_ops
int (*setup)(struct xc_sr_context *ctx);
@@ -122,7 +130,7 @@
struct xc_sr_context
{
xc_interface *xch;
-@@ -219,6 +235,8 @@ struct xc_sr_context
+@@ -216,6 +232,8 @@ struct xc_sr_context
int send_back_fd;
unsigned long p2m_size;
@@ -131,8 +139,8 @@
xc_hypercall_buffer_t dirty_bitmap_hbuf;
/* From Image Header. */
-@@ -256,8 +274,7 @@ struct xc_sr_context
- domid_t xenstore_domid, console_domid;
+@@ -253,8 +271,7 @@ struct xc_sr_context
+ uint32_t xenstore_domid, console_domid;
/* Bitmap of currently populated PFNs during restore. */
- unsigned long *populated_pfns;
@@ -141,7 +149,7 @@
/* Sender has invoked verify mode on the stream. */
bool verify;
-@@ -332,6 +349,12 @@ struct xc_sr_context
+@@ -329,6 +346,12 @@ struct xc_sr_context
/* HVM context blob. */
void *context;
size_t contextsz;
@@ -154,7 +162,7 @@
} restore;
};
} x86_hvm;
-@@ -344,6 +367,69 @@ extern struct xc_sr_save_ops save_ops_x8
+@@ -341,6 +364,69 @@ extern struct xc_sr_save_ops save_ops_x8
extern struct xc_sr_restore_ops restore_ops_x86_pv;
extern struct xc_sr_restore_ops restore_ops_x86_hvm;
@@ -224,7 +232,7 @@
struct xc_sr_record
{
uint32_t type;
-@@ -392,14 +478,6 @@ static inline int write_record(struct xc
+@@ -389,14 +475,6 @@ static inline int write_record(struct xc
*/
int read_record(struct xc_sr_context *ctx, int fd, struct xc_sr_record *rec);
@@ -239,8 +247,10 @@
#endif
/*
* Local variables:
---- a/tools/libxc/xc_sr_restore.c
-+++ b/tools/libxc/xc_sr_restore.c
+Index: xen-4.10.0-testing/tools/libxc/xc_sr_restore.c
+===================================================================
+--- xen-4.10.0-testing.orig/tools/libxc/xc_sr_restore.c
++++ xen-4.10.0-testing/tools/libxc/xc_sr_restore.c
@@ -69,132 +69,6 @@ static int read_headers(struct xc_sr_con
}
@@ -405,7 +415,7 @@
if ( ctx->restore.ops.cleanup(ctx) )
PERROR("Failed to clean up");
}
-@@ -887,7 +759,12 @@ int xc_domain_restore(xc_interface *xch,
+@@ -886,7 +758,12 @@ int xc_domain_restore(xc_interface *xch,
return -1;
}
@@ -418,8 +428,10 @@
if ( ctx.dominfo.hvm )
{
---- a/tools/libxc/xc_sr_restore_x86_hvm.c
-+++ b/tools/libxc/xc_sr_restore_x86_hvm.c
+Index: xen-4.10.0-testing/tools/libxc/xc_sr_restore_x86_hvm.c
+===================================================================
+--- xen-4.10.0-testing.orig/tools/libxc/xc_sr_restore_x86_hvm.c
++++ xen-4.10.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)
{
@@ -429,9 +441,9 @@
if ( ctx->restore.guest_type != DHDR_TYPE_X86_HVM )
{
-@@ -149,7 +151,30 @@ static int x86_hvm_setup(struct xc_sr_co
- return -1;
+@@ -158,7 +160,30 @@ static int x86_hvm_setup(struct xc_sr_co
}
+ #endif
+ bm = &ctx->x86_hvm.restore.attempted_1g;
+ bits = (ctx->restore.p2m_size >> SUPERPAGE_1GB_SHIFT) + 1;
@@ -460,7 +472,7 @@
}
/*
-@@ -224,10 +249,325 @@ static int x86_hvm_stream_complete(struc
+@@ -233,10 +258,325 @@ static int x86_hvm_stream_complete(struc
static int x86_hvm_cleanup(struct xc_sr_context *ctx)
{
free(ctx->x86_hvm.restore.context);
@@ -786,7 +798,7 @@
struct xc_sr_restore_ops restore_ops_x86_hvm =
{
.pfn_is_valid = x86_hvm_pfn_is_valid,
-@@ -236,6 +576,7 @@ struct xc_sr_restore_ops restore_ops_x86
+@@ -245,6 +585,7 @@ struct xc_sr_restore_ops restore_ops_x86
.set_page_type = x86_hvm_set_page_type,
.localise_page = x86_hvm_localise_page,
.setup = x86_hvm_setup,
@@ -794,8 +806,10 @@
.process_record = x86_hvm_process_record,
.stream_complete = x86_hvm_stream_complete,
.cleanup = x86_hvm_cleanup,
---- a/tools/libxc/xc_sr_restore_x86_pv.c
-+++ b/tools/libxc/xc_sr_restore_x86_pv.c
+Index: xen-4.10.0-testing/tools/libxc/xc_sr_restore_x86_pv.c
+===================================================================
+--- xen-4.10.0-testing.orig/tools/libxc/xc_sr_restore_x86_pv.c
++++ xen-4.10.0-testing/tools/libxc/xc_sr_restore_x86_pv.c
@@ -937,6 +937,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.vE8JNr/_old 2017-11-03 16:23:04.232097055 +0100
+++ /var/tmp/diff_new_pack.vE8JNr/_new 2017-11-03 16:23:04.232097055 +0100
@@ -7,11 +7,11 @@
tools/libxl/libxlu_disk_l.l | 1 +
5 files changed, 18 insertions(+), 1 deletion(-)
-Index: xen-4.9.0-testing/tools/libxl/libxl_disk.c
+Index: xen-4.10.0-testing/tools/libxl/libxl_disk.c
===================================================================
---- xen-4.9.0-testing.orig/tools/libxl/libxl_disk.c
-+++ xen-4.9.0-testing/tools/libxl/libxl_disk.c
-@@ -411,6 +411,8 @@ static void device_disk_add(libxl__egc *
+--- xen-4.10.0-testing.orig/tools/libxl/libxl_disk.c
++++ xen-4.10.0-testing/tools/libxl/libxl_disk.c
+@@ -406,6 +406,8 @@ static void device_disk_add(libxl__egc *
flexarray_append_pair(back, "discard-enable",
libxl_defbool_val(disk->discard_enable) ?
"1" : "0");
@@ -20,12 +20,12 @@
flexarray_append(front, "backend-id");
flexarray_append(front, GCSPRINTF("%d", disk->backend_domid));
-Index: xen-4.9.0-testing/tools/libxl/libxl.h
+Index: xen-4.10.0-testing/tools/libxl/libxl.h
===================================================================
---- xen-4.9.0-testing.orig/tools/libxl/libxl.h
-+++ xen-4.9.0-testing/tools/libxl/libxl.h
-@@ -306,6 +306,18 @@
- #define LIBXL_HAVE_BUILDINFO_HVM_ACPI_LAPTOP_SLATE 1
+--- xen-4.10.0-testing.orig/tools/libxl/libxl.h
++++ xen-4.10.0-testing/tools/libxl/libxl.h
+@@ -348,6 +348,18 @@
+ #define LIBXL_HAVE_BUILDINFO_BOOTLOADER_ARGS 1
/*
+ * The libxl_device_disk has no way to indicate that cache=unsafe is
@@ -43,10 +43,10 @@
* libxl ABI compatibility
*
* The only guarantee which libxl makes regarding ABI compatibility
-Index: xen-4.9.0-testing/tools/libxl/libxlu_disk.c
+Index: xen-4.10.0-testing/tools/libxl/libxlu_disk.c
===================================================================
---- xen-4.9.0-testing.orig/tools/libxl/libxlu_disk.c
-+++ xen-4.9.0-testing/tools/libxl/libxlu_disk.c
+--- xen-4.10.0-testing.orig/tools/libxl/libxlu_disk.c
++++ xen-4.10.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;
@@ -56,10 +56,10 @@
if (!disk->vdev) {
xlu__disk_err(&dpc,0, "no vdev specified");
-Index: xen-4.9.0-testing/tools/libxl/libxlu_disk_i.h
+Index: xen-4.10.0-testing/tools/libxl/libxlu_disk_i.h
===================================================================
---- xen-4.9.0-testing.orig/tools/libxl/libxlu_disk_i.h
-+++ xen-4.9.0-testing/tools/libxl/libxlu_disk_i.h
+--- xen-4.10.0-testing.orig/tools/libxl/libxlu_disk_i.h
++++ xen-4.10.0-testing/tools/libxl/libxlu_disk_i.h
@@ -10,7 +10,7 @@ typedef struct {
void *scanner;
YY_BUFFER_STATE buf;
@@ -69,10 +69,10 @@
const char *spec;
} DiskParseContext;
-Index: xen-4.9.0-testing/tools/libxl/libxlu_disk_l.l
+Index: xen-4.10.0-testing/tools/libxl/libxlu_disk_l.l
===================================================================
---- xen-4.9.0-testing.orig/tools/libxl/libxlu_disk_l.l
-+++ xen-4.9.0-testing/tools/libxl/libxlu_disk_l.l
+--- xen-4.10.0-testing.orig/tools/libxl/libxlu_disk_l.l
++++ xen-4.10.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.vE8JNr/_old 2017-11-03 16:23:04.244096618 +0100
+++ /var/tmp/diff_new_pack.vE8JNr/_new 2017-11-03 16:23:04.248096472 +0100
@@ -34,11 +34,11 @@
tools/libxl/xl_cmdtable.c | 15
16 files changed, 2326 insertions(+), 4 deletions(-)
-Index: xen-4.9.0-testing/docs/man/xl.cfg.pod.5.in
+Index: xen-4.10.0-testing/docs/man/xl.cfg.pod.5.in
===================================================================
---- xen-4.9.0-testing.orig/docs/man/xl.cfg.pod.5.in
-+++ xen-4.9.0-testing/docs/man/xl.cfg.pod.5.in
-@@ -550,6 +550,62 @@ Specify the backend domain name or id, d
+--- xen-4.10.0-testing.orig/docs/man/xl.cfg.pod.5.in
++++ xen-4.10.0-testing/docs/man/xl.cfg.pod.5.in
+@@ -650,6 +650,62 @@ Specify the backend domain name or id, d
=back
@@ -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.9.0-testing/docs/man/xl.pod.1.in
+Index: xen-4.10.0-testing/docs/man/xl.pod.1.in
===================================================================
---- xen-4.9.0-testing.orig/docs/man/xl.pod.1.in
-+++ xen-4.9.0-testing/docs/man/xl.pod.1.in
-@@ -1429,6 +1429,24 @@ List virtual Trusted Platform Modules fo
+--- xen-4.10.0-testing.orig/docs/man/xl.pod.1.in
++++ xen-4.10.0-testing/docs/man/xl.pod.1.in
+@@ -1481,6 +1481,24 @@ List virtual displays for a domain.
=back
@@ -130,11 +130,11 @@
=head1 PCI PASS-THROUGH
=over 4
-Index: xen-4.9.0-testing/tools/libxl/Makefile
+Index: xen-4.10.0-testing/tools/libxl/Makefile
===================================================================
---- xen-4.9.0-testing.orig/tools/libxl/Makefile
-+++ xen-4.9.0-testing/tools/libxl/Makefile
-@@ -129,6 +129,7 @@ endif
+--- xen-4.10.0-testing.orig/tools/libxl/Makefile
++++ xen-4.10.0-testing/tools/libxl/Makefile
+@@ -130,6 +130,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
\
-@@ -175,6 +176,7 @@ AUTOINCS= libxlu_cfg_y.h libxlu_cfg_l.h
+@@ -176,6 +177,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.9.0-testing/tools/libxl/libxl.h
+Index: xen-4.10.0-testing/tools/libxl/libxl.h
===================================================================
---- xen-4.9.0-testing.orig/tools/libxl/libxl.h
-+++ xen-4.9.0-testing/tools/libxl/libxl.h
-@@ -933,6 +933,13 @@ void libxl_mac_copy(libxl_ctx *ctx, libx
+--- xen-4.10.0-testing.orig/tools/libxl/libxl.h
++++ xen-4.10.0-testing/tools/libxl/libxl.h
+@@ -1010,6 +1010,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
-@@ -1834,6 +1841,41 @@ int libxl_device_channel_getinfo(libxl_c
+@@ -1917,6 +1924,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.9.0-testing/tools/libxl/libxl_create.c
+Index: xen-4.10.0-testing/tools/libxl/libxl_create.c
===================================================================
---- xen-4.9.0-testing.orig/tools/libxl/libxl_create.c
-+++ xen-4.9.0-testing/tools/libxl/libxl_create.c
-@@ -1436,6 +1436,7 @@ const struct libxl_device_type *device_t
+--- xen-4.10.0-testing.orig/tools/libxl/libxl_create.c
++++ xen-4.10.0-testing/tools/libxl/libxl_create.c
+@@ -1472,6 +1472,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.9.0-testing/tools/libxl/libxl_internal.h
+Index: xen-4.10.0-testing/tools/libxl/libxl_internal.h
===================================================================
---- xen-4.9.0-testing.orig/tools/libxl/libxl_internal.h
-+++ xen-4.9.0-testing/tools/libxl/libxl_internal.h
-@@ -3531,6 +3531,7 @@ static inline int *libxl__device_type_ge
+--- xen-4.10.0-testing.orig/tools/libxl/libxl_internal.h
++++ xen-4.10.0-testing/tools/libxl/libxl_internal.h
+@@ -3579,6 +3579,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,13 +234,13 @@
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.9.0-testing/tools/libxl/libxl_types.idl
+Index: xen-4.10.0-testing/tools/libxl/libxl_types.idl
===================================================================
---- xen-4.9.0-testing.orig/tools/libxl/libxl_types.idl
-+++ xen-4.9.0-testing/tools/libxl/libxl_types.idl
-@@ -778,6 +778,43 @@ libxl_device_channel = Struct("device_ch
- ])),
- ])
+--- xen-4.10.0-testing.orig/tools/libxl/libxl_types.idl
++++ xen-4.10.0-testing/tools/libxl/libxl_types.idl
+@@ -812,6 +812,43 @@ libxl_device_vdispl = Struct("device_vdi
+ ("connectors", Array(libxl_connector_param, "num_connectors"))
+ ])
+libxl_vscsi_pdev_type = Enumeration("vscsi_pdev_type", [
+ (0, "INVALID"),
@@ -282,15 +282,15 @@
libxl_domain_config = Struct("domain_config", [
("c_info", libxl_domain_create_info),
("b_info", libxl_domain_build_info),
-@@ -789,6 +826,7 @@ libxl_domain_config = Struct("domain_con
+@@ -823,6 +860,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")),
+ ("vscsictrls", Array(libxl_device_vscsictrl, "num_vscsictrls")),
("vtpms", Array(libxl_device_vtpm, "num_vtpms")),
- ("p9", Array(libxl_device_p9, "num_p9s")),
- # a channel manifests as a console with a name,
-@@ -827,6 +865,21 @@ libxl_nicinfo = Struct("nicinfo", [
+ ("p9s", Array(libxl_device_p9, "num_p9s")),
+ ("vdispls", Array(libxl_device_vdispl, "num_vdispls")),
+@@ -862,6 +900,21 @@ libxl_nicinfo = Struct("nicinfo", [
("rref_rx", integer),
], dir=DIR_OUT)
@@ -312,23 +312,23 @@
libxl_vtpminfo = Struct("vtpminfo", [
("backend", string),
("backend_id", uint32),
-Index: xen-4.9.0-testing/tools/libxl/libxl_types_internal.idl
+Index: xen-4.10.0-testing/tools/libxl/libxl_types_internal.idl
===================================================================
---- xen-4.9.0-testing.orig/tools/libxl/libxl_types_internal.idl
-+++ xen-4.9.0-testing/tools/libxl/libxl_types_internal.idl
-@@ -26,6 +26,7 @@ libxl__device_kind = Enumeration("device
- (9, "VUSB"),
- (10, "QUSB"),
+--- xen-4.10.0-testing.orig/tools/libxl/libxl_types_internal.idl
++++ xen-4.10.0-testing/tools/libxl/libxl_types_internal.idl
+@@ -28,6 +28,7 @@ libxl__device_kind = Enumeration("device
(11, "9PFS"),
-+ (12, "VSCSI"),
+ (12, "VDISPL"),
+ (13, "VUART"),
++ (14, "VSCSI"),
])
libxl__console_backend = Enumeration("console_backend", [
-Index: xen-4.9.0-testing/tools/libxl/libxl_vscsi.c
+Index: xen-4.10.0-testing/tools/libxl/libxl_vscsi.c
===================================================================
--- /dev/null
-+++ xen-4.9.0-testing/tools/libxl/libxl_vscsi.c
-@@ -0,0 +1,1176 @@
++++ xen-4.10.0-testing/tools/libxl/libxl_vscsi.c
+@@ -0,0 +1,1185 @@
+/*
+ * Copyright (C) 2016 SUSE Linux GmbH
+ * Author Olaf Hering <o...@aepfle.de>
@@ -1174,7 +1174,8 @@
+ if (rc) goto out;
+
+ /* Replace or append the copy to the domain config */
-+ DEVICE_ADD(vscsictrl, vscsictrls, domid, &vscsictrl_saved,
COMPARE_DEVID, &d_config);
++ device_add_domain_config(gc, &d_config, &libxl__vscsictrl_devtype,
++ &vscsictrl_saved);
+ }
+
+ fn(egc, aodev, &vscsictrl_saved, &d_config);
@@ -1231,6 +1232,14 @@
+ return AO_INPROGRESS;
+}
+
++static LIBXL_DEFINE_UPDATE_DEVID(vscsictrl, "vscsi")
++
++static int libxl__device_vscsictrl_setdefault(libxl__gc *gc, uint32_t domid,
++ libxl_device_vscsictrl *vscsictrl,
bool hotplug)
++{
++ return 0;
++}
++
+static void libxl__device_vscsictrl_add(libxl__egc *egc, uint32_t domid,
+ libxl_device_vscsictrl *vscsictrl,
+ libxl__ao_device *aodev)
@@ -1505,10 +1514,10 @@
+ * indent-tabs-mode: nil
+ * End:
+ */
-Index: xen-4.9.0-testing/tools/libxl/libxlu_vscsi.c
+Index: xen-4.10.0-testing/tools/libxl/libxlu_vscsi.c
===================================================================
--- /dev/null
-+++ xen-4.9.0-testing/tools/libxl/libxlu_vscsi.c
++++ xen-4.10.0-testing/tools/libxl/libxlu_vscsi.c
@@ -0,0 +1,668 @@
+/*
+ * libxlu_vscsi.c - xl configuration file parsing: setup and helper functions
@@ -2178,10 +2187,10 @@
+ return ERROR_INVAL;
+}
+#endif
-Index: xen-4.9.0-testing/tools/libxl/libxlutil.h
+Index: xen-4.10.0-testing/tools/libxl/libxlutil.h
===================================================================
---- xen-4.9.0-testing.orig/tools/libxl/libxlutil.h
-+++ xen-4.9.0-testing/tools/libxl/libxlutil.h
+--- xen-4.10.0-testing.orig/tools/libxl/libxlutil.h
++++ xen-4.10.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);
@@ -2208,24 +2217,24 @@
#endif /* LIBXLUTIL_H */
/*
-Index: xen-4.9.0-testing/tools/xl/Makefile
+Index: xen-4.10.0-testing/tools/xl/Makefile
===================================================================
---- xen-4.9.0-testing.orig/tools/xl/Makefile
-+++ xen-4.9.0-testing/tools/xl/Makefile
-@@ -17,7 +17,7 @@ CFLAGS_XL += -Wshadow
-
- XL_OBJS = xl.o xl_cmdtable.o xl_sxp.o xl_utils.o
+--- xen-4.10.0-testing.orig/tools/xl/Makefile
++++ xen-4.10.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_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_psr.o xl_info.o xl_console.o xl_misc.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.9.0-testing/tools/xl/xl.h
+Index: xen-4.10.0-testing/tools/xl/xl.h
===================================================================
---- xen-4.9.0-testing.orig/tools/xl/xl.h
-+++ xen-4.9.0-testing/tools/xl/xl.h
-@@ -163,6 +163,9 @@ int main_channellist(int argc, char **ar
+--- xen-4.10.0-testing.orig/tools/xl/xl.h
++++ xen-4.10.0-testing/tools/xl/xl.h
+@@ -164,6 +164,9 @@ int main_channellist(int argc, char **ar
int main_blockattach(int argc, char **argv);
int main_blocklist(int argc, char **argv);
int main_blockdetach(int argc, char **argv);
@@ -2235,20 +2244,20 @@
int main_vtpmattach(int argc, char **argv);
int main_vtpmlist(int argc, char **argv);
int main_vtpmdetach(int argc, char **argv);
-Index: xen-4.9.0-testing/tools/xl/xl_parse.c
+Index: xen-4.10.0-testing/tools/xl/xl_parse.c
===================================================================
---- xen-4.9.0-testing.orig/tools/xl/xl_parse.c
-+++ xen-4.9.0-testing/tools/xl/xl_parse.c
-@@ -812,7 +812,7 @@ void parse_config_data(const char *confi
+--- xen-4.10.0-testing.orig/tools/xl/xl_parse.c
++++ xen-4.10.0-testing/tools/xl/xl_parse.c
+@@ -860,7 +860,7 @@ void parse_config_data(const char *confi
long l, vcpus = 0;
XLU_Config *config;
XLU_ConfigList *cpus, *vbds, *nics, *pcis, *cvfbs, *cpuids, *vtpms,
-- *usbctrls, *usbdevs, *p9devs;
-+ *usbctrls, *usbdevs, *p9devs, *vscsictrls;
- XLU_ConfigList *channels, *ioports, *irqs, *iomem, *viridian, *dtdevs;
- int num_ioports, num_irqs, num_iomem, num_cpus, num_viridian;
- int pci_power_mgmt = 0;
-@@ -1418,6 +1418,17 @@ void parse_config_data(const char *confi
+- *usbctrls, *usbdevs, *p9devs, *vdispls;
++ *usbctrls, *usbdevs, *p9devs, *vdispls, *vscsictrls;
+ XLU_ConfigList *channels, *ioports, *irqs, *iomem, *viridian, *dtdevs,
+ *mca_caps;
+ int num_ioports, num_irqs, num_iomem, num_cpus, num_viridian,
num_mca_caps;
+@@ -1608,6 +1608,17 @@ void parse_config_data(const char *confi
}
}
@@ -2266,10 +2275,10 @@
if (!xlu_cfg_get_list(config, "vtpm", &vtpms, 0, 0)) {
d_config->num_vtpms = 0;
d_config->vtpms = NULL;
-Index: xen-4.9.0-testing/tools/xl/xl_vscsi.c
+Index: xen-4.10.0-testing/tools/xl/xl_vscsi.c
===================================================================
--- /dev/null
-+++ xen-4.9.0-testing/tools/xl/xl_vscsi.c
++++ xen-4.10.0-testing/tools/xl/xl_vscsi.c
@@ -0,0 +1,229 @@
+/*
+ * Copyright 2009-2017 Citrix Ltd and other contributors
@@ -2500,11 +2509,11 @@
+ return !!rc;
+}
+
-Index: xen-4.9.0-testing/tools/xl/xl_cmdtable.c
+Index: xen-4.10.0-testing/tools/xl/xl_cmdtable.c
===================================================================
---- xen-4.9.0-testing.orig/tools/xl/xl_cmdtable.c
-+++ xen-4.9.0-testing/tools/xl/xl_cmdtable.c
-@@ -357,6 +357,21 @@ struct cmd_spec cmd_table[] = {
+--- xen-4.10.0-testing.orig/tools/xl/xl_cmdtable.c
++++ xen-4.10.0-testing/tools/xl/xl_cmdtable.c
+@@ -364,6 +364,21 @@ struct cmd_spec cmd_table[] = {
"Destroy a domain's virtual block device",
"<Domain> <DevId>",
},
++++++ mini-os.tar.bz2 ++++++
++++ 10877 lines of diff (skipped)
++++++ stubdom.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/xen/stubdom.tar.bz2
/work/SRC/openSUSE:Factory/.xen.new/stubdom.tar.bz2 differ: char 11, line 1
++++++ suspend_evtchn_lock.patch ++++++
--- /var/tmp/diff_new_pack.vE8JNr/_old 2017-11-03 16:23:04.540085845 +0100
+++ /var/tmp/diff_new_pack.vE8JNr/_new 2017-11-03 16:23:04.540085845 +0100
@@ -6,10 +6,10 @@
Signed-off-by: Chunyan Liu <cy...@suse.com>
-Index: xen-4.7.0-testing/tools/libxc/xc_suspend.c
+Index: xen-4.10.0-testing/tools/libxc/xc_suspend.c
===================================================================
---- xen-4.7.0-testing.orig/tools/libxc/xc_suspend.c
-+++ xen-4.7.0-testing/tools/libxc/xc_suspend.c
+--- xen-4.10.0-testing.orig/tools/libxc/xc_suspend.c
++++ xen-4.10.0-testing/tools/libxc/xc_suspend.c
@@ -20,6 +20,10 @@
#include "xc_private.h"
@@ -56,7 +56,7 @@
+ }
+}
+
- static void get_suspend_file(char buf[], int domid)
+ static void get_suspend_file(char buf[], uint32_t domid)
{
snprintf(buf, SUSPEND_FILE_BUFLEN, SUSPEND_LOCK_FILE, domid);
@@ -48,6 +83,7 @@ static int lock_suspend_event(xc_interfa
++++++ tmp_build.patch ++++++
--- /var/tmp/diff_new_pack.vE8JNr/_old 2017-11-03 16:23:04.560085118 +0100
+++ /var/tmp/diff_new_pack.vE8JNr/_new 2017-11-03 16:23:04.564084972 +0100
@@ -14,19 +14,19 @@
tools/xenstore/Makefile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
-Index: xen-4.9.0-testing/tools/xenstore/Makefile
+Index: xen-4.10.0-testing/tools/xenstore/Makefile
===================================================================
---- xen-4.9.0-testing.orig/tools/xenstore/Makefile
-+++ xen-4.9.0-testing/tools/xenstore/Makefile
-@@ -90,6 +90,7 @@ $(CLIENTS_DOMU): xenstore
+--- xen-4.10.0-testing.orig/tools/xenstore/Makefile
++++ xen-4.10.0-testing/tools/xenstore/Makefile
+@@ -91,6 +91,7 @@ $(CLIENTS_DOMU): xenstore
xenstore: xenstore_client.o $(LIBXENSTORE)
- $(CC) $< $(LDFLAGS) $(LDLIBS_libxenstore) $(SOCKET_LIBS) -o $@
$(APPEND_LDFLAGS)
-+ $(CC) $< $(CFLAGS) $(LDFLAGS) -Wl,--build-id=uuid -L. -lxenstore
$(SOCKET_LIBS) -o domu-$@
+ $(CC) $< $(LDFLAGS) $(LDLIBS_libxenstore) $(LDLIBS_libxentoolcore)
$(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS)
++ $(CC) $< $(CFLAGS) $(LDFLAGS) -Wl,--build-id=uuid -L. -lxenstore
$(LDLIBS_libxentoolcore) $(SOCKET_LIBS) -o domu-$@
xenstore-control: xenstore_control.o $(LIBXENSTORE)
- $(CC) $< $(LDFLAGS) $(LDLIBS_libxenstore) $(SOCKET_LIBS) -o $@
$(APPEND_LDFLAGS)
-@@ -163,10 +164,11 @@ endif
+ $(CC) $< $(LDFLAGS) $(LDLIBS_libxenstore) $(LDLIBS_libxentoolcore)
$(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS)
+@@ -164,10 +165,11 @@ endif
$(INSTALL_PROG) xenstore-control $(DESTDIR)$(bindir)
$(INSTALL_PROG) xenstore $(DESTDIR)$(bindir)
set -e ; for c in $(CLIENTS) ; do \
++++++ x86-ioapic-ack-default.patch ++++++
--- /var/tmp/diff_new_pack.vE8JNr/_old 2017-11-03 16:23:04.580084389 +0100
+++ /var/tmp/diff_new_pack.vE8JNr/_new 2017-11-03 16:23:04.580084389 +0100
@@ -1,10 +1,10 @@
Change default IO-APIC ack mode for single IO-APIC systems to old-style.
-Index: xen-4.9.0-testing/xen/arch/x86/io_apic.c
+Index: xen-4.10.0-testing/xen/arch/x86/io_apic.c
===================================================================
---- xen-4.9.0-testing.orig/xen/arch/x86/io_apic.c
-+++ xen-4.9.0-testing/xen/arch/x86/io_apic.c
-@@ -2027,7 +2027,10 @@ void __init setup_IO_APIC(void)
+--- xen-4.10.0-testing.orig/xen/arch/x86/io_apic.c
++++ xen-4.10.0-testing/xen/arch/x86/io_apic.c
+@@ -2029,7 +2029,10 @@ void __init setup_IO_APIC(void)
io_apic_irqs = ~PIC_IRQS;
printk("ENABLING IO-APIC IRQs\n");
++++++ xen-4.9.0-testing-src.tar.bz2 -> xen-4.10.0-testing-src.tar.bz2 ++++++
++++ 97973 lines of diff (skipped)
++++++ xen-destdir.patch ++++++
--- /var/tmp/diff_new_pack.vE8JNr/_old 2017-11-03 16:23:06.848001846 +0100
+++ /var/tmp/diff_new_pack.vE8JNr/_new 2017-11-03 16:23:06.848001846 +0100
@@ -1,8 +1,8 @@
-Index: xen-4.9.0-testing/tools/xenstore/Makefile
+Index: xen-4.10.0-testing/tools/xenstore/Makefile
===================================================================
---- xen-4.9.0-testing.orig/tools/xenstore/Makefile
-+++ xen-4.9.0-testing/tools/xenstore/Makefile
-@@ -22,6 +22,7 @@ LDFLAGS += $(LDFLAGS-y)
+--- xen-4.10.0-testing.orig/tools/xenstore/Makefile
++++ xen-4.10.0-testing/tools/xenstore/Makefile
+@@ -23,6 +23,7 @@ LDFLAGS += $(LDFLAGS-y)
CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm
xenstore-chmod
CLIENTS += xenstore-write xenstore-ls xenstore-watch
@@ -10,7 +10,7 @@
XENSTORED_OBJS = xenstored_core.o xenstored_watch.o xenstored_domain.o
XENSTORED_OBJS += xenstored_transaction.o xenstored_control.o
-@@ -59,7 +60,7 @@ endif
+@@ -60,7 +61,7 @@ endif
all: $(ALL_TARGETS)
.PHONY: clients
@@ -19,7 +19,7 @@
ifeq ($(CONFIG_SunOS),y)
xenstored_probes.h: xenstored_probes.d
-@@ -84,6 +85,9 @@ xenstored.a: $(XENSTORED_OBJS)
+@@ -85,6 +86,9 @@ xenstored.a: $(XENSTORED_OBJS)
$(CLIENTS): xenstore
ln -f xenstore $@
@@ -27,18 +27,18 @@
+ ln -f xenstore $@
+
xenstore: xenstore_client.o $(LIBXENSTORE)
- $(CC) $< $(LDFLAGS) $(LDLIBS_libxenstore) $(SOCKET_LIBS) -o $@
$(APPEND_LDFLAGS)
+ $(CC) $< $(LDFLAGS) $(LDLIBS_libxenstore) $(LDLIBS_libxentoolcore)
$(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS)
-@@ -130,7 +134,7 @@ clean:
+@@ -131,7 +135,7 @@ clean:
rm -f *.a *.o *.opic *.so* xenstored_probes.h
rm -f xenstored xs_random xs_stress xs_crashme
rm -f xs_tdb_dump xenstore-control init-xenstore-domain
- rm -f xenstore $(CLIENTS)
+ rm -f xenstore $(CLIENTS) $(CLIENTS_DOMU)
rm -f xenstore.pc
- $(RM) $(DEPS)
+ $(RM) $(DEPS_RM)
-@@ -154,12 +158,16 @@ ifeq ($(XENSTORE_XENSTORED),y)
+@@ -155,12 +159,16 @@ ifeq ($(XENSTORE_XENSTORED),y)
$(INSTALL_DIR) $(DESTDIR)$(sbindir)
$(INSTALL_DIR) $(DESTDIR)$(XEN_LIB_STORED)
$(INSTALL_PROG) xenstored $(DESTDIR)$(sbindir)
++++++ xen.build-compare.doc_html.patch ++++++
--- /var/tmp/diff_new_pack.vE8JNr/_old 2017-11-03 16:23:06.880000682 +0100
+++ /var/tmp/diff_new_pack.vE8JNr/_new 2017-11-03 16:23:06.880000682 +0100
@@ -5,11 +5,11 @@
docs/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
-Index: xen-4.9.0-testing/docs/Makefile
+Index: xen-4.10.0-testing/docs/Makefile
===================================================================
---- xen-4.9.0-testing.orig/docs/Makefile
-+++ xen-4.9.0-testing/docs/Makefile
-@@ -185,7 +185,7 @@ install: install-man-pages install-html
+--- xen-4.10.0-testing.orig/docs/Makefile
++++ xen-4.10.0-testing/docs/Makefile
+@@ -198,7 +198,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/%.html: %.markdown
ifneq ($(MARKDOWN),)
-@@ -208,8 +208,8 @@ html/hypercall/%/index.html: $(CURDIR)/x
+@@ -221,8 +221,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.vE8JNr/_old 2017-11-03 16:23:06.892000245 +0100
+++ /var/tmp/diff_new_pack.vE8JNr/_new 2017-11-03 16:23:06.892000245 +0100
@@ -7,11 +7,20 @@
tools/libxl/libxlu_disk_l.l | 2 ++
4 files changed, 37 insertions(+), 6 deletions(-)
-Index: xen-4.9.0-testing/tools/libxl/libxl_disk.c
+Index: xen-4.10.0-testing/tools/libxl/libxl_disk.c
===================================================================
---- xen-4.9.0-testing.orig/tools/libxl/libxl_disk.c
-+++ xen-4.9.0-testing/tools/libxl/libxl_disk.c
-@@ -357,6 +357,10 @@ static void device_disk_add(libxl__egc *
+--- xen-4.10.0-testing.orig/tools/libxl/libxl_disk.c
++++ xen-4.10.0-testing/tools/libxl/libxl_disk.c
+@@ -179,7 +179,7 @@ static int libxl__device_disk_setdefault
+ return rc;
+ }
+
+-static int libxl__device_from_disk(libxl__gc *gc, uint32_t domid,
++int libxl__device_from_disk(libxl__gc *gc, uint32_t domid,
+ const libxl_device_disk *disk,
+ libxl__device *device)
+ {
+@@ -356,6 +356,10 @@ static void device_disk_add(libxl__egc *
/* now create a phy device to export the device to the guest
*/
goto do_backend_phy;
case LIBXL_DISK_BACKEND_QDISK:
@@ -22,11 +31,11 @@
flexarray_append(back, "params");
flexarray_append(back, GCSPRINTF("%s:%s",
libxl__device_disk_string_of_format(disk->format),
-Index: xen-4.9.0-testing/tools/libxl/libxl_device.c
+Index: xen-4.10.0-testing/tools/libxl/libxl_device.c
===================================================================
---- xen-4.9.0-testing.orig/tools/libxl/libxl_device.c
-+++ xen-4.9.0-testing/tools/libxl/libxl_device.c
-@@ -307,7 +307,8 @@ static int disk_try_backend(disk_try_bac
+--- xen-4.10.0-testing.orig/tools/libxl/libxl_device.c
++++ xen-4.10.0-testing/tools/libxl/libxl_device.c
+@@ -311,7 +311,8 @@ static int disk_try_backend(disk_try_bac
return backend;
case LIBXL_DISK_BACKEND_QDISK:
@@ -36,11 +45,11 @@
return backend;
default:
-Index: xen-4.9.0-testing/tools/libxl/libxl_dm.c
+Index: xen-4.10.0-testing/tools/libxl/libxl_dm.c
===================================================================
---- xen-4.9.0-testing.orig/tools/libxl/libxl_dm.c
-+++ xen-4.9.0-testing/tools/libxl/libxl_dm.c
-@@ -910,6 +910,30 @@ static char *qemu_disk_ide_drive_string(
+--- xen-4.10.0-testing.orig/tools/libxl/libxl_dm.c
++++ xen-4.10.0-testing/tools/libxl/libxl_dm.c
+@@ -935,6 +935,30 @@ static char *qemu_disk_ide_drive_string(
return drive;
}
@@ -71,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,
-@@ -1472,9 +1496,11 @@ static int libxl__build_device_model_arg
+@@ -1502,9 +1526,11 @@ static int libxl__build_device_model_arg
libxl__device_disk_dev_number(disks[i].vdev, &disk, &part);
const char *format;
char *drive;
@@ -84,7 +93,7 @@
if (dev_number == -1) {
LOGD(WARN, guest_domid, "unable to determine"" disk number
for %s",
disks[i].vdev);
-@@ -1515,7 +1541,7 @@ static int libxl__build_device_model_arg
+@@ -1545,7 +1571,7 @@ static int libxl__build_device_model_arg
* the bootloader path.
*/
if (disks[i].backend == LIBXL_DISK_BACKEND_TAP)
@@ -93,11 +102,11 @@
disks[i].format);
else
target_path = libxl__device_disk_find_local_path(gc,
-Index: xen-4.9.0-testing/tools/libxl/libxlu_disk_l.l
+Index: xen-4.10.0-testing/tools/libxl/libxlu_disk_l.l
===================================================================
---- xen-4.9.0-testing.orig/tools/libxl/libxlu_disk_l.l
-+++ xen-4.9.0-testing/tools/libxl/libxlu_disk_l.l
-@@ -229,6 +229,8 @@ target=.* { STRIP(','); SAVESTRING("targ
+--- xen-4.10.0-testing.orig/tools/libxl/libxlu_disk_l.l
++++ xen-4.10.0-testing/tools/libxl/libxlu_disk_l.l
+@@ -230,6 +230,8 @@ target=.* { STRIP(','); SAVESTRING("targ
free(newscript);
}
@@ -106,3 +115,18 @@
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.10.0-testing/tools/libxl/libxl_internal.h
+===================================================================
+--- xen-4.10.0-testing.orig/tools/libxl/libxl_internal.h
++++ xen-4.10.0-testing/tools/libxl/libxl_internal.h
+@@ -1758,6 +1758,10 @@ _hidden char *libxl__blktap_devpath(libx
+ */
+ _hidden int libxl__device_destroy_tapdisk(libxl__gc *gc, const char *params);
+
++_hidden int libxl__device_from_disk(libxl__gc *gc, uint32_t domid,
++ const libxl_device_disk *disk,
++ libxl__device *device);
++
+ /* Calls poll() again - useful to check whether a signaled condition
+ * is still true. Cannot fail. Returns currently-true revents. */
+ _hidden short libxl__fd_poll_recheck(libxl__egc *egc, int fd, short events);
