diff options
author | Ian Campbell <ian.campbell@citrix.com> | 2011-05-24 10:14:10 +0100 |
---|---|---|
committer | Ian Campbell <ian.campbell@citrix.com> | 2011-05-24 10:14:10 +0100 |
commit | 7e0cf3678692744eddb73156d654ae2ebadb51fe (patch) | |
tree | 43a9fdc4ffee634d9e955a2bfdcf2232ea9167d4 /tools/libxc/xc_domain_save.c | |
parent | 8dc73525d2597ebb0a6ba771b96ee45603794e9c (diff) | |
download | xen-7e0cf3678692744eddb73156d654ae2ebadb51fe.tar.gz xen-7e0cf3678692744eddb73156d654ae2ebadb51fe.tar.bz2 xen-7e0cf3678692744eddb73156d654ae2ebadb51fe.zip |
libxc: save: noncached write doesn't use live parameter.
so drop it.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson.citrix.com>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
Diffstat (limited to 'tools/libxc/xc_domain_save.c')
-rw-r--r-- | tools/libxc/xc_domain_save.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/libxc/xc_domain_save.c b/tools/libxc/xc_domain_save.c index 7ca2630e84..d43e634921 100644 --- a/tools/libxc/xc_domain_save.c +++ b/tools/libxc/xc_domain_save.c @@ -152,7 +152,7 @@ static uint64_t tv_delta(struct timeval *new, struct timeval *old) } static int noncached_write(xc_interface *xch, - int fd, int live, void *buffer, int len) + int fd, void *buffer, int len) { static int write_count = 0; int rc = (write_exact(fd, buffer, len) == 0) ? len : -1; @@ -255,12 +255,12 @@ static inline int write_buffer(xc_interface *xch, /* like write_buffer for noncached, which returns number of bytes written */ static inline int write_uncached(xc_interface *xch, int dobuf, struct outbuf* ob, int fd, - int live, void* buf, size_t len) + void* buf, size_t len) { if ( dobuf ) return outbuf_hardwrite(xch, ob, fd, buf, len) ? -1 : len; else - return noncached_write(xch, fd, live, buf, len); + return noncached_write(xch, fd, buf, len); } static int print_stats(xc_interface *xch, uint32_t domid, int pages_sent, @@ -1066,7 +1066,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter copypages: #define wrexact(fd, buf, len) write_buffer(xch, last_iter, &ob, (fd), (buf), (len)) -#define ratewrite(fd, live, buf, len) write_uncached(xch, last_iter, &ob, (fd), (live), (buf), (len)) +#define wruncached(fd, live, buf, len) write_uncached(xch, last_iter, &ob, (fd), (buf), (len)) /* Now write out each data page, canonicalising page tables as we go... */ for ( ; ; ) @@ -1300,7 +1300,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter run of pages we may have previously acumulated */ if ( run ) { - if ( ratewrite(io_fd, live, + if ( wruncached(io_fd, live, (char*)region_base+(PAGE_SIZE*(j-run)), PAGE_SIZE*run) != PAGE_SIZE*run ) { @@ -1332,7 +1332,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter goto out; } - if ( ratewrite(io_fd, live, page, PAGE_SIZE) != PAGE_SIZE ) + if ( wruncached(io_fd, live, page, PAGE_SIZE) != PAGE_SIZE ) { PERROR("Error when writing to state file (4b)" " (errno %d)", errno); @@ -1349,7 +1349,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iter if ( run ) { /* write out the last accumulated run of pages */ - if ( ratewrite(io_fd, live, + if ( wruncached(io_fd, live, (char*)region_base+(PAGE_SIZE*(j-run)), PAGE_SIZE*run) != PAGE_SIZE*run ) { |