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>
diff -r 12f0618400de tools/libxl/libxl_bootloader.c
--- a/tools/libxl/libxl_bootloader.c Fri Jul 16 13:54:44 2010 +0100
+++ b/tools/libxl/libxl_bootloader.c Mon Jul 19 15:00:33 2010 +0100
@@ -251,7 +251,7 @@
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 @@
}
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) {
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel