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.

diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index d96f1ca314c794d3b4be4d9c82cc6d0e0aa50062..280e53e88152634a604d6870733b7ab5881b63b9 100644 (file)
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -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 --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c
index d9dc1072ef02f20388b9ed7dcd53002dee88326c..39b1b09ef8612e13d5a854fc97a5dbdc1bdbb1f0 100644 (file)
--- a/tools/libxl/libxl_dom.c
+++ b/tools/libxl/libxl_dom.c
@@ -68,7 +68,6 @@ int build_pre(struct libxl_ctx *ctx, uint32_t domid,
             (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 --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 43d0f2ec3fa70fc80b1ef3e77770033ced685407..984a2e420e83059a667f651a3ec585e96ec7dd36 100644 (file)
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -192,7 +192,6 @@ static void init_build_info(libxl_domain_build_info *b_info, libxl_domain_create
     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) {
@@ -553,9 +551,6 @@ static void parse_config_data(const char *configfile_filename_report,
         : 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;