diff options
| author | Stefano Stabellini <sstabellini@xensource.com> | 2010-07-19 15:15:32 +0100 |
|---|---|---|
| committer | Stefano Stabellini <sstabellini@xensource.com> | 2010-07-19 15:15:32 +0100 |
| commit | 9fc200ae85b73fefcdab365fa41220ea0a63c2b1 (patch) | |
| tree | 885624c10ea2652ea97715a1a81980eda6bafee7 /tools/libxl/libxl_bootloader.c | |
| parent | 1ea482edf836d93d8f3fc4f3f4be55d8307830f4 (diff) | |
| download | xen-9fc200ae85b73fefcdab365fa41220ea0a63c2b1.tar.gz xen-9fc200ae85b73fefcdab365fa41220ea0a63c2b1.tar.bz2 xen-9fc200ae85b73fefcdab365fa41220ea0a63c2b1.zip | |
make libxl build since 21811
First hunk, I assume is getting the arguments in wrong order on memset.
Second hunk is to kill a compiler warning about mis-use of printf-style
format strings which kills the build on -Werror.
Signed-off-by: Gianni Tedesco <gianni.tedesco@citrix.com>
Diffstat (limited to 'tools/libxl/libxl_bootloader.c')
| -rw-r--r-- | tools/libxl/libxl_bootloader.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/libxl/libxl_bootloader.c b/tools/libxl/libxl_bootloader.c index dfec4bca49..e7cf624244 100644 --- a/tools/libxl/libxl_bootloader.c +++ b/tools/libxl/libxl_bootloader.c @@ -251,7 +251,7 @@ static char * bootloader_interact(struct libxl_ctx *ctx, int xenconsoled_fd, int if (temp == NULL) goto out_err; output = temp; - memset(output + size_out, new_size - size_out, 0); + memset(output + size_out, 0, new_size - size_out); size_out = new_size; } @@ -386,7 +386,7 @@ int libxl_run_bootloader(struct libxl_ctx *ctx, } dom_console_xs_path = libxl_sprintf(ctx, "%s/serial/0/tty", libxl_xs_get_dompath(ctx, domid)); - libxl_xs_write(ctx, XBT_NULL, dom_console_xs_path, dom_console_slave_tty_path); + libxl_xs_write(ctx, XBT_NULL, dom_console_xs_path, "%s", dom_console_slave_tty_path); pid = fork_exec_bootloader(&bootloader_fd, (char *)info->u.pv.bootloader, args); if (pid < 0) { |