diff options
| author | Juan Quintela <quintela@redhat.com> | 2011-09-21 22:32:08 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2011-10-20 13:23:51 +0200 |
| commit | eff28a5c3b36fdca2a15e9570f67924eecb2db4f (patch) | |
| tree | cc7d582f4b50411a74a40ed876bba0e839f2280c | |
| parent | db448a088c4b3403c74adfa9b27eb6e624181d9b (diff) | |
buffered_file: reuse QEMUFile has_error field
Instead of having two has_error fields in QEMUFile & QEMUBufferedFile,
reuse the 1st one. Notice that the one in buffered_file is only set
after a file operation.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | buffered_file.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/buffered_file.c b/buffered_file.c index decc3bf928..4f4976387a 100644 --- a/buffered_file.c +++ b/buffered_file.c @@ -27,7 +27,6 @@ typedef struct QEMUFileBuffered BufferedCloseFunc *close; void *opaque; QEMUFile *file; - int has_error; int freeze_output; size_t bytes_xfer; size_t xfer_limit; @@ -73,7 +72,7 @@ static void buffered_flush(QEMUFileBuffered *s) { size_t offset = 0; - if (s->has_error) { + if (qemu_file_has_error(s->file)) { DPRINTF("flush when error, bailing\n"); return; } @@ -93,7 +92,7 @@ static void buffered_flush(QEMUFileBuffered *s) if (ret <= 0) { DPRINTF("error flushing data, %zd\n", ret); - s->has_error = 1; + qemu_file_set_error(s->file); break; } else { DPRINTF("flushed %zd byte(s)\n", ret); @@ -114,7 +113,7 @@ static int buffered_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, in DPRINTF("putting %d bytes at %" PRId64 "\n", size, pos); - if (s->has_error) { + if (qemu_file_has_error(s->file)) { DPRINTF("flush when error, bailing\n"); return -EINVAL; } @@ -139,7 +138,7 @@ static int buffered_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, in if (ret <= 0) { DPRINTF("error putting\n"); - s->has_error = 1; + qemu_file_set_error(s->file); offset = -EINVAL; break; } @@ -173,7 +172,7 @@ static int buffered_close(void *opaque) DPRINTF("closing\n"); - while (!s->has_error && s->buffer_size) { + while (!qemu_file_has_error(s->file) && s->buffer_size) { buffered_flush(s); if (s->freeze_output) s->wait_for_unfreeze(s->opaque); @@ -199,7 +198,7 @@ static int buffered_rate_limit(void *opaque) { QEMUFileBuffered *s = opaque; - if (s->has_error) { + if (qemu_file_has_error(s->file)) { return -1; } if (s->freeze_output) @@ -214,7 +213,7 @@ static int buffered_rate_limit(void *opaque) static int64_t buffered_set_rate_limit(void *opaque, int64_t new_rate) { QEMUFileBuffered *s = opaque; - if (s->has_error) + if (qemu_file_has_error(s->file)) goto out; if (new_rate > SIZE_MAX) { @@ -238,7 +237,7 @@ static void buffered_rate_tick(void *opaque) { QEMUFileBuffered *s = opaque; - if (s->has_error) { + if (qemu_file_has_error(s->file)) { buffered_close(s); return; } |