diff options
-rw-r--r-- | tools/examples/Makefile | 1 | ||||
-rw-r--r-- | tools/examples/xl.conf | 5 | ||||
-rw-r--r-- | tools/libxl/xl.c | 46 | ||||
-rw-r--r-- | tools/libxl/xl.h | 3 |
4 files changed, 55 insertions, 0 deletions
diff --git a/tools/examples/Makefile b/tools/examples/Makefile index a911fff057..ba54a1b8c7 100644 --- a/tools/examples/Makefile +++ b/tools/examples/Makefile @@ -21,6 +21,7 @@ XEN_CONFIGS += xmexample.nbd XEN_CONFIGS += xmexample.vti XEN_CONFIGS += xend-pci-quirks.sxp XEN_CONFIGS += xend-pci-permissive.sxp +XEN_CONFIGS += xl.conf .PHONY: all all: diff --git a/tools/examples/xl.conf b/tools/examples/xl.conf new file mode 100644 index 0000000000..946c1a1d89 --- /dev/null +++ b/tools/examples/xl.conf @@ -0,0 +1,5 @@ +## Global XL config file ## + +# automatically balloon down dom0 when xen doesn't have enough free +# memory to create a domain +autoballon=1 diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c index c96c2c79c0..345f4a5f35 100644 --- a/tools/libxl/xl.c +++ b/tools/libxl/xl.c @@ -29,18 +29,49 @@ #include "libxl.h" #include "libxl_utils.h" +#include "libxlutil.h" #include "xl.h" xentoollog_logger_stdiostream *logger; +int autoballoon = 1; static xentoollog_level minmsglevel = XTL_PROGRESS; +static void parse_global_config(const char *configfile, + const char *configfile_data, + int configfile_len) +{ + long l; + XLU_Config *config; + int e; + + config = xlu_cfg_init(stderr, configfile); + if (!config) { + fprintf(stderr, "Failed to allocate for configuration\n"); + exit(1); + } + + e = xlu_cfg_readdata(config, configfile_data, configfile_len); + if (e) { + fprintf(stderr, "Failed to parse config file: %s\n", strerror(e)); + exit(1); + } + + if (!xlu_cfg_get_long (config, "autoballoon", &l)) + autoballoon = l; + + xlu_cfg_destroy(config); +} + int main(int argc, char **argv) { int opt = 0; char *cmd = 0; struct cmd_spec *cspec; int ret; + char *config_file; + void *config_data = 0; + int config_len = 0; while ((opt = getopt(argc, argv, "+v")) >= 0) { switch (opt) { @@ -69,6 +100,21 @@ int main(int argc, char **argv) exit(1); } + /* Read global config file options */ + ret = asprintf(&config_file, "%s/xl.conf", libxl_xen_config_dir_path()); + if (ret < 0) { + fprintf(stderr, "memory allocation failed ret=%d, errno=%d\n", ret, errno); + exit(1); + } + + ret = libxl_read_file_contents(&ctx, config_file, + &config_data, &config_len); + if (ret) + fprintf(stderr, "Failed to read config file: %s: %s\n", + config_file, strerror(errno)); + parse_global_config(config_file, config_data, config_len); + free(config_file); + /* Reset options for per-command use of getopt. */ argv += optind; argc -= optind; diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index 468b18bec2..55f83599f9 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -90,4 +90,7 @@ struct cmd_spec *cmdtable_lookup(const char *s); extern libxl_ctx ctx; extern xentoollog_logger_stdiostream *logger; +/* global options */ +extern int autoballoon; + #endif /* XL_H */ |