[Xen-changelog] [xen-unstable] xc_save/xc_restore: Fix wrong data type

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1221657362 -3600
# Node ID 694b7daa353c629e43672195c96a9334b62d69af
# Parent  366c78ff361bafb2271c551c4976e4caedea72b2
xc_save/xc_restore: Fix wrong data type

xc_interface_open() may return -1, but if we define xc_fd as unsigned
int, then -1 will be > 0.

Signed-off-by: Zhigang Wang <zhigang.x.wang@xxxxxxxxxx>
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/xcutils/xc_restore.c |    4 ++--
 tools/xcutils/xc_save.c    |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff -r 366c78ff361b -r 694b7daa353c tools/xcutils/xc_restore.c
--- a/tools/xcutils/xc_restore.c        Wed Sep 17 14:13:10 2008 +0100
+++ b/tools/xcutils/xc_restore.c        Wed Sep 17 14:16:02 2008 +0100
@@ -18,9 +18,9 @@ int
 int
 main(int argc, char **argv)
 {
-    unsigned int xc_fd, io_fd, domid, store_evtchn, console_evtchn;
+    unsigned int domid, store_evtchn, console_evtchn;
     unsigned int hvm, pae, apic;
-    int ret;
+    int xc_fd, io_fd, ret;
     unsigned long store_mfn, console_mfn;
 
     if ( argc != 8 )
diff -r 366c78ff361b -r 694b7daa353c tools/xcutils/xc_save.c
--- a/tools/xcutils/xc_save.c   Wed Sep 17 14:13:10 2008 +0100
+++ b/tools/xcutils/xc_save.c   Wed Sep 17 14:16:02 2008 +0100
@@ -297,8 +297,8 @@ int
 int
 main(int argc, char **argv)
 {
-    unsigned int xc_fd, io_fd, domid, maxit, max_f, flags; 
-    int ret;
+    unsigned int domid, maxit, max_f, flags; 
+    int xc_fd, io_fd, ret;
 
     if (argc != 6)
         errx(1, "usage: %s iofd domid maxit maxf flags", argv[0]);

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