On Fri, 3 Sep 2010, Ian Jackson wrote:
> stefano.stabellini@xxxxxxxxxxxxx writes ("[Xen-devel] [PATCH 7 of 12] xl: add
> a global configuration file"):
> > Add a global configuration file: /etc/xen/xl.conf; the only option
> > currently parsed is autoballoon that is 1 by default.
>
> You've changed your patch 8 to not have an uncommented value to set
> the default to the default in the config file, but not this one ...
>
thanks for spotting this, I am appending an updated version (you might
need to fix PATCH 9 because it might have problems applying after this
change, but the fix is so trivial that I am not going to post another
update of the series just for that):
---
Add a global configuration file: /etc/xen/xl.conf; the only option
currently parsed is autoballoon that is 1 by default.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
diff -r b889336acffb tools/examples/Makefile
--- a/tools/examples/Makefile Mon Sep 06 11:49:29 2010 +0100
+++ b/tools/examples/Makefile Mon Sep 06 11:50:20 2010 +0100
@@ -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 -r b889336acffb tools/examples/xl.conf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/examples/xl.conf Mon Sep 06 11:50:20 2010 +0100
@@ -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 -r b889336acffb tools/libxl/xl.c
--- a/tools/libxl/xl.c Mon Sep 06 11:49:29 2010 +0100
+++ b/tools/libxl/xl.c Mon Sep 06 11:50:20 2010 +0100
@@ -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 -r b889336acffb tools/libxl/xl.h
--- a/tools/libxl/xl.h Mon Sep 06 11:49:29 2010 +0100
+++ b/tools/libxl/xl.h Mon Sep 06 11:50:20 2010 +0100
@@ -90,4 +90,7 @@ struct cmd_spec *cmdtable_lookup(const c
extern libxl_ctx ctx;
extern xentoollog_logger_stdiostream *logger;
+/* global options */
+extern int autoballoon;
+
#endif /* XL_H */
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home