Mailing List Archive

# HG changeset patch
# User Juergen Gross <juergen.gross@ts.fujitsu.com>
# Date 1297702500 0
# Node ID 0e7a10dc76170b0ffabd7e0df7ce26ec4c5612f4
# Parent 51bd89ca047d29a4fc1ff0518dc60319914ccc49
xl: correct xl cpupool-create with extra parameters

xl cpupool-create won't take always extra parameters specified on the command
line, as a 0-byte is missing at the end of the configuration file contents.

Signed-off-by: Juergen Gross <juergen.gross@ts.fujitsu.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
tools/libxl/xl_cmdimpl.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)

diff -r 51bd89ca047d -r 0e7a10dc7617 tools/libxl/xl_cmdimpl.c
--- a/tools/libxl/xl_cmdimpl.c Mon Feb 14 16:49:03 2011 +0000
+++ b/tools/libxl/xl_cmdimpl.c Mon Feb 14 16:55:00 2011 +0000
@@ -5204,7 +5204,7 @@ int main_cpupoolcreate(int argc, char **
{0, 0, 0, 0}
};
int ret;
- void *config_data = 0;
+ char *config_data = 0;
int config_len = 0;
XLU_Config *config;
const char *buf;
@@ -5244,9 +5244,8 @@ int main_cpupoolcreate(int argc, char **
memset(extra_config, 0, sizeof(extra_config));
while (optind < argc) {
if ((p = strchr(argv[optind], '='))) {
- if (strlen(extra_config) + 1 < sizeof(extra_config)) {
- if (strlen(extra_config))
- strcat(extra_config, "\n");
+ if (strlen(extra_config) + 1 + strlen(argv[optind]) < sizeof(extra_config)) {
+ strcat(extra_config, "\n");
strcat(extra_config, argv[optind]);
}
} else if (!filename) {
@@ -5263,7 +5262,7 @@ int main_cpupoolcreate(int argc, char **
return -ERROR_FAIL;
}

- if (libxl_read_file_contents(&ctx, filename, &config_data, &config_len)) {
+ if (libxl_read_file_contents(&ctx, filename, (void **)&config_data, &config_len)) {
fprintf(stderr, "Failed to read config file: %s: %s\n",
filename, strerror(errno));
return -ERROR_FAIL;
@@ -5279,10 +5278,10 @@ int main_cpupoolcreate(int argc, char **
fprintf(stderr, "Failed to realloc config_data\n");
return -ERROR_FAIL;
}
- strcat(config_data, "\n");
+ config_data[config_len] = 0;
strcat(config_data, extra_config);
strcat(config_data, "\n");
- config_len += (strlen(extra_config) + 2);
+ config_len += strlen(extra_config) + 1;
}

config = xlu_cfg_init(stderr, filename);

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