[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/41] migration: use qemu_file_set_error
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 10/41] migration: use qemu_file_set_error |
Date: |
Fri, 15 Feb 2013 18:46:42 +0100 |
Remove the return value of buffered_flush, pass it via the error code
of s->file. Once this is done, the error can be retrieved simply
via migrate_fd_close's call to qemu_fclose.
Signed-off-by: Paolo Bonzini <address@hidden>
---
migration.c | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/migration.c b/migration.c
index 609bd7c..6834d61 100644
--- a/migration.c
+++ b/migration.c
@@ -518,7 +518,7 @@ int64_t migrate_xbzrle_cache_size(void)
/* migration thread support */
-static ssize_t buffered_flush(MigrationState *s)
+static void buffered_flush(MigrationState *s)
{
size_t offset = 0;
ssize_t ret = 0;
@@ -545,9 +545,8 @@ static ssize_t buffered_flush(MigrationState *s)
s->buffer_size -= offset;
if (ret < 0) {
- return ret;
+ qemu_file_set_error(s->file, ret);
}
- return offset;
}
static int buffered_put_buffer(void *opaque, const uint8_t *buf,
@@ -586,25 +585,15 @@ static int buffered_put_buffer(void *opaque, const
uint8_t *buf,
static int buffered_close(void *opaque)
{
MigrationState *s = opaque;
- ssize_t ret = 0;
- int ret2;
DPRINTF("closing\n");
s->xfer_limit = INT_MAX;
while (!qemu_file_get_error(s->file) && s->buffer_size) {
- ret = buffered_flush(s);
- if (ret < 0) {
- break;
- }
- }
-
- ret2 = migrate_fd_close(s);
- if (ret >= 0) {
- ret = ret2;
+ buffered_flush(s);
}
s->complete = true;
- return ret;
+ return migrate_fd_close(s);
}
static int buffered_get_fd(void *opaque)
@@ -741,7 +730,8 @@ static void *buffered_file_thread(void *opaque)
/* usleep expects microseconds */
g_usleep((initial_time + BUFFER_DELAY - current_time)*1000);
}
- ret = buffered_flush(s);
+ buffered_flush(s);
+ ret = qemu_file_get_error(s->file);
}
if (ret < 0) {
--
1.7.1
- Re: [Qemu-devel] [PATCH 33/41] qemu-file: simplify and export qemu_ftell, (continued)
- [Qemu-devel] [PATCH 15/41] block-migration: remove variables that are never read, Paolo Bonzini, 2013/02/15
- [Qemu-devel] [PATCH 06/41] qemu-file: pass errno from qemu_fflush via f->last_error, Paolo Bonzini, 2013/02/15
- [Qemu-devel] [PATCH 32/41] qemu-file: add writable socket QEMUFile, Paolo Bonzini, 2013/02/15
- [Qemu-devel] [PATCH 10/41] migration: use qemu_file_set_error,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 12/41] migration: do not nest flushing of device data, Paolo Bonzini, 2013/02/15
- [Qemu-devel] [PATCH 14/41] migration: cleanup migration (including thread) in the iothread, Paolo Bonzini, 2013/02/15
- [Qemu-devel] [PATCH 11/41] migration: simplify error handling, Paolo Bonzini, 2013/02/15