From f2878b5bb1a0b9c25efca3c594d764c9e13b50c0 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 17 Sep 2008 14:16:02 +0100 Subject: 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 Signed-off-by: Keir Fraser --- tools/xcutils/xc_restore.c | 4 ++-- tools/xcutils/xc_save.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tools/xcutils') diff --git a/tools/xcutils/xc_restore.c b/tools/xcutils/xc_restore.c index e769c0be31..34fa26edd3 100644 --- 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 c8b0ccb05c..adbcb92141 100644 --- 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]); -- cgit v1.2.3