diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2008-09-17 14:16:02 +0100 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2008-09-17 14:16:02 +0100 |
commit | f2878b5bb1a0b9c25efca3c594d764c9e13b50c0 (patch) | |
tree | f94a94833415c31299bbd1a6f9bb11886f2a8b97 | |
parent | ff965b7ec9d8231cea61ca33a85cab8ffe318e4f (diff) | |
download | xen-f2878b5bb1a0b9c25efca3c594d764c9e13b50c0.tar.gz xen-f2878b5bb1a0b9c25efca3c594d764c9e13b50c0.tar.bz2 xen-f2878b5bb1a0b9c25efca3c594d764c9e13b50c0.zip |
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>
-rw-r--r-- | tools/xcutils/xc_restore.c | 4 | ||||
-rw-r--r-- | tools/xcutils/xc_save.c | 4 |
2 files changed, 4 insertions, 4 deletions
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]); |