We need to use PRIu32 for domids, and also to pass arguments in the
right order.
Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
tools/libxl/libxl.c | 4 ++--
tools/libxl/libxl_dom.c | 2 +-
tools/libxl/libxl_xshelp.c | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 8fd4481..6adb9e5 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -230,7 +230,7 @@ int libxl_domain_rename(struct libxl_ctx *ctx, uint32_t
domid,
new_name, strlen(new_name))) {
XL_LOG(ctx, XL_LOG_ERROR, "failed to write new name `%s'"
" for domain %"PRIu32" previously named `%s'",
- domid, new_name, old_name);
+ new_name, domid, old_name);
goto x_fail;
}
@@ -240,7 +240,7 @@ int libxl_domain_rename(struct libxl_ctx *ctx, uint32_t
domid,
if (errno != EAGAIN) {
XL_LOG(ctx, XL_LOG_ERROR, "failed to commit new name `%s'"
" for domain %"PRIu32" previously named `%s'",
- domid, new_name, old_name);
+ new_name, domid, old_name);
goto x_fail;
}
XL_LOG(ctx, XL_LOG_DEBUG, "need to retry rename transaction"
diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c
index 483a928..ba7dfe0 100644
--- a/tools/libxl/libxl_dom.c
+++ b/tools/libxl/libxl_dom.c
@@ -386,7 +386,7 @@ static const char *userdata_path(struct libxl_ctx *ctx,
uint32_t domid,
rc = libxl_domain_info(ctx, &info, domid);
if (rc) {
XL_LOG_ERRNO(ctx, XL_LOG_ERROR, "unable to find domain info"
- " for domain %l"PRIu32, domid);
+ " for domain %"PRIu32, domid);
return 0;
}
uuid_string = string_of_uuid(ctx, info.uuid);
diff --git a/tools/libxl/libxl_xshelp.c b/tools/libxl/libxl_xshelp.c
index 16e8c84..b5c6dbf 100644
--- a/tools/libxl/libxl_xshelp.c
+++ b/tools/libxl/libxl_xshelp.c
@@ -19,6 +19,7 @@
#include <stddef.h>
#include <stdio.h>
#include <stdarg.h>
+#include <inttypes.h>
#include "libxl.h"
#include "libxl_internal.h"
@@ -119,7 +120,7 @@ char *libxl_xs_get_dompath(struct libxl_ctx *ctx, uint32_t
domid)
{
char *s = xs_get_domain_path(ctx->xsh, domid);
if (!s) {
- XL_LOG_ERRNO(ctx, XL_LOG_ERROR, "failed to get dompath for %lu",
+ XL_LOG_ERRNO(ctx, XL_LOG_ERROR, "failed to get dompath for %" PRIu32,
domid);
return NULL;
}
--
1.5.6.5
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home