LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File project.diff of Package xen (Project home:charlesa:Factory)

--- ioemu-vnc-resize.patch.orig
+++ ioemu-vnc-resize.patch
@@ -1,8 +1,8 @@
-Index: xen-4.6.1-testing/tools/qemu-xen-traditional-dir-remote/vnc.c
+Index: xen-4.9.0-testing/tools/qemu-xen-traditional-dir-remote/vnc.c
 ===================================================================
---- xen-4.6.1-testing.orig/tools/qemu-xen-traditional-dir-remote/vnc.c
-+++ xen-4.6.1-testing/tools/qemu-xen-traditional-dir-remote/vnc.c
-@@ -1761,6 +1761,25 @@ static int protocol_client_msg(VncState
+--- xen-4.9.0-testing.orig/tools/qemu-xen-traditional-dir-remote/vnc.c
++++ xen-4.9.0-testing/tools/qemu-xen-traditional-dir-remote/vnc.c
+@@ -1727,6 +1727,25 @@ static int protocol_client_msg(VncState
  	}
  
  	set_encodings(vs, (int32_t *)(data + 4), limit);
--- tmp_build.patch.orig
+++ tmp_build.patch
@@ -14,10 +14,10 @@ links.
  tools/xenstore/Makefile |    6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
-Index: xen-4.8.0-testing/tools/xenstore/Makefile
+Index: xen-4.9.0-testing/tools/xenstore/Makefile
 ===================================================================
---- xen-4.8.0-testing.orig/tools/xenstore/Makefile
-+++ xen-4.8.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
  
  xenstore: xenstore_client.o $(LIBXENSTORE)
@@ -26,7 +26,7 @@ Index: xen-4.8.0-testing/tools/xenstore/
  
  xenstore-control: xenstore_control.o $(LIBXENSTORE)
  	$(CC) $< $(LDFLAGS) $(LDLIBS_libxenstore) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS)
-@@ -143,10 +144,11 @@ endif
+@@ -163,10 +164,11 @@ endif
  	$(INSTALL_PROG) xenstore-control $(DESTDIR)$(bindir)
  	$(INSTALL_PROG) xenstore $(DESTDIR)$(bindir)
  	set -e ; for c in $(CLIENTS) ; do \
--- x86-cpufreq-report.patch.orig
+++ x86-cpufreq-report.patch
@@ -1,8 +1,8 @@
-Index: xen-4.8.0-testing/xen/arch/x86/platform_hypercall.c
+Index: xen-4.9.0-testing/xen/arch/x86/platform_hypercall.c
 ===================================================================
---- xen-4.8.0-testing.orig/xen/arch/x86/platform_hypercall.c
-+++ xen-4.8.0-testing/xen/arch/x86/platform_hypercall.c
-@@ -26,7 +26,7 @@
+--- xen-4.9.0-testing.orig/xen/arch/x86/platform_hypercall.c
++++ xen-4.9.0-testing/xen/arch/x86/platform_hypercall.c
+@@ -25,7 +25,7 @@
  #include <xen/symbols.h>
  #include <asm/current.h>
  #include <public/platform.h>
@@ -11,7 +11,7 @@ Index: xen-4.8.0-testing/xen/arch/x86/pl
  #include <asm/edd.h>
  #include <asm/mtrr.h>
  #include <asm/io_apic.h>
-@@ -821,6 +821,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;
@@ -53,11 +53,11 @@ Index: xen-4.8.0-testing/xen/arch/x86/pl
  
      default:
          ret = -ENOSYS;
-Index: xen-4.8.0-testing/xen/include/public/platform.h
+Index: xen-4.9.0-testing/xen/include/public/platform.h
 ===================================================================
---- xen-4.8.0-testing.orig/xen/include/public/platform.h
-+++ xen-4.8.0-testing/xen/include/public/platform.h
-@@ -547,6 +547,16 @@ struct xenpf_core_parking {
+--- xen-4.9.0-testing.orig/xen/include/public/platform.h
++++ xen-4.9.0-testing/xen/include/public/platform.h
+@@ -553,6 +553,16 @@ struct xenpf_core_parking {
  typedef struct xenpf_core_parking xenpf_core_parking_t;
  DEFINE_XEN_GUEST_HANDLE(xenpf_core_parking_t);
  
@@ -74,7 +74,7 @@ Index: xen-4.8.0-testing/xen/include/pub
  /*
   * Access generic platform resources(e.g., accessing MSR, port I/O, etc)
   * in unified way. Batch resource operations in one call are supported and
-@@ -638,6 +648,7 @@ struct xen_platform_op {
+@@ -644,6 +654,7 @@ struct xen_platform_op {
          struct xenpf_core_parking      core_parking;
          struct xenpf_resource_op       resource_op;
          struct xenpf_symdata           symdata;
--- xen-qemu-iscsi-fix.patch.orig
+++ xen-qemu-iscsi-fix.patch
@@ -1,7 +1,7 @@
-Index: xen-4.5.0-testing/tools/qemu-xen-traditional-dir-remote/xenstore.c
+Index: xen-4.9.0-testing/tools/qemu-xen-traditional-dir-remote/xenstore.c
 ===================================================================
---- xen-4.5.0-testing.orig/tools/qemu-xen-traditional-dir-remote/xenstore.c
-+++ xen-4.5.0-testing/tools/qemu-xen-traditional-dir-remote/xenstore.c
+--- xen-4.9.0-testing.orig/tools/qemu-xen-traditional-dir-remote/xenstore.c
++++ xen-4.9.0-testing/tools/qemu-xen-traditional-dir-remote/xenstore.c
 @@ -450,7 +450,7 @@ void xenstore_parse_domain_config(int hv
      char *buf = NULL;
      char *fpath = NULL, *bpath = NULL, *btype = NULL,
@@ -33,29 +33,29 @@ Index: xen-4.5.0-testing/tools/qemu-xen-
 +        free(params);
 +        if (!strcmp(drv,"iscsi") || !strcmp(drv, "npiv") ||
 +            !strcmp(drv,"dmmd")) {
-+          if (pasprintf(&buf, "%s/node", bpath) == -1)
-+             continue;
++            if (pasprintf(&buf, "%s/node", bpath) == -1)
++                continue;
 +
-+          /* wait for block-[iscsi|npiv|dmmd] script to complete and populate the
-+           * node entry.  try 30 times (30 secs) */
-+          for (j = 0; j < 30; j++) {
-+            params = xs_read(xsh, XBT_NULL, buf, &len);
-+            if (params != NULL)
-+               break;
-+	    sleep(1);
-+          }
-+          if (params == NULL) {
-+             fprintf(stderr, "qemu: %s device not found -- timed out \n", drv);
-+            continue;
-+          }
++            /* wait for block-[iscsi|npiv|dmmd] script to complete and populate the
++             * node entry.  try 30 times (30 secs) */
++            for (j = 0; j < 30; j++) {
++                params = xs_read(xsh, XBT_NULL, buf, &len);
++                if (params != NULL)
++                    break;
++                sleep(1);
++            }
++            if (params == NULL) {
++                fprintf(stderr, "qemu: %s device not found -- timed out \n", drv);
++                continue;
++            }
 +        }
 +        else
 +        {
-+          if (pasprintf(&buf, "%s/params", bpath) == -1)
-+              continue;
-+           params = xs_read(xsh, XBT_NULL, buf, &len);
-+           if (params == NULL)
-+             continue;
++            if (pasprintf(&buf, "%s/params", bpath) == -1)
++                continue;
++            params = xs_read(xsh, XBT_NULL, buf, &len);
++            if (params == NULL)
++                continue;
 +        }
 +
          /* Obtain blktap sub-type prefix */
--- xen.changes.orig
+++ xen.changes
@@ -1,4 +1,130 @@
 -------------------------------------------------------------------
+Wed May 17 08:28:37 MDT 2017 - carnold@suse.com
+
+- bsc#1031343 - xen fails to build with GCC 7
+  gcc7-error-xenpmd.patch
+
+-------------------------------------------------------------------
+Tue May 16 09:04:19 MDT 2017 - carnold@suse.com
+
+- Update to Xen 4.9.0-rc5 (fate#321394, fate#323108)
+  xen-4.9.0-testing-src.tar.bz2
+- Drop xen-tools-pkgconfig-xenlight.patch
+
+-------------------------------------------------------------------
+Wed May 10 15:26:38 MDT 2017 - carnold@suse.com
+
+- bsc#1037779 - xen breaks kexec-tools build
+  xen-tools-pkgconfig-xenlight.patch
+
+-------------------------------------------------------------------
+Tue May  9 08:40:58 MDT 2017 - carnold@suse.com
+
+- Update to Xen 4.9.0-rc4 (fate#321394, fate#323108)
+  xen-4.9.0-testing-src.tar.bz2
+
+-------------------------------------------------------------------
+Tue May  2 09:18:24 MDT 2017 - carnold@suse.com
+
+- bsc#1036146 - sles12sp2 xen VM dumps core to wrong path
+  xen.spec
+
+-------------------------------------------------------------------
+Fri Apr 28 09:03:56 MDT 2017 - carnold@suse.com
+
+- Update to Xen 4.9.0-rc3 (fate#321394, fate#323108)
+  xen-4.9.0-testing-src.tar.bz2
+  aarch64-maybe-uninitialized.patch
+
+-------------------------------------------------------------------
+Fri Apr 21 16:26:31 MDT 2017 - carnold@suse.com
+
+- Update to Xen 4.9.0-rc2 (fate#321394, fate#323108)
+  xen-4.9.0-testing-src.tar.bz2
+
+-------------------------------------------------------------------
+Wed Apr 19 07:54:58 MDT 2017 - carnold@suse.com
+
+- Update to Xen 4.9.0-rc1 (fate#321394, fate#323108)
+  xen-4.9.0-testing-src.tar.bz2
+  ioemu-devicemodel-include.patch
+- Dropped patches contained in new tarball
+  xen-4.8.0-testing-src.tar.bz2
+  0001-xenstore-let-write_node-and-some-callers-return-errn.patch
+  0002-xenstore-undo-function-rename.patch
+  0003-xenstore-rework-of-transaction-handling.patch
+  584806ce-x86emul-correct-PUSHF-POPF.patch
+  584fc649-fix-determining-when-domain-creation-is-complete.patch
+  58510c06-x86emul-CMPXCHGnB-ignore-prefixes.patch
+  58510cac-x86emul-MOVNTI-no-REP-prefixes.patch
+  58526ccc-x86emul-64bit-ignore-most-segment-bases-in-align-check.patch
+  5853ed37-VT-d-correct-dma_msi_set_affinity.patch
+  5853ee07-x86emul-CMPXCHG16B-aligned-operand.patch
+  58580060-x86-emul-correct-SYSCALL-eflags-handling.patch
+  585aa3c5-x86-force-EFLAGS-IF-on-upon-exit-to-PV.patch
+  585aa407-x86-HVM-NULL-check-before-using-VMFUNC-hook.patch
+  585bd5fe-x86-emul-correct-VMFUNC-return-value-handling.patch
+  586ba81c-x86-cpu-dont-update-this_cpu-for-guest-get_cpu_vendor.patch
+  587d04d6-x86-xstate-fix-array-overrun-with-LWP.patch
+  587de4a9-x86emul-VEX-B-ignored-in-compat-mode.patch
+  5882129d-x86emul-LOCK-check-adjustments.patch
+  58821300-x86-segment-attribute-handling.patch
+  58873c1f-x86emul-correct-FPU-stub-asm-constraints.patch
+  58873c80-x86-hvm-do-not-set-msr_tsc_adjust-on-.patch
+  5887888f-credit2-fix-shutdown-suspend-with-cpupools.patch
+  5887888f-credit2-never-consider-CPUs-outside-of-pool.patch
+  5887888f-credit2-use-the-correct-scratch-cpumask.patch
+  5888b1b3-x86-emulate-dont-assume-addr_size-32-implies-protmode.patch
+  5899cbd9-EPT-allow-wrcomb-MMIO-mappings-again.patch
+  589b3272-libxl-dont-segfault-when-creating-domain-with-invalid-pvusb-device.patch
+  58a44771-IOMMU-always-call-teardown-callback.patch
+  58a48ccc-x86-fix-p2m_flush_table-for-non-nested.patch
+  58a59f4b-libxl-correct-xenstore-entry-for-empty-cdrom.patch
+  58a70d94-VMX-fix-VMCS-race-on-cswitch-paths.patch
+  58ac1f3f-VMX-dont-leak-host-syscall-MSRs.patch
+  58b5a2de-x86-correct-Xens-idea-of-its-memory-layout.patch
+  58b6fd42-credit2-always-mark-a-tickled-pCPU-as-tickled.patch
+  58b6fd42-credit2-dont-miss-accounting-during-credit-reset.patch
+  58cbf682-x86-EFI-avoid-overrunning-mb_modules.patch
+  58cf9200-x86-EFI-avoid-IOMMU-faults-on-tail-gap.patch
+  58cf9260-x86-EFI-avoid-Xen-when-looking-for-mod-kexec-pos.patch
+  58cf9277-x86-time-dont-use-vTSC-if-host-guest-freqs-match.patch
+  58d25ea2-xenstore-add-missing-checks-for-allocation-failure.patch
+  58d91365-sched-dont-call-wrong-hook-via-VCPU2OP.patch
+  CVE-2017-2615-qemut-display-cirrus-oob-access-while-doing-bitblt-copy-backward-mode.patch
+  CVE-2017-2620-xsa209-qemut-cirrus_bitblt_cputovideo-does-not-check-if-memory-region-safe.patch
+  glibc-2.25-compatibility-fix.patch
+  xs-09-add_change_node-params.patch
+  xs-10-call-add_change_node.patch
+  xs-11-tdb-record-header.patch
+  xs-12-node-gen-count.patch
+  xs-13-read-directory-part-support.patch
+  xs-14-command-array.patch
+  xs-15-command-return-val.patch
+  xs-16-function-static.patch
+  xs-17-arg-parsing.patch
+  xs-18-default-buffer.patch
+  xs-19-handle-alloc-failures.patch
+  xs-20-tdb-version.patch
+  xs-21-empty-tdb-database.patch
+  xs-22-reopen_log-fix.patch
+  xs-23-XS_DEBUG-rename.patch
+  xs-24-xenstored_control.patch
+  xs-25-control-enhance.patch
+  xs-26-log-control.patch
+  xs-27-memory-report.patch
+  xs-28-remove-talloc-report.patch
+  xs-29-define-off_t.patch
+  xsa206-0001-xenstored-apply-a-write-transaction-rate-limit.patch
+  xsa206-0002-xenstored-Log-when-the-write-transaction-rate-limit.patch
+
+-------------------------------------------------------------------
+Wed Apr  5 11:41:52 MDT 2017 - carnold@suse.com
+
+- bsc#1022703 - Xen HVM guest with OVMF hangs with unattached CDRom
+  58a59f4b-libxl-correct-xenstore-entry-for-empty-cdrom.patch
+
+-------------------------------------------------------------------
 Wed Mar 29 16:18:26 UTC 2017 - jfehlig@suse.com
 
 - bsc#1015348 - L3: libvirtd does not start during boot
--- xen.spec.orig
+++ xen.spec
@@ -18,8 +18,8 @@
 
 Name:           xen
 ExclusiveArch:  %ix86 x86_64 %arm aarch64
-%define changeset 34159
-%define xen_build_dir xen-4.8.0-testing
+%define changeset 35349
+%define xen_build_dir xen-4.9.0-testing
 #
 %define with_kmp 0
 %define with_gdbsx 0
@@ -134,7 +134,9 @@ BuildRequires:  pmtools
 %else
 BuildRequires:  acpica
 %endif
+BuildRequires:  gcc-c++
 %ifarch x86_64
+BuildRequires:  gcc-32bit
 %if %{?with_gcc47}0
 BuildRequires:  gcc47
 %endif
@@ -143,6 +145,7 @@ BuildRequires:  gcc48
 %endif
 BuildRequires:  glibc-32bit
 BuildRequires:  glibc-devel-32bit
+BuildRequires:  makeinfo
 %endif
 %if %{?with_kmp}0
 BuildRequires:  kernel-source
@@ -156,12 +159,12 @@ BuildRequires:  xorg-x11-util-devel
 %endif
 %endif
 
-Version:        4.8.0_06
+Version:        4.9.0_04
 Release:        0
 Summary:        Xen Virtualization: Hypervisor (aka VMM aka Microkernel)
 License:        GPL-2.0
 Group:          System/Kernel
-Source0:        xen-4.8.0-testing-src.tar.bz2
+Source0:        xen-4.9.0-testing-src.tar.bz2
 Source1:        stubdom.tar.bz2
 Source2:        qemu-xen-traditional-dir-remote.tar.bz2
 Source5:        ipxe.tar.bz2
@@ -194,42 +197,6 @@ Source57:       xen-utils-0.1.tar.bz2
 # For xen-libs
 Source99:       baselibs.conf
 # Upstream patches
-Patch1:         584806ce-x86emul-correct-PUSHF-POPF.patch
-Patch2:         584fc649-fix-determining-when-domain-creation-is-complete.patch
-Patch3:         58510c06-x86emul-CMPXCHGnB-ignore-prefixes.patch
-Patch4:         58510cac-x86emul-MOVNTI-no-REP-prefixes.patch
-Patch5:         58526ccc-x86emul-64bit-ignore-most-segment-bases-in-align-check.patch
-Patch6:         5853ed37-VT-d-correct-dma_msi_set_affinity.patch
-Patch7:         5853ee07-x86emul-CMPXCHG16B-aligned-operand.patch
-Patch8:         58580060-x86-emul-correct-SYSCALL-eflags-handling.patch
-Patch9:         585aa3c5-x86-force-EFLAGS-IF-on-upon-exit-to-PV.patch
-Patch10:        585aa407-x86-HVM-NULL-check-before-using-VMFUNC-hook.patch
-Patch11:        585bd5fe-x86-emul-correct-VMFUNC-return-value-handling.patch
-Patch12:        586ba81c-x86-cpu-dont-update-this_cpu-for-guest-get_cpu_vendor.patch
-Patch13:        587d04d6-x86-xstate-fix-array-overrun-with-LWP.patch
-Patch14:        587de4a9-x86emul-VEX-B-ignored-in-compat-mode.patch
-Patch15:        5882129d-x86emul-LOCK-check-adjustments.patch
-Patch16:        58821300-x86-segment-attribute-handling.patch
-Patch17:        58873c1f-x86emul-correct-FPU-stub-asm-constraints.patch
-Patch18:        58873c80-x86-hvm-do-not-set-msr_tsc_adjust-on-.patch
-Patch19:        5887888f-credit2-use-the-correct-scratch-cpumask.patch
-Patch20:        5887888f-credit2-never-consider-CPUs-outside-of-pool.patch
-Patch21:        5887888f-credit2-fix-shutdown-suspend-with-cpupools.patch
-Patch22:        5888b1b3-x86-emulate-dont-assume-addr_size-32-implies-protmode.patch
-Patch23:        5899cbd9-EPT-allow-wrcomb-MMIO-mappings-again.patch
-Patch24:        589b3272-libxl-dont-segfault-when-creating-domain-with-invalid-pvusb-device.patch
-Patch25:        58a44771-IOMMU-always-call-teardown-callback.patch
-Patch26:        58a48ccc-x86-fix-p2m_flush_table-for-non-nested.patch
-Patch27:        58a70d94-VMX-fix-VMCS-race-on-cswitch-paths.patch
-Patch28:        58ac1f3f-VMX-dont-leak-host-syscall-MSRs.patch
-Patch29:        58b5a2de-x86-correct-Xens-idea-of-its-memory-layout.patch
-Patch30:        58b6fd42-credit2-always-mark-a-tickled-pCPU-as-tickled.patch
-Patch31:        58b6fd42-credit2-dont-miss-accounting-during-credit-reset.patch
-Patch32:        58cbf682-x86-EFI-avoid-overrunning-mb_modules.patch
-Patch33:        58cf9200-x86-EFI-avoid-IOMMU-faults-on-tail-gap.patch
-Patch34:        58cf9260-x86-EFI-avoid-Xen-when-looking-for-mod-kexec-pos.patch
-Patch35:        58cf9277-x86-time-dont-use-vTSC-if-host-guest-freqs-match.patch
-Patch36:        58d91365-sched-dont-call-wrong-hook-via-VCPU2OP.patch
 # Upstream qemu-traditional patches
 Patch250:       VNC-Support-for-ExtendedKeyEvent-client-message.patch
 Patch251:       0001-net-move-the-tap-buffer-into-TAPState.patch
@@ -269,9 +236,7 @@ Patch284:       CVE-2016-8667-qemut-dma-
 Patch285:       CVE-2016-8669-qemut-char-divide-by-zero-error-in-serial_update_parameters.patch
 Patch286:       CVE-2016-8910-qemut-net-rtl8139-infinite-loop-while-transmit-in-Cplus-mode.patch
 Patch287:       CVE-2016-9921-qemut-display-cirrus_vga-divide-by-zero-in-cirrus_do_copy.patch
-Patch288:       CVE-2017-2615-qemut-display-cirrus-oob-access-while-doing-bitblt-copy-backward-mode.patch
-Patch289:       CVE-2017-2620-xsa209-qemut-cirrus_bitblt_cputovideo-does-not-check-if-memory-region-safe.patch
-Patch290:       CVE-2017-6505-qemut-usb-an-infinite-loop-issue-in-ohci_service_ed_list.patch
+Patch288:       CVE-2017-6505-qemut-usb-an-infinite-loop-issue-in-ohci_service_ed_list.patch
 # qemu-traditional patches that are not upstream
 Patch350:       blktap.patch
 Patch351:       cdrom-removable.patch
@@ -298,6 +263,7 @@ Patch380:       pvdrv_emulation_control.
 Patch381:       ioemu-disable-scsi.patch
 Patch382:       ioemu-disable-emulated-ide-if-pv.patch
 Patch383:       xenpaging.qemu.flush-cache.patch
+Patch384:       ioemu-devicemodel-include.patch
 # Our platform specific patches
 Patch400:       xen-destdir.patch
 Patch401:       vif-bridge-no-iptables.patch
@@ -310,7 +276,7 @@ Patch420:       suspend_evtchn_lock.patc
 Patch421:       xenpaging.doc.patch
 Patch422:       stubdom-have-iovec.patch
 Patch423:       vif-route.patch
-Patch424:       glibc-2.25-compatibility-fix.patch
+Patch424:       gcc7-error-xenpmd.patch
 # Other bug fixes or features
 Patch451:       xenconsole-no-multiple-connections.patch
 Patch452:       hibernate.patch
@@ -320,40 +286,13 @@ Patch455:       pygrub-netware-xnloader.
 Patch456:       pygrub-boot-legacy-sles.patch
 Patch457:       pygrub-handle-one-line-menu-entries.patch
 Patch458:       aarch64-rename-PSR_MODE_ELxx-to-match-linux-headers.patch
-Patch459:       CVE-2014-0222-blktap-qcow1-validate-l2-table-size.patch
-Patch460:       libxl.pvscsi.patch
-Patch461:       xen.libxl.dmmd.patch
-Patch462:       libxl.add-option-to-disable-disk-cache-flushes-in-qdisk.patch
-Patch463:       blktap2-no-uninit.patch
-Patch464:       libxl.set-migration-constraints-from-cmdline.patch
-# Xenstored
-Patch509:       xs-09-add_change_node-params.patch
-Patch510:       xs-10-call-add_change_node.patch
-Patch511:       xs-11-tdb-record-header.patch
-Patch512:       xs-12-node-gen-count.patch
-Patch513:       xs-13-read-directory-part-support.patch
-Patch514:       xs-14-command-array.patch
-Patch515:       xs-15-command-return-val.patch
-Patch516:       xs-16-function-static.patch
-Patch517:       xs-17-arg-parsing.patch
-Patch518:       xs-18-default-buffer.patch
-Patch519:       xs-19-handle-alloc-failures.patch
-Patch520:       xs-20-tdb-version.patch
-Patch521:       xs-21-empty-tdb-database.patch
-Patch522:       xs-22-reopen_log-fix.patch
-Patch523:       xs-23-XS_DEBUG-rename.patch
-Patch524:       xs-24-xenstored_control.patch
-Patch525:       xs-25-control-enhance.patch
-Patch526:       xs-26-log-control.patch
-Patch527:       xs-27-memory-report.patch
-Patch528:       xs-28-remove-talloc-report.patch
-Patch529:       xs-29-define-off_t.patch
-Patch530:       xsa206-0001-xenstored-apply-a-write-transaction-rate-limit.patch
-Patch531:       xsa206-0002-xenstored-Log-when-the-write-transaction-rate-limit.patch
-Patch532:       58d25ea2-xenstore-add-missing-checks-for-allocation-failure.patch
-Patch533:       0001-xenstore-let-write_node-and-some-callers-return-errn.patch
-Patch534:       0002-xenstore-undo-function-rename.patch
-Patch535:       0003-xenstore-rework-of-transaction-handling.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
+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
 # Hypervisor and PV driver Patches
 Patch601:       x86-ioapic-ack-default.patch
 Patch602:       x86-cpufreq-report.patch
@@ -576,42 +515,6 @@ Authors:
 %prep
 %setup -q -n %xen_build_dir -a 1 -a 2 -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
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
 # Upstream qemu patches
 %patch250 -p1
 %patch251 -p1
@@ -652,8 +555,6 @@ Authors:
 %patch286 -p1
 %patch287 -p1
 %patch288 -p1
-%patch289 -p1
-%patch290 -p1
 # Qemu traditional
 %patch350 -p1
 %patch351 -p1
@@ -680,6 +581,7 @@ Authors:
 %patch381 -p1
 %patch382 -p1
 %patch383 -p1
+%patch384 -p1
 # Our platform specific patches
 %patch400 -p1
 %patch401 -p1
@@ -709,34 +611,7 @@ Authors:
 %patch462 -p1
 %patch463 -p1
 %patch464 -p1
-# Xenstored
-%patch509 -p1
-%patch510 -p1
-%patch511 -p1
-%patch512 -p1
-%patch513 -p1
-%patch514 -p1
-%patch515 -p1
-%patch516 -p1
-%patch517 -p1
-%patch518 -p1
-%patch519 -p1
-%patch520 -p1
-%patch521 -p1
-%patch522 -p1
-%patch523 -p1
-%patch524 -p1
-%patch525 -p1
-%patch526 -p1
-%patch527 -p1
-%patch528 -p1
-%patch529 -p1
-%patch530 -p1
-%patch531 -p1
-%patch532 -p1
-%patch533 -p1
-%patch534 -p1
-%patch535 -p1
+%patch465 -p1
 # Hypervisor and PV driver Patches
 %patch601 -p1
 %patch602 -p1
@@ -830,7 +705,6 @@ configure_flags="${configure_flags} --di
         --libdir=%{_libdir} \
         --libexecdir=%{_libexecdir} \
         --datadir=%{_datadir} \
-        --with-xen-dumpdir=%{_sharedstatedir}/xen/dump \
         --mandir=%{_mandir} \
         --includedir=%{_includedir} \
         --docdir=%{_defaultdocdir}/xen \
@@ -1037,9 +911,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdi
 for name in COPYING %SOURCE10 %SOURCE11 %SOURCE12; do
     install -m 644 $name $RPM_BUILD_ROOT/%{_defaultdocdir}/xen/
 done
-for name in vtpm.txt crashdb.txt \
-    xenpaging.txt xl-disk-configuration.txt pci-device-reservations.txt \
-    xl-network-configuration.markdown xl-numa-placement.markdown \
+for name in vtpm-platforms.txt crashdb.txt xenpaging.txt \
     xen-command-line.markdown xenstore-paths.markdown; do
     install -m 644 docs/misc/$name $RPM_BUILD_ROOT/%{_defaultdocdir}/xen/misc/
 done
@@ -1331,11 +1203,16 @@ rm -f  $RPM_BUILD_ROOT/usr/libexec/qemu-
 %{_mandir}/man1/xenstore-chmod.1.gz
 %{_mandir}/man1/xenstore-ls.1.gz
 %{_mandir}/man1/xenstore.1.gz
+%{_mandir}/man1/xen-list.1.gz
 %{_mandir}/man5/xl.cfg.5.gz
 %{_mandir}/man5/xl.conf.5.gz
 %{_mandir}/man5/xlcpupool.cfg.5.gz
+%{_mandir}/man5/xl-disk-configuration.5.gz
+%{_mandir}/man7/xen-pci-device-reservations.7.gz
+%{_mandir}/man7/xen-tscmode.7.gz
+%{_mandir}/man7/xen-vtpm.7.gz
+%{_mandir}/man7/xen-vtpmmgr.7.gz
 %{_mandir}/man8/*.8.gz
-%{_mandir}/man1/xen-list.1.gz
 
 %if %{with xen_oxenstored}
 /usr/sbin/oxenstored
@@ -1419,6 +1296,18 @@ rm -f  $RPM_BUILD_ROOT/usr/libexec/qemu-
 /usr/include/*
 %{_datadir}/pkgconfig/xenlight.pc
 %{_datadir}/pkgconfig/xlutil.pc
+%{_datadir}/pkgconfig/xenblktapctl.pc
+%{_datadir}/pkgconfig/xencall.pc
+%{_datadir}/pkgconfig/xencontrol.pc
+%{_datadir}/pkgconfig/xendevicemodel.pc
+%{_datadir}/pkgconfig/xenevtchn.pc
+%{_datadir}/pkgconfig/xenforeignmemory.pc
+%{_datadir}/pkgconfig/xengnttab.pc
+%{_datadir}/pkgconfig/xenguest.pc
+%{_datadir}/pkgconfig/xenstat.pc
+%{_datadir}/pkgconfig/xenstore.pc
+%{_datadir}/pkgconfig/xentoollog.pc
+%{_datadir}/pkgconfig/xenvchan.pc
 
 %if %{?with_dom0_support}0