[Xen-changelog] [xen-unstable] make libxl build since 21811

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Stefano Stabellini <sstabellini@xxxxxxxxxxxxx>
# Date 1279548932 -3600
# Node ID 317bf978887c58c05a8b6643b8abb4ea1f1bc3b7
# Parent  7f911455111eb972900462e7257a6925bf429908
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@xxxxxxxxxx>
---
 tools/libxl/libxl_bootloader.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r 7f911455111e -r 317bf978887c tools/libxl/libxl_bootloader.c
--- a/tools/libxl/libxl_bootloader.c    Mon Jul 19 15:11:07 2010 +0100
+++ b/tools/libxl/libxl_bootloader.c    Mon Jul 19 15:15:32 2010 +0100
@@ -251,7 +251,7 @@ static char * bootloader_interact(struct
                 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_ct
     }
 
     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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog