diff options
-rw-r--r-- | tools/libxl/xl.c | 6 | ||||
-rw-r--r-- | tools/libxl/xl.h | 2 | ||||
-rw-r--r-- | tools/libxl/xl_cmdimpl.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c index 3c141bfdaa..1ce820c533 100644 --- a/tools/libxl/xl.c +++ b/tools/libxl/xl.c @@ -46,7 +46,7 @@ char *default_vifscript = NULL; char *default_bridge = NULL; char *default_gatewaydev = NULL; enum output_format default_output_format = OUTPUT_FORMAT_JSON; -libxl_defbool claim_mode; +int claim_mode = 0; static xentoollog_level minmsglevel = XTL_PROGRESS; @@ -170,8 +170,8 @@ static void parse_global_config(const char *configfile, if (!xlu_cfg_get_string (config, "blkdev_start", &buf, 0)) blkdev_start = strdup(buf); - libxl_defbool_setdefault(&claim_mode, false); - (void)xlu_cfg_get_defbool (config, "claim_mode", &claim_mode, 0); + if (!xlu_cfg_get_long (config, "claim_mode", &l, 0)) + claim_mode = l; xlu_cfg_destroy(config); } diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index 771b4af241..5ad3e17b20 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -146,7 +146,7 @@ int xl_child_pid(xlchildnum); /* returns 0 if child struct is not in use */ extern int autoballoon; extern int run_hotplug_scripts; extern int dryrun_only; -extern libxl_defbool claim_mode; +extern int claim_mode; extern char *lockfile; extern char *default_vifscript; extern char *default_bridge; diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index edf0325fdd..609ce49a7d 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -734,7 +734,7 @@ static void parse_config_data(const char *config_source, if (!xlu_cfg_get_long (config, "maxmem", &l, 0)) b_info->max_memkb = l * 1024; - b_info->claim_mode = claim_mode; + libxl_defbool_set(&b_info->claim_mode, claim_mode); if (xlu_cfg_get_string (config, "on_poweroff", &buf, 0)) buf = "destroy"; @@ -4607,7 +4607,7 @@ static void output_physinfo(void) /* * Only if enabled (claim_mode=1) or there are outstanding claims. */ - if (libxl_defbool_val(claim_mode) || info.outstanding_pages) + if (claim_mode || info.outstanding_pages) printf("outstanding_claims : %"PRIu64"\n", info.outstanding_pages / i); if (!libxl_get_freecpus(ctx, &cpumap)) { @@ -5911,7 +5911,7 @@ int main_claims(int argc, char **argv) /* No options */ } - if (!libxl_defbool_val(claim_mode)) + if (!claim_mode) fprintf(stderr, "claim_mode not enabled (see man xl.conf).\n"); info = libxl_list_domain(ctx, &nb_domain); |