[Xen-changelog] [xen-unstable] tools/libxl: revert 15bcf57fcf24 (disable_migrate)

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
# Date 1278434299 -3600
# Node ID 4e455f0125d345beff8a07530f7187c1d83e83a6
# Parent  7925f4d390434fb1efc365b68a7d7f6b8cfd0cfc
tools/libxl: revert 15bcf57fcf24 (disable_migrate)

That patch is entirely wrong.  xc_domain_disable_migrate does not work
like that, and the config parameter is misnamed.
---
 tools/libxl/libxl.h      |    1 -
 tools/libxl/libxl_dom.c  |    1 -
 tools/libxl/xl_cmdimpl.c |    5 -----
 3 files changed, 7 deletions(-)

diff -r 7925f4d39043 -r 4e455f0125d3 tools/libxl/libxl.h
--- a/tools/libxl/libxl.h       Tue Jul 06 17:31:04 2010 +0100
+++ b/tools/libxl/libxl.h       Tue Jul 06 17:38:19 2010 +0100
@@ -97,7 +97,6 @@ typedef struct {
     uint32_t target_memkb;
     uint32_t video_memkb;
     uint32_t shadow_memkb;
-    bool disable_migrate;
     const char *kernel;
     int hvm;
     union {
diff -r 7925f4d39043 -r 4e455f0125d3 tools/libxl/libxl_dom.c
--- a/tools/libxl/libxl_dom.c   Tue Jul 06 17:31:04 2010 +0100
+++ b/tools/libxl/libxl_dom.c   Tue Jul 06 17:38:19 2010 +0100
@@ -68,7 +68,6 @@ int build_pre(struct libxl_ctx *ctx, uin
             (info->hvm) ? info->max_memkb : 
             (info->max_memkb + info->u.pv.slack_memkb));
     xc_domain_set_tsc_info(ctx->xch, domid, info->tsc_mode, 0, 0, 0);
-    xc_domain_disable_migrate(ctx->xch, info->disable_migrate);
 
     if (info->hvm) {
         unsigned long shadow;
diff -r 7925f4d39043 -r 4e455f0125d3 tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c  Tue Jul 06 17:31:04 2010 +0100
+++ b/tools/libxl/xl_cmdimpl.c  Tue Jul 06 17:38:19 2010 +0100
@@ -192,7 +192,6 @@ static void init_build_info(libxl_domain
     b_info->max_vcpus = 1;
     b_info->max_memkb = 32 * 1024;
     b_info->target_memkb = b_info->max_memkb;
-    b_info->disable_migrate = 0;
     if (c_info->hvm) {
         b_info->shadow_memkb = 0; /* Set later */
         b_info->video_memkb = 8 * 1024;
@@ -361,7 +360,6 @@ static void printf_info(int domid,
     printf("\t(tsc_mode %d)\n", b_info->tsc_mode);
     printf("\t(max_memkb %d)\n", b_info->max_memkb);
     printf("\t(target_memkb %d)\n", b_info->target_memkb);
-    printf("\t(disable_migrate %d)\n", b_info->disable_migrate);
 
     printf("\t(image\n");
     if (c_info->hvm) {
@@ -552,9 +550,6 @@ static void parse_config_data(const char
         ? l * 1024
         : libxl_get_required_shadow_memory(b_info->max_memkb,
                                            b_info->max_vcpus);
-
-    if (!xlu_cfg_get_long (config, "disable_migrate", &l))
-        b_info->disable_migrate = l;
 
     if (!xlu_cfg_get_long(config, "tsc_mode", &l))
         b_info->tsc_mode = l;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog