From 831e1fde19ef46618027c39a63216246003916d804b2b0c73b5bdb474effdeb8 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 18 Feb 2014 23:53:50 +0000 Subject: [PATCH] - Update to Xen 4.4.0 RC4 c/s 28391 xen-4.4.0-testing-src.tar.bz2 OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=301 --- ...t-migration-constraints-from-cmdline.patch | 22 +++++++++---------- 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 | 6 +++++ xen.spec | 2 +- 7 files changed, 26 insertions(+), 20 deletions(-) diff --git a/libxl.set-migration-constraints-from-cmdline.patch b/libxl.set-migration-constraints-from-cmdline.patch index 01538ce..2ad6174 100644 --- a/libxl.set-migration-constraints-from-cmdline.patch +++ b/libxl.set-migration-constraints-from-cmdline.patch @@ -298,7 +298,7 @@ Index: xen-4.4.0-testing/tools/libxl/libxl.h =================================================================== --- xen-4.4.0-testing.orig/tools/libxl/libxl.h +++ xen-4.4.0-testing/tools/libxl/libxl.h -@@ -673,8 +673,22 @@ int libxl_domain_suspend(libxl_ctx *ctx, +@@ -687,8 +687,22 @@ int libxl_domain_suspend(libxl_ctx *ctx, int flags, /* LIBXL_SUSPEND_* */ const libxl_asyncop_how *ao_how) LIBXL_EXTERNAL_CALLERS_ONLY; @@ -389,7 +389,7 @@ Index: xen-4.4.0-testing/tools/libxl/xl_cmdimpl.c =================================================================== --- xen-4.4.0-testing.orig/tools/libxl/xl_cmdimpl.c +++ xen-4.4.0-testing/tools/libxl/xl_cmdimpl.c -@@ -3636,6 +3636,8 @@ static void migrate_do_preamble(int send +@@ -3645,6 +3645,8 @@ static void migrate_do_preamble(int send } static void migrate_domain(uint32_t domid, const char *rune, int debug, @@ -398,7 +398,7 @@ Index: xen-4.4.0-testing/tools/libxl/xl_cmdimpl.c const char *override_config_file) { pid_t child = -1; -@@ -3644,7 +3646,13 @@ static void migrate_domain(uint32_t domi +@@ -3653,7 +3655,13 @@ static void migrate_domain(uint32_t domi char *away_domname; char rc_buf; uint8_t *config_data; @@ -413,7 +413,7 @@ Index: xen-4.4.0-testing/tools/libxl/xl_cmdimpl.c save_domain_core_begin(domid, override_config_file, &config_data, &config_len); -@@ -3663,10 +3671,13 @@ static void migrate_domain(uint32_t domi +@@ -3672,10 +3680,13 @@ static void migrate_domain(uint32_t domi xtl_stdiostream_adjust_flags(logger, XTL_STDIOSTREAM_HIDE_PROGRESS, 0); if (debug) @@ -430,7 +430,7 @@ Index: xen-4.4.0-testing/tools/libxl/xl_cmdimpl.c " (rc=%d)\n", rc); if (rc == ERROR_GUEST_TIMEDOUT) goto failed_suspend; -@@ -4061,13 +4072,18 @@ int main_migrate(int argc, char **argv) +@@ -4062,13 +4073,18 @@ int main_migrate(int argc, char **argv) char *rune = NULL; char *host; int opt, daemonize = 1, monitor = 1, debug = 0; @@ -450,7 +450,7 @@ Index: xen-4.4.0-testing/tools/libxl/xl_cmdimpl.c case 'C': config_filename = optarg; break; -@@ -4084,6 +4100,18 @@ int main_migrate(int argc, char **argv) +@@ -4085,6 +4101,18 @@ int main_migrate(int argc, char **argv) case 0x100: debug = 1; break; @@ -469,7 +469,7 @@ Index: xen-4.4.0-testing/tools/libxl/xl_cmdimpl.c } domid = find_domain(argv[optind]); -@@ -4099,7 +4127,8 @@ int main_migrate(int argc, char **argv) +@@ -4100,7 +4128,8 @@ int main_migrate(int argc, char **argv) return 1; } @@ -478,12 +478,12 @@ Index: xen-4.4.0-testing/tools/libxl/xl_cmdimpl.c + abort_if_busy, config_filename); return 0; } - + #endif Index: xen-4.4.0-testing/tools/libxl/xl_cmdtable.c =================================================================== --- xen-4.4.0-testing.orig/tools/libxl/xl_cmdtable.c +++ xen-4.4.0-testing/tools/libxl/xl_cmdtable.c -@@ -149,14 +149,21 @@ struct cmd_spec cmd_table[] = { +@@ -150,14 +150,21 @@ struct cmd_spec cmd_table[] = { &main_migrate, 0, 1, "Migrate a domain to another host", "[options] ", @@ -511,5 +511,5 @@ Index: xen-4.4.0-testing/tools/libxl/xl_cmdtable.c + "--abort_if_busy Abort migration instead of doing final suspend, if number\n" + " of iterations or amount of transfered memory is exceeded." }, - { "dump-core", - &main_dump_core, 0, 1, + { "restore", + &main_restore, 0, 1, diff --git a/qemu-xen-dir-remote.tar.bz2 b/qemu-xen-dir-remote.tar.bz2 index 5af1b44..2d52504 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:e743a99eabfbe1548d0750ff02475c2a8663119bc2003f2d1b72b50af58f2ce1 -size 7570972 +oid sha256:3e62addd6c9481d6b12e951dffb8474b7ccffa50a007caf7d9c9ad17fbdac4ee +size 7571602 diff --git a/qemu-xen-traditional-dir-remote.tar.bz2 b/qemu-xen-traditional-dir-remote.tar.bz2 index 3db51ae..9aab035 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:72b10b8bedd6ee1461e5ea0150907b8f8c84b36abffb10f2e53e08af0eff76ab -size 3212981 +oid sha256:ee8f1852348a9054add13614aa36cd5d0dc06522bad0e442bb7c6a8e1fcd871a +size 3213098 diff --git a/seabios-dir-remote.tar.bz2 b/seabios-dir-remote.tar.bz2 index 0d193dc..c6443e9 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:6d7073374e26c99902ef37a2540b01baa8d9f817bd4d0565c44be9cf7981a9aa -size 365995 +oid sha256:76b7b90cca79d7804cb4234ca1d403b8e4e03f103e3dcd03489541e66e611bf0 +size 366520 diff --git a/xen-4.4.0-testing-src.tar.bz2 b/xen-4.4.0-testing-src.tar.bz2 index 0ad7de2..b9d98ca 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:3ba61d78a85a2b9d1b98eae31db4dd051a069366628e31f6a1e10bd45b5077e2 -size 4355756 +oid sha256:4ad02731bbe8fffa1c57d5b10ddf435c01c6ecadf2a8d342660abfda1d6419d2 +size 4356222 diff --git a/xen.changes b/xen.changes index c538ec6..ba964bd 100644 --- a/xen.changes +++ b/xen.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 17 12:33:42 MST 2014 - carnold@suse.com + +- Update to Xen 4.4.0 RC4 c/s 28391 + xen-4.4.0-testing-src.tar.bz2 + ------------------------------------------------------------------- Tue Feb 11 13:27:42 MST 2014 - carnold@suse.com diff --git a/xen.spec b/xen.spec index ac7ca75..2f1c993 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 28381 +%define changeset 28391 %define xen_build_dir xen-4.4.0-testing # %define with_kmp 0