ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

buffered_file: make buffered_flush return the error code 

Or the amount of data written if there is no error.  Adjust all callers.

Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Juan Quintela 2012-08-24 12:43:04 +02:00
parent 3d6dff316f
commit d2dbc8e6a9
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
buffered_file.c
View File

@ -58,26 +58,26 @@ static void buffered_append(QEMUFileBuffered *s,
s->buffer_size += size; s->buffer_size += size;
} }
static void buffered_flush(QEMUFileBuffered *s) static ssize_t buffered_flush(QEMUFileBuffered *s)
{ {
size_t offset = 0; size_t offset = 0;
ssize_t ret = 0;
DPRINTF("flushing %zu byte(s) of data\n", s->buffer_size); DPRINTF("flushing %zu byte(s) of data\n", s->buffer_size);
while (s->bytes_xfer < s->xfer_limit && offset < s->buffer_size) { while (s->bytes_xfer < s->xfer_limit && offset < s->buffer_size) {
ssize_t ret;
ret = migrate_fd_put_buffer(s->migration_state, s->buffer + offset, ret = migrate_fd_put_buffer(s->migration_state, s->buffer + offset,
s->buffer_size - offset); s->buffer_size - offset);
if (ret == -EAGAIN) { if (ret == -EAGAIN) {
DPRINTF("backend not ready, freezing\n"); DPRINTF("backend not ready, freezing\n");
ret = 0;
s->freeze_output = 1; s->freeze_output = 1;
break; break;
} }
if (ret <= 0) { if (ret <= 0) {
DPRINTF("error flushing data, %zd\n", ret); DPRINTF("error flushing data, %zd\n", ret);
qemu_file_set_error(s->file, ret);
break; break;
} else { } else {
DPRINTF("flushed %zd byte(s)\n", ret); DPRINTF("flushed %zd byte(s)\n", ret);
@ -89,12 +89,17 @@ static void buffered_flush(QEMUFileBuffered *s)
DPRINTF("flushed %zu of %zu byte(s)\n", offset, s->buffer_size); DPRINTF("flushed %zu of %zu byte(s)\n", offset, s->buffer_size);
memmove(s->buffer, s->buffer + offset, s->buffer_size - offset); memmove(s->buffer, s->buffer + offset, s->buffer_size - offset);
s->buffer_size -= offset; s->buffer_size -= offset;
if (ret < 0) {
return ret;
}
return offset;
} }
static int buffered_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, int size) static int buffered_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, int size)
{ {
QEMUFileBuffered *s = opaque; QEMUFileBuffered *s = opaque;
int error; ssize_t error;
DPRINTF("putting %d bytes at %" PRId64 "\n", size, pos); DPRINTF("putting %d bytes at %" PRId64 "\n", size, pos);
@ -112,7 +117,13 @@ static int buffered_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, in
buffered_append(s, buf, size); buffered_append(s, buf, size);
} }
buffered_flush(s); error = buffered_flush(s);
if (error < 0) {
DPRINTF("buffered flush error. bailing: %s\n", strerror(-error));
qemu_file_set_error(s->file, error);
return error;
}
if (pos == 0 && size == 0) { if (pos == 0 && size == 0) {
DPRINTF("file is ready\n"); DPRINTF("file is ready\n");
@ -128,19 +139,25 @@ static int buffered_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, in
static int buffered_close(void *opaque) static int buffered_close(void *opaque)
{ {
QEMUFileBuffered *s = opaque; QEMUFileBuffered *s = opaque;
int ret; ssize_t ret = 0;
int ret2;
DPRINTF("closing\n"); DPRINTF("closing\n");
s->xfer_limit = INT_MAX; s->xfer_limit = INT_MAX;
while (!qemu_file_get_error(s->file) && s->buffer_size) { while (!qemu_file_get_error(s->file) && s->buffer_size) {
buffered_flush(s); ret = buffered_flush(s);
if (ret < 0) {
break;
}
if (s->freeze_output) if (s->freeze_output)
migrate_fd_wait_for_unfreeze(s->migration_state); migrate_fd_wait_for_unfreeze(s->migration_state);
} }
ret = migrate_fd_close(s->migration_state); ret2 = migrate_fd_close(s->migration_state);
if (ret >= 0) {
ret = ret2;
}
qemu_del_timer(s->timer); qemu_del_timer(s->timer);
qemu_free_timer(s->timer); qemu_free_timer(s->timer);
g_free(s->buffer); g_free(s->buffer);