diff --git a/0002-libxc-Prepare-a-start-info-structure-for-hvmloader.patch b/0002-libxc-Prepare-a-start-info-structure-for-hvmloader.patch index 351a129..c2b8b53 100644 --- a/0002-libxc-Prepare-a-start-info-structure-for-hvmloader.patch +++ b/0002-libxc-Prepare-a-start-info-structure-for-hvmloader.patch @@ -250,7 +250,7 @@ Index: xen-4.7.0-testing/xen/include/public/xen.h =================================================================== --- xen-4.7.0-testing.orig/xen/include/public/xen.h +++ xen-4.7.0-testing/xen/include/public/xen.h -@@ -815,7 +815,7 @@ struct start_info { +@@ -814,7 +814,7 @@ struct start_info { typedef struct start_info start_info_t; /* diff --git a/0005-libxl-Load-guest-BIOS-from-file.patch b/0005-libxl-Load-guest-BIOS-from-file.patch index 85d32c8..bc38ae3 100644 --- a/0005-libxl-Load-guest-BIOS-from-file.patch +++ b/0005-libxl-Load-guest-BIOS-from-file.patch @@ -42,7 +42,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl.h =================================================================== --- xen-4.7.0-testing.orig/tools/libxl/libxl.h +++ xen-4.7.0-testing/tools/libxl/libxl.h -@@ -934,6 +934,14 @@ void libxl_mac_copy(libxl_ctx *ctx, libx +@@ -940,6 +940,14 @@ void libxl_mac_copy(libxl_ctx *ctx, libx #define LIBXL_HAVE_CHECKPOINTED_STREAM 1 /* @@ -143,7 +143,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl_internal.h =================================================================== --- xen-4.7.0-testing.orig/tools/libxl/libxl_internal.h +++ xen-4.7.0-testing/tools/libxl/libxl_internal.h -@@ -2314,6 +2314,8 @@ _hidden const char *libxl__xen_config_di +@@ -2315,6 +2315,8 @@ _hidden const char *libxl__xen_config_di _hidden const char *libxl__xen_script_dir_path(void); _hidden const char *libxl__lock_dir_path(void); _hidden const char *libxl__run_dir_path(void); @@ -177,7 +177,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl_types.idl =================================================================== --- xen-4.7.0-testing.orig/tools/libxl/libxl_types.idl +++ xen-4.7.0-testing/tools/libxl/libxl_types.idl -@@ -511,6 +511,7 @@ libxl_domain_build_info = Struct("domain +@@ -512,6 +512,7 @@ libxl_domain_build_info = Struct("domain ("timer_mode", libxl_timer_mode), ("nested_hvm", libxl_defbool), ("altp2m", libxl_defbool), diff --git a/0006-xen-Move-the-hvm_start_info-C-representation-from-li.patch b/0006-xen-Move-the-hvm_start_info-C-representation-from-li.patch index 078cbfa..8f85ca8 100644 --- a/0006-xen-Move-the-hvm_start_info-C-representation-from-li.patch +++ b/0006-xen-Move-the-hvm_start_info-C-representation-from-li.patch @@ -59,15 +59,15 @@ Index: xen-4.7.0-testing/xen/include/public/xen.h =================================================================== --- xen-4.7.0-testing.orig/xen/include/public/xen.h +++ xen-4.7.0-testing/xen/include/public/xen.h -@@ -860,6 +860,37 @@ typedef struct start_info start_info_t; +@@ -859,6 +859,37 @@ typedef struct start_info start_info_t; */ #define XEN_HVM_START_MAGIC_VALUE 0x336ec578 +#if defined(__i386__) || defined(__x86_64__) +/* C representation of the x86/HVM start info layout. + * -+ * The canonical definition of this layout is abrove, this is just a way to -+ * represent the layout described there using C types. ++ * The canonical definition of this layout resides in public/xen.h, this ++ * is just a way to represent the layout described there using C types. + * + * NB: the packed attribute is not really needed, but it helps us enforce + * the fact this this is just a representation, and it might indeed @@ -78,11 +78,11 @@ Index: xen-4.7.0-testing/xen/include/public/xen.h + /* ("xEn3" with the 0x80 bit of the "E" set).*/ + uint32_t version; /* Version of this structure. */ + uint32_t flags; /* SIF_xxx flags. */ -+ uint32_t cmdline_paddr; /* Physical address of the command line. */ + uint32_t nr_modules; /* Number of modules passed to the kernel. */ -+ uint32_t modlist_paddr; /* Physical address of an array of */ ++ uint64_t modlist_paddr; /* Physical address of an array of */ + /* hvm_modlist_entry. */ -+ uint32_t rsdp_paddr; /* Physical address of the RSDP ACPI data */ ++ uint64_t cmdline_paddr; /* Physical address of the command line. */ ++ uint64_t rsdp_paddr; /* Physical address of the RSDP ACPI data */ + /* structure. */ +} __attribute__((packed)); + diff --git a/0008-hvmloader-Locate-the-BIOS-blob.patch b/0008-hvmloader-Locate-the-BIOS-blob.patch index e07fd81..848350f 100644 --- a/0008-hvmloader-Locate-the-BIOS-blob.patch +++ b/0008-hvmloader-Locate-the-BIOS-blob.patch @@ -45,7 +45,7 @@ Index: xen-4.7.0-testing/tools/firmware/hvmloader/hvmloader.c + const char *name) +{ + const struct hvm_modlist_entry *modlist = -+ (struct hvm_modlist_entry *)info->modlist_paddr; ++ (struct hvm_modlist_entry *)((uintptr_t)info->modlist_paddr); + unsigned int i; + + if ( !modlist ) diff --git a/0009-hvmloader-Check-modules-whereabouts-in-perform_tests.patch b/0009-hvmloader-Check-modules-whereabouts-in-perform_tests.patch index 6ebdbc8..3d04772 100644 --- a/0009-hvmloader-Check-modules-whereabouts-in-perform_tests.patch +++ b/0009-hvmloader-Check-modules-whereabouts-in-perform_tests.patch @@ -29,7 +29,7 @@ Index: xen-4.7.0-testing/tools/firmware/hvmloader/tests.c + for ( unsigned i = 0; i < hvm_start_info->nr_modules; i++ ) + { + const struct hvm_modlist_entry *modlist = -+ (struct hvm_modlist_entry *)hvm_start_info->modlist_paddr; ++ (struct hvm_modlist_entry *)((uintptr_t)hvm_start_info->modlist_paddr); + if ( modlist[i].paddr + && modlist[i].paddr + modlist[i].size > 4ul << 20 + && modlist[i].paddr < 8ul << 20 ) diff --git a/aarch64-rename-PSR_MODE_ELxx-to-match-linux-headers.patch b/aarch64-rename-PSR_MODE_ELxx-to-match-linux-headers.patch index cfc36ae..0baa686 100644 --- a/aarch64-rename-PSR_MODE_ELxx-to-match-linux-headers.patch +++ b/aarch64-rename-PSR_MODE_ELxx-to-match-linux-headers.patch @@ -14,7 +14,7 @@ Index: xen-4.7.0-testing/xen/include/public/arch-arm.h =================================================================== --- xen-4.7.0-testing.orig/xen/include/public/arch-arm.h +++ xen-4.7.0-testing/xen/include/public/arch-arm.h -@@ -364,13 +364,13 @@ typedef uint64_t xen_callback_t; +@@ -362,13 +362,13 @@ typedef uint64_t xen_callback_t; /* 64 bit modes */ #define PSR_MODE_BIT 0x10 /* Set iff AArch32 */ diff --git a/libxl.add-option-to-disable-disk-cache-flushes-in-qdisk.patch b/libxl.add-option-to-disable-disk-cache-flushes-in-qdisk.patch index 466329f..e0b8af9 100644 --- a/libxl.add-option-to-disable-disk-cache-flushes-in-qdisk.patch +++ b/libxl.add-option-to-disable-disk-cache-flushes-in-qdisk.patch @@ -24,8 +24,8 @@ Index: xen-4.7.0-testing/tools/libxl/libxl.h =================================================================== --- xen-4.7.0-testing.orig/tools/libxl/libxl.h +++ xen-4.7.0-testing/tools/libxl/libxl.h -@@ -247,6 +247,18 @@ - #define LIBXL_HAVE_APIC_ASSIST 1 +@@ -253,6 +253,18 @@ + #define LIBXL_HAVE_BUILD_ID 1 /* + * The libxl_device_disk has no way to indicate that cache=unsafe is diff --git a/libxl.pvscsi.patch b/libxl.pvscsi.patch index 1be43eb..dea9401 100644 --- a/libxl.pvscsi.patch +++ b/libxl.pvscsi.patch @@ -419,7 +419,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl.c #undef DEFINE_DEVICE_ADD /******************************************************************************/ -@@ -7328,6 +7605,20 @@ out: +@@ -7351,6 +7628,20 @@ out: return rc; } @@ -444,7 +444,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl.h =================================================================== --- xen-4.7.0-testing.orig/tools/libxl/libxl.h +++ xen-4.7.0-testing/tools/libxl/libxl.h -@@ -1721,6 +1721,26 @@ libxl_device_vtpm *libxl_device_vtpm_lis +@@ -1727,6 +1727,26 @@ libxl_device_vtpm *libxl_device_vtpm_lis int libxl_device_vtpm_getinfo(libxl_ctx *ctx, uint32_t domid, libxl_device_vtpm *vtpm, libxl_vtpminfo *vtpminfo); @@ -471,7 +471,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl.h /* Keyboard */ int libxl_device_vkb_add(libxl_ctx *ctx, uint32_t domid, libxl_device_vkb *vkb, const libxl_asyncop_how *ao_how) -@@ -2063,6 +2083,27 @@ int libxl_fd_set_nonblock(libxl_ctx *ctx +@@ -2069,6 +2089,27 @@ int libxl_fd_set_nonblock(libxl_ctx *ctx #include @@ -567,7 +567,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl_internal.h _hidden int libxl__device_vfb_setdefault(libxl__gc *gc, libxl_device_vfb *vfb); _hidden int libxl__device_vkb_setdefault(libxl__gc *gc, libxl_device_vkb *vkb); _hidden int libxl__device_pci_setdefault(libxl__gc *gc, libxl_device_pci *pci); -@@ -2638,6 +2639,10 @@ _hidden void libxl__device_usbdev_add(li +@@ -2639,6 +2640,10 @@ _hidden void libxl__device_usbdev_add(li libxl_device_usbdev *usbdev, libxl__ao_device *aodev); @@ -578,7 +578,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl_internal.h /* Internal function to connect a vkb device */ _hidden int libxl__device_vkb_add(libxl__gc *gc, uint32_t domid, libxl_device_vkb *vkb); -@@ -3496,6 +3501,10 @@ _hidden void libxl__add_usbdevs(libxl__e +@@ -3497,6 +3502,10 @@ _hidden void libxl__add_usbdevs(libxl__e uint32_t domid, libxl_domain_config *d_config, libxl__multidev *multidev); @@ -593,7 +593,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl_types.idl =================================================================== --- xen-4.7.0-testing.orig/tools/libxl/libxl_types.idl +++ xen-4.7.0-testing/tools/libxl/libxl_types.idl -@@ -696,6 +696,26 @@ libxl_device_channel = Struct("device_ch +@@ -697,6 +697,26 @@ libxl_device_channel = Struct("device_ch ])), ]) @@ -620,7 +620,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl_types.idl libxl_domain_config = Struct("domain_config", [ ("c_info", libxl_domain_create_info), ("b_info", libxl_domain_build_info), -@@ -713,6 +733,8 @@ libxl_domain_config = Struct("domain_con +@@ -714,6 +734,8 @@ libxl_domain_config = Struct("domain_con ("channels", Array(libxl_device_channel, "num_channels")), ("usbctrls", Array(libxl_device_usbctrl, "num_usbctrls")), ("usbdevs", Array(libxl_device_usbdev, "num_usbdevs")), @@ -629,7 +629,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl_types.idl ("on_poweroff", libxl_action_on_shutdown), ("on_reboot", libxl_action_on_shutdown), -@@ -771,6 +793,28 @@ libxl_usbctrlinfo = Struct("usbctrlinfo" +@@ -772,6 +794,28 @@ libxl_usbctrlinfo = Struct("usbctrlinfo" ("ref_conn", integer), ], dir=DIR_OUT) @@ -903,7 +903,7 @@ Index: xen-4.7.0-testing/tools/libxl/xl_cmdimpl.c if (!xlu_cfg_get_list(config, "vtpm", &vtpms, 0, 0)) { d_config->num_vtpms = 0; d_config->vtpms = NULL; -@@ -7412,6 +7590,256 @@ int main_blockdetach(int argc, char **ar +@@ -7416,6 +7594,256 @@ int main_blockdetach(int argc, char **ar return rc; } diff --git a/x86-cpufreq-report.patch b/x86-cpufreq-report.patch index 90b2f8e..48ac4cd 100644 --- a/x86-cpufreq-report.patch +++ b/x86-cpufreq-report.patch @@ -11,7 +11,7 @@ Index: xen-4.7.0-testing/xen/arch/x86/platform_hypercall.c #include #include #include -@@ -819,6 +819,41 @@ ret_t do_platform_op(XEN_GUEST_HANDLE_PA +@@ -820,6 +820,41 @@ ret_t do_platform_op(XEN_GUEST_HANDLE_PA ret = -EFAULT; } break; diff --git a/xen-4.7.0-testing-src.tar.bz2 b/xen-4.7.0-testing-src.tar.bz2 index 737fe90..2227850 100644 --- a/xen-4.7.0-testing-src.tar.bz2 +++ b/xen-4.7.0-testing-src.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3aaa35be2550c1e78a73651d033abb954e0322688467f2fa0c37a7c2abf829bd -size 4409531 +oid sha256:f9f6ecde51ca3086fbad54d5e77076b917f0febb1120933c6337ad29a3b2e3ef +size 4462017 diff --git a/xen.changes b/xen.changes index a73739c..f3f5bd0 100644 --- a/xen.changes +++ b/xen.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Mon Apr 18 11:03:33 MDT 2016 - carnold@suse.com +Fri Apr 29 16:50:33 MDT 2016 - carnold@suse.com -- Update to the latest Xen 4.7 pre-release f3a7ca02 (fate#319989) +- Update to the latest Xen 4.7 pre-release c2994f86 (fate#319989) Drop libxl.migrate-legacy-stream-read.patch ------------------------------------------------------------------- diff --git a/xen.spec b/xen.spec index 1432143..b90befb 100644 --- a/xen.spec +++ b/xen.spec @@ -1045,6 +1045,7 @@ rm -f $RPM_BUILD_ROOT/usr/libexec/qemu-bridge-helper /usr/sbin/xen-list /usr/sbin/xen-destroy /usr/sbin/xen-bugtool +/usr/sbin/xen-xsplice %dir %attr(700,root,root) /etc/xen %dir /etc/xen/scripts %if %{?with_qemu_traditional}0