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@oracle.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/tools/xcutils/xc_restore.c b/tools/xcutils/xc_restore.c
index e769c0be310dcc27a6a2c59460e12044338348a6..34fa26edd3546222eac840b3e5cd455ddcaa73fe 100644 (file)
--- a/tools/xcutils/xc_restore.c
+++ b/tools/xcutils/xc_restore.c
@@ -18,9 +18,9 @@
 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 --git a/tools/xcutils/xc_save.c b/tools/xcutils/xc_save.c
index c8b0ccb05cfe8f809a198769ea9976d51275bc35..adbcb9214122c1655a0129b6b6e70dd95de422b9 100644 (file)
--- a/tools/xcutils/xc_save.c
+++ b/tools/xcutils/xc_save.c
@@ -297,8 +297,8 @@ static void *init_qemu_maps(int domid, unsigned int bitmap_size)
 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]);