From eb83ba8f312fb94d8d07ef76fb7dfd7fc5557158ba4f4bc1befa09455881e93b Mon Sep 17 00:00:00 2001
From: Charles Arnold <carnold@suse.com>
Date: Tue, 3 May 2016 17:07:53 +0000
Subject: [PATCH] - Update to Xen 4.7 RC1   xen-4.7.0-testing-src.tar.bz2

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=426
---
 0005-libxl-Load-guest-BIOS-from-file.patch                | 8 ++++----
 ipxe.tar.bz2                                              | 4 ++--
 ...dd-option-to-disable-disk-cache-flushes-in-qdisk.patch | 2 +-
 mini-os.tar.bz2                                           | 4 ++--
 qemu-xen-traditional-dir-remote.tar.bz2                   | 4 ++--
 stubdom.tar.bz2                                           | 4 ++--
 xen-4.7.0-testing-src.tar.bz2                             | 4 ++--
 xen.changes                                               | 6 ++++++
 xen.libxl.dmmd.patch                                      | 2 +-
 9 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/0005-libxl-Load-guest-BIOS-from-file.patch b/0005-libxl-Load-guest-BIOS-from-file.patch
index bc38ae3..1493b50 100644
--- a/0005-libxl-Load-guest-BIOS-from-file.patch
+++ b/0005-libxl-Load-guest-BIOS-from-file.patch
@@ -22,7 +22,7 @@ Index: xen-4.7.0-testing/docs/man/xl.cfg.pod.5
 ===================================================================
 --- xen-4.7.0-testing.orig/docs/man/xl.cfg.pod.5
 +++ xen-4.7.0-testing/docs/man/xl.cfg.pod.5
-@@ -1242,6 +1242,15 @@ Requires device_model_version=qemu-xen.
+@@ -1268,6 +1268,15 @@ Requires device_model_version=qemu-xen.
  
  =back
  
@@ -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
-@@ -940,6 +940,14 @@ void libxl_mac_copy(libxl_ctx *ctx, libx
+@@ -947,6 +947,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
-@@ -2315,6 +2315,8 @@ _hidden const char *libxl__xen_config_di
+@@ -2314,6 +2314,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);
@@ -189,7 +189,7 @@ Index: xen-4.7.0-testing/tools/libxl/xl_cmdimpl.c
 ===================================================================
 --- xen-4.7.0-testing.orig/tools/libxl/xl_cmdimpl.c
 +++ xen-4.7.0-testing/tools/libxl/xl_cmdimpl.c
-@@ -1680,12 +1680,17 @@ static void parse_config_data(const char
+@@ -1562,12 +1562,17 @@ static void parse_config_data(const char
  
          xlu_cfg_replace_string (config, "firmware_override",
                                  &b_info->u.hvm.firmware, 0);
diff --git a/ipxe.tar.bz2 b/ipxe.tar.bz2
index 809b532..254a587 100644
--- a/ipxe.tar.bz2
+++ b/ipxe.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d07d42c2aa44e6e424a9b01d8778b908e2994860e2a24bf3f3ec15adc85a3315
-size 2877767
+oid sha256:83c7a64afdf707e68377bd9bc75be1c18bce37d78ea2440cabd143e40b0a5bea
+size 2877717
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 e0b8af9..dda7628 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
@@ -11,7 +11,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl.c
 ===================================================================
 --- xen-4.7.0-testing.orig/tools/libxl/libxl.c
 +++ xen-4.7.0-testing/tools/libxl/libxl.c
-@@ -2826,6 +2826,8 @@ static void device_disk_add(libxl__egc *
+@@ -2559,6 +2559,8 @@ static void device_disk_add(libxl__egc *
          flexarray_append_pair(back, "discard-enable",
                                libxl_defbool_val(disk->discard_enable) ?
                                "1" : "0");
diff --git a/mini-os.tar.bz2 b/mini-os.tar.bz2
index 391b01f..5adf095 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:879d9d369e718cdb7b1dcda2b051609ca59f9c89e1ae1160bdedf19bf2914f72
-size 256337
+oid sha256:5420c134f5eac4587563b013e875ff8e1acd4572d479fb4e9531d14dd795bddb
+size 256325
diff --git a/qemu-xen-traditional-dir-remote.tar.bz2 b/qemu-xen-traditional-dir-remote.tar.bz2
index 0ad8502..5345fc3 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:cc6bd72f1447c6e9f3b864c12032b0b7a2462a7681c60501a8c0b77d03027467
-size 3237713
+oid sha256:cb1c19151f40a9b6a1a04d64220fd192d3ea6df116932b912527d6795101a0ef
+size 3236878
diff --git a/stubdom.tar.bz2 b/stubdom.tar.bz2
index 4d9ff98..9efc7da 100644
--- a/stubdom.tar.bz2
+++ b/stubdom.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2a6caced4968291b7097ad760f463d5631d03d3633c63a4b0d80e0f7a480c16d
-size 17477537
+oid sha256:0cf5a10c50f3feea1ecffbc342420920d0692b73adf316b0d143f9a54d3d9c15
+size 17477254
diff --git a/xen-4.7.0-testing-src.tar.bz2 b/xen-4.7.0-testing-src.tar.bz2
index 2227850..50b75bc 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:f9f6ecde51ca3086fbad54d5e77076b917f0febb1120933c6337ad29a3b2e3ef
-size 4462017
+oid sha256:524bc5df998a153fe4fc84a878057cf14e93c97ca0f45a38f0c30647a359f4da
+size 4457990
diff --git a/xen.changes b/xen.changes
index b76a3c7..d9a0c4a 100644
--- a/xen.changes
+++ b/xen.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May  3 08:25:27 MDT 2016 - carnold@suse.com
+
+- Update to Xen 4.7 RC1
+  xen-4.7.0-testing-src.tar.bz2
+
 -------------------------------------------------------------------
 Tue May  3 13:48:59 UTC 2016 - ohering@suse.de
 
diff --git a/xen.libxl.dmmd.patch b/xen.libxl.dmmd.patch
index 4baeeeb..594d27c 100644
--- a/xen.libxl.dmmd.patch
+++ b/xen.libxl.dmmd.patch
@@ -11,7 +11,7 @@ Index: xen-4.7.0-testing/tools/libxl/libxl.c
 ===================================================================
 --- xen-4.7.0-testing.orig/tools/libxl/libxl.c
 +++ xen-4.7.0-testing/tools/libxl/libxl.c
-@@ -2773,6 +2773,10 @@ static void device_disk_add(libxl__egc *
+@@ -2506,6 +2506,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: