diff --git a/gcc6-warnings-as-errors.patch b/gcc6-warnings-as-errors.patch deleted file mode 100644 index cb15ad5..0000000 --- a/gcc6-warnings-as-errors.patch +++ /dev/null @@ -1,22 +0,0 @@ -References: bsc#969377 - xen does not build with GCC 6 - -Index: xen-4.7.0-testing/extras/mini-os-remote/lib/sys.c -=================================================================== ---- xen-4.7.0-testing.orig/extras/mini-os-remote/lib/sys.c -+++ xen-4.7.0-testing/extras/mini-os-remote/lib/sys.c -@@ -634,6 +634,7 @@ int closedir(DIR *dir) - - /* We assume that only the main thread calls select(). */ - -+#if defined(LIBC_VERBOSE) || defined(LIBC_DEBUG) - static const char file_types[] = { - [FTYPE_NONE] = 'N', - [FTYPE_CONSOLE] = 'C', -@@ -646,6 +647,7 @@ static const char file_types[] = { - [FTYPE_KBD] = 'K', - [FTYPE_FB] = 'G', - }; -+#endif - #ifdef LIBC_DEBUG - static void dump_set(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout) - { diff --git a/ipxe.tar.bz2 b/ipxe.tar.bz2 index 254a587..20bd50b 100644 --- a/ipxe.tar.bz2 +++ b/ipxe.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:83c7a64afdf707e68377bd9bc75be1c18bce37d78ea2440cabd143e40b0a5bea -size 2877717 +oid sha256:aea6bddfb9f29223de59da9be509f77a27837ff7f6d68750323b3c3be414cf3a +size 2877672 diff --git a/libxl-remove-cdrom-cachemode.patch b/libxl-remove-cdrom-cachemode.patch deleted file mode 100644 index 23f258d..0000000 --- a/libxl-remove-cdrom-cachemode.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit 3feb9059c31a5c08ec2c2ef81de439b6dec4f101 -Author: Jim Fehlig -Date: Thu Apr 28 11:30:19 2016 -0600 - - libxl: don't add cache mode for qdisk cdrom drives - - qemu commit 91a097e7 forbids specifying cache mode for empty - drives. Attempting to create a domain with an empty qdisk cdrom - drive results in - - qemu-system-x86_64: -drive if=ide,index=1,readonly=on,media=cdrom, - cache=writeback,id=ide-832: Must specify either driver or file - - libxl only allows an empty 'target=' for cdroms. By default, cdroms - are readonly (see the 'access' parameter in xl-disk-configuration.txt) - and forced to readonly by any tools (e.g. xl) using libxlutil's - xlu_disk_parse() function. With cdroms always marked readonly, - explicitly specifying the cache mode for cdrom drives can be dropped. - The drive's 'readonly=on' option can also be set unconditionally. - - Signed-off-by: Jim Fehlig - -Index: xen-4.7.0-testing/tools/libxl/libxl_dm.c -=================================================================== ---- xen-4.7.0-testing.orig/tools/libxl/libxl_dm.c -+++ xen-4.7.0-testing/tools/libxl/libxl_dm.c -@@ -1368,8 +1368,8 @@ static int libxl__build_device_model_arg - - if (disks[i].is_cdrom) { - drive = libxl__sprintf(gc, -- "if=ide,index=%d,readonly=%s,media=cdrom,cache=writeback,id=ide-%i", -- disk, disks[i].readwrite ? "off" : "on", dev_number); -+ "if=ide,index=%d,readonly=on,media=cdrom,id=ide-%i", -+ disk, dev_number); - - if (target_path) - drive = libxl__sprintf(gc, "%s,file=%s,format=%s", diff --git a/mini-os.tar.bz2 b/mini-os.tar.bz2 index 5adf095..def33e8 100644 --- a/mini-os.tar.bz2 +++ b/mini-os.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5420c134f5eac4587563b013e875ff8e1acd4572d479fb4e9531d14dd795bddb -size 256325 +oid sha256:8725d99ce7d99da1de4d5103b4771a7631651d5cbf6175c3d3d8f73e26570e85 +size 256422 diff --git a/qemu-xen-traditional-dir-remote.tar.bz2 b/qemu-xen-traditional-dir-remote.tar.bz2 index 5345fc3..a58a717 100644 --- a/qemu-xen-traditional-dir-remote.tar.bz2 +++ b/qemu-xen-traditional-dir-remote.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cb1c19151f40a9b6a1a04d64220fd192d3ea6df116932b912527d6795101a0ef -size 3236878 +oid sha256:50ffbb3f44ab3e7c46ced2220bb6ce8e3e74134d7361125588fb139d5ae93c2b +size 3237104 diff --git a/stubdom.tar.bz2 b/stubdom.tar.bz2 index 9efc7da..759542b 100644 --- a/stubdom.tar.bz2 +++ b/stubdom.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0cf5a10c50f3feea1ecffbc342420920d0692b73adf316b0d143f9a54d3d9c15 -size 17477254 +oid sha256:2f3cc7ca550b63e67b699f9cc912560c371c459b0f5a91a810a8790fae3458a8 +size 17477344 diff --git a/x86-PoD-only-reclaim-if-needed.patch b/x86-PoD-only-reclaim-if-needed.patch deleted file mode 100644 index 338cc41..0000000 --- a/x86-PoD-only-reclaim-if-needed.patch +++ /dev/null @@ -1,32 +0,0 @@ -References: bsc#961600 - -Reclaiming pages is pointless when the cache can already satisfy all -outstanding PoD entries, and doing reclaims in that case can be very -harmful to performance when that memory gets used by the guest, but -only to store zeroes there. - -Signed-off-by: Jan Beulich - -Index: xen-4.7.0-testing/xen/arch/x86/mm/p2m-pod.c -=================================================================== ---- xen-4.7.0-testing.orig/xen/arch/x86/mm/p2m-pod.c -+++ xen-4.7.0-testing/xen/arch/x86/mm/p2m-pod.c -@@ -1031,7 +1031,6 @@ static void pod_eager_record(struct p2m_ - { - struct pod_mrp_list *mrp = &p2m->pod.mrp; - -- ASSERT(mrp->list[mrp->idx] == INVALID_GFN); - ASSERT(gfn != INVALID_GFN); - - mrp->list[mrp->idx++] = -@@ -1079,7 +1078,9 @@ p2m_pod_demand_populate(struct p2m_domai - return 0; - } - -- pod_eager_reclaim(p2m); -+ /* Only reclaim if we're in actual need of more cache. */ -+ if ( p2m->pod.entry_count > p2m->pod.count ) -+ pod_eager_reclaim(p2m); - - /* Only sweep if we're actually out of memory. Doing anything else - * causes unnecessary time and fragmentation of superpages in the p2m. */ diff --git a/xen-4.7.0-testing-src.tar.bz2 b/xen-4.7.0-testing-src.tar.bz2 index d83aea5..5882402 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:2b89d13516c53564c901ceb6599543812d7ad18e95fac06c062987984eb43a22 -size 4463595 +oid sha256:1201ecad0af4fc7b88814b0539c83aa8bb2ef110d9ae8283f6de2a6645045c36 +size 4466035 diff --git a/xen.changes b/xen.changes index 68642d2..f398429 100644 --- a/xen.changes +++ b/xen.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue May 17 10:16:47 MDT 2016 - carnold@suse.com + +- fate#319989 - Update to Xen 4.7 RC3 + xen-4.7.0-testing-src.tar.bz2 +- Dropped + libxl-remove-cdrom-cachemode.patch + x86-PoD-only-reclaim-if-needed.patch + gcc6-warnings-as-errors.patch + ------------------------------------------------------------------- Tue May 10 14:39:00 MDT 2016 - carnold@suse.com diff --git a/xen.spec b/xen.spec index 75f13ff..8084e5a 100644 --- a/xen.spec +++ b/xen.spec @@ -263,7 +263,6 @@ Patch403: xl-conf-default-bridge.patch Patch420: suspend_evtchn_lock.patch Patch421: xenpaging.doc.patch Patch422: stubdom-have-iovec.patch -Patch423: libxl-remove-cdrom-cachemode.patch # Other bug fixes or features Patch451: xenconsole-no-multiple-connections.patch Patch452: hibernate.patch @@ -281,14 +280,12 @@ Patch463: libxl.set-migration-constraints-from-cmdline.patch # Hypervisor and PV driver Patches Patch501: x86-ioapic-ack-default.patch Patch502: x86-cpufreq-report.patch -Patch503: x86-PoD-only-reclaim-if-needed.patch Patch520: xen_pvonhvm.xen_emul_unplug.patch Patch521: supported_module.patch Patch601: xen.build-compare.doc_html.patch Patch602: xen.build-compare.man.patch Patch603: ipxe-no-error-logical-not-parentheses.patch Patch604: ipxe-use-rpm-opt-flags.patch -Patch605: gcc6-warnings-as-errors.patch # Anthony's "load BIOS via toolstack" patches # http://lists.xenproject.org/archives/html/xen-devel/2016-03/msg01626.html Patch700: 0001-libxc-Rework-extra-module-initialisation.patch @@ -582,7 +579,6 @@ Authors: %patch420 -p1 %patch421 -p1 %patch422 -p1 -%patch423 -p1 # Other bug fixes or features %patch451 -p1 %patch452 -p1 @@ -600,14 +596,12 @@ Authors: # Hypervisor and PV driver Patches %patch501 -p1 %patch502 -p1 -%patch503 -p1 %patch520 -p1 %patch521 -p1 %patch601 -p1 %patch602 -p1 %patch603 -p1 %patch604 -p1 -%patch605 -p1 # Anthony's "load BIOS via toolstack" patches # http://lists.xenproject.org/archives/html/xen-devel/2016-03/msg01626.html %patch700 -p1