From e19255cb04d6729e41c4522afa619d8ed35544c6c41e00c7febf4799df7908c9 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Wed, 12 Feb 2014 22:51:55 +0000 Subject: [PATCH] - Update to c/s 28381 to include libxl fork and event fixes for OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=300 --- ...t-migration-constraints-from-cmdline.patch | 24 ++++++++++++++++++- qemu-xen-dir-remote.tar.bz2 | 4 ++-- qemu-xen-traditional-dir-remote.tar.bz2 | 4 ++-- seabios-dir-remote.tar.bz2 | 4 ++-- xen-4.4.0-testing-src.tar.bz2 | 4 ++-- xen.changes | 2 +- xen.spec | 2 +- 7 files changed, 33 insertions(+), 11 deletions(-) diff --git a/libxl.set-migration-constraints-from-cmdline.patch b/libxl.set-migration-constraints-from-cmdline.patch index 5d50e65..01538ce 100644 --- a/libxl.set-migration-constraints-from-cmdline.patch +++ b/libxl.set-migration-constraints-from-cmdline.patch @@ -76,6 +76,7 @@ Signed-off-by: Olaf Hering --- docs/man/xl.pod.1 | 20 ++++++++++++++++++++ tools/libxc/xc_domain_save.c | 27 ++++++++++++++++++++++++-- + tools/libxc/xc_nomigrate.c | 10 +++++++++ tools/libxc/xenguest.h | 7 +++++++ tools/libxl/libxl.c | 27 +++++++++++++++++++++++--- tools/libxl/libxl.h | 14 ++++++++++++++ @@ -85,7 +86,7 @@ Signed-off-by: Olaf Hering tools/libxl/libxl_save_helper.c | 4 +++- tools/libxl/xl_cmdimpl.c | 41 ++++++++++++++++++++++++++++++++++------ tools/libxl/xl_cmdtable.c | 23 ++++++++++++++-------- - 11 files changed, 151 insertions(+), 21 deletions(-) + 12 files changed, 161 insertions(+), 21 deletions(-) Index: xen-4.4.0-testing/docs/man/xl.pod.1 =================================================================== @@ -195,6 +196,27 @@ Index: xen-4.4.0-testing/tools/libxc/xc_domain_save.c /* * Local variables: +Index: xen-4.4.0-testing/tools/libxc/xc_nomigrate.c +=================================================================== +--- xen-4.4.0-testing.orig/tools/libxc/xc_nomigrate.c ++++ xen-4.4.0-testing/tools/libxc/xc_nomigrate.c +@@ -21,6 +21,16 @@ + #include + #include + ++int xc_domain_save_suse(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iters, ++ uint32_t max_factor, uint32_t flags, ++ uint32_t min_remaining, ++ struct save_callbacks* callbacks, int hvm, ++ unsigned long vm_generationid_addr) ++{ ++ errno = ENOSYS; ++ return -1; ++} ++ + int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iters, + uint32_t max_factor, uint32_t flags, + struct save_callbacks* callbacks, int hvm, Index: xen-4.4.0-testing/tools/libxc/xenguest.h =================================================================== --- xen-4.4.0-testing.orig/tools/libxc/xenguest.h diff --git a/qemu-xen-dir-remote.tar.bz2 b/qemu-xen-dir-remote.tar.bz2 index 494802e..5af1b44 100644 --- a/qemu-xen-dir-remote.tar.bz2 +++ b/qemu-xen-dir-remote.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27825df0797b7e7da48974205534f73cfb54c21270f6cf1fdad4a09efe77ed3d -size 7570627 +oid sha256:e743a99eabfbe1548d0750ff02475c2a8663119bc2003f2d1b72b50af58f2ce1 +size 7570972 diff --git a/qemu-xen-traditional-dir-remote.tar.bz2 b/qemu-xen-traditional-dir-remote.tar.bz2 index acb93f5..3db51ae 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:850f3fa6cef695d4df38ce848dc92eabc202d4da4a2199335f4851538c27ee2f -size 3212885 +oid sha256:72b10b8bedd6ee1461e5ea0150907b8f8c84b36abffb10f2e53e08af0eff76ab +size 3212981 diff --git a/seabios-dir-remote.tar.bz2 b/seabios-dir-remote.tar.bz2 index b13c3ca..0d193dc 100644 --- a/seabios-dir-remote.tar.bz2 +++ b/seabios-dir-remote.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0a6cbb7ee06faa1c2f922b96a9883a56461db169ea13a22f46d4c56d174c3923 -size 366315 +oid sha256:6d7073374e26c99902ef37a2540b01baa8d9f817bd4d0565c44be9cf7981a9aa +size 365995 diff --git a/xen-4.4.0-testing-src.tar.bz2 b/xen-4.4.0-testing-src.tar.bz2 index ef28dfb..0ad7de2 100644 --- a/xen-4.4.0-testing-src.tar.bz2 +++ b/xen-4.4.0-testing-src.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d349ab905290a20cea87fe5012cfeacd00663d25a1cb9f6dcbc6aee30f9eacab -size 4356190 +oid sha256:3ba61d78a85a2b9d1b98eae31db4dd051a069366628e31f6a1e10bd45b5077e2 +size 4355756 diff --git a/xen.changes b/xen.changes index 29ecab5..c538ec6 100644 --- a/xen.changes +++ b/xen.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Tue Feb 11 13:27:42 MST 2014 - carnold@suse.com -- Update to c/s 28372 to include libxl fork and event fixes for +- Update to c/s 28381 to include libxl fork and event fixes for libvirt xen-4.4.0-testing-src.tar.bz2 diff --git a/xen.spec b/xen.spec index 764a60d..ac7ca75 100644 --- a/xen.spec +++ b/xen.spec @@ -20,7 +20,7 @@ Name: xen ExclusiveArch: %ix86 x86_64 %arm aarch64 %define xvers 4.4 %define xvermaj 4 -%define changeset 28372 +%define changeset 28381 %define xen_build_dir xen-4.4.0-testing # %define with_kmp 0