diff options
author | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2015-08-13 11:51:33 +0100 |
---|---|---|
committer | Amit Shah <amit.shah@redhat.com> | 2015-09-29 11:33:02 +0530 |
commit | a202a4c001fd35b50d99abcc329bc9e666eb8eed (patch) | |
tree | dac5691e8ef5a7ddbea5020b5123e11e0d249549 /migration/qemu-file-stdio.c | |
parent | c50766f5a99ef7bf6c9a86cd07341c389faf7ae6 (diff) |
migration: size_t'ify some of qemu-file
This is a start on using size_t more in qemu-file and friends;
it fixes up QEMUFilePutBufferFunc and QEMUFileGetBufferFunc
to take size_t lengths and return ssize_t return values (like read(2))
and fixes up all the different implementations of them.
Note that I've not yet followed this deeply into bdrv_ implementations.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <1439463094-5394-5-git-send-email-dgilbert@redhat.com>
Reviewed-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Reviewed-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Diffstat (limited to 'migration/qemu-file-stdio.c')
-rw-r--r-- | migration/qemu-file-stdio.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/migration/qemu-file-stdio.c b/migration/qemu-file-stdio.c index 285068b303..dc91137b9c 100644 --- a/migration/qemu-file-stdio.c +++ b/migration/qemu-file-stdio.c @@ -37,11 +37,11 @@ static int stdio_get_fd(void *opaque) return fileno(s->stdio_file); } -static int stdio_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, - int size) +static ssize_t stdio_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, + size_t size) { QEMUFileStdio *s = opaque; - int res; + size_t res; res = fwrite(buf, 1, size, s->stdio_file); @@ -51,11 +51,12 @@ static int stdio_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, return res; } -static int stdio_get_buffer(void *opaque, uint8_t *buf, int64_t pos, int size) +static ssize_t stdio_get_buffer(void *opaque, uint8_t *buf, int64_t pos, + size_t size) { QEMUFileStdio *s = opaque; FILE *fp = s->stdio_file; - int bytes; + ssize_t bytes; for (;;) { clearerr(fp); |