[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/14] buffered_file: Unfold the trick to restart ge
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 10/14] buffered_file: Unfold the trick to restart generating migration data |
Date: |
Fri, 21 Sep 2012 16:08:16 +0200 |
This was needed before due to the way that the callbacks worked.
Signed-off-by: Juan Quintela <address@hidden>
---
buffered_file.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/buffered_file.c b/buffered_file.c
index 22b973f..f4a788d 100644
--- a/buffered_file.c
+++ b/buffered_file.c
@@ -113,14 +113,6 @@ static int buffered_put_buffer(void *opaque, const uint8_t
*buf, int64_t pos, in
return error;
}
- if (pos == 0 && size == 0) {
- DPRINTF("file is ready\n");
- if (s->bytes_xfer < s->xfer_limit) {
- DPRINTF("notifying client\n");
- migrate_fd_put_ready(s->migration_state);
- }
- }
-
return size;
}
@@ -215,8 +207,15 @@ static void *buffered_file_thread(void *opaque)
/* usleep expects microseconds */
usleep((expire_time - current_time)*1000);
}
- buffered_put_buffer(s, NULL, 0, 0);
+ buffered_flush(s);
+
+ DPRINTF("file is ready\n");
+ if (s->bytes_xfer < s->xfer_limit) {
+ DPRINTF("notifying client\n");
+ migrate_fd_put_ready(s->migration_state);
+ }
}
+
g_free(s->buffer);
g_free(s);
return NULL;
--
1.7.11.4
- Re: [Qemu-devel] [PATCH 05/14] migration: make qemu_fopen_ops_buffered() return void, (continued)
- [Qemu-devel] [PATCH 09/14] migration: take finer locking, Juan Quintela, 2012/09/21
- [Qemu-devel] [PATCH 08/14] migration: remove unfreeze logic, Juan Quintela, 2012/09/21
- [Qemu-devel] [PATCH 13/14] savevm: New save live migration method: pending, Juan Quintela, 2012/09/21
- [Qemu-devel] [PATCH 14/14] migration: print times for end phase, Juan Quintela, 2012/09/21
- [Qemu-devel] [PATCH 10/14] buffered_file: Unfold the trick to restart generating migration data,
Juan Quintela <=
- [Qemu-devel] [PATCH 12/14] buffered_file: unfold buffered_append in buffered_put_buffer, Juan Quintela, 2012/09/21
- [Qemu-devel] [PATCH 06/14] migration: stop all cpus correctly, Juan Quintela, 2012/09/21
- [Qemu-devel] [PATCH 11/14] buffered_file: don't flush on put buffer, Juan Quintela, 2012/09/21
- [Qemu-devel] [PATCH 07/14] migration: make writes blocking, Juan Quintela, 2012/09/21