[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/34] buffered_file: unfold buffered_append in buff
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 19/34] buffered_file: unfold buffered_append in buffered_put_buffer |
Date: |
Wed, 19 Dec 2012 13:33:42 +0100 |
It was the only user, and now buffered_put_buffer just do the append
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
---
buffered_file.c | 33 ++++++++++++++-------------------
1 file changed, 14 insertions(+), 19 deletions(-)
diff --git a/buffered_file.c b/buffered_file.c
index 2c3820c..11efd8f 100644
--- a/buffered_file.c
+++ b/buffered_file.c
@@ -42,22 +42,6 @@ typedef struct QEMUFileBuffered
do { } while (0)
#endif
-static void buffered_append(QEMUFileBuffered *s,
- const uint8_t *buf, size_t size)
-{
- if (size > (s->buffer_capacity - s->buffer_size)) {
- DPRINTF("increasing buffer capacity from %zu by %zu\n",
- s->buffer_capacity, size + 1024);
-
- s->buffer_capacity += size + 1024;
-
- s->buffer = g_realloc(s->buffer, s->buffer_capacity);
- }
-
- memcpy(s->buffer + s->buffer_size, buf, size);
- s->buffer_size += size;
-}
-
static ssize_t buffered_flush(QEMUFileBuffered *s)
{
size_t offset = 0;
@@ -102,11 +86,22 @@ static int buffered_put_buffer(void *opaque, const uint8_t
*buf, int64_t pos, in
return error;
}
- if (size > 0) {
- DPRINTF("buffering %d bytes\n", size - offset);
- buffered_append(s, buf, size);
+ if (size <= 0) {
+ return size;
}
+ if (size > (s->buffer_capacity - s->buffer_size)) {
+ DPRINTF("increasing buffer capacity from %zu by %zu\n",
+ s->buffer_capacity, size + 1024);
+
+ s->buffer_capacity += size + 1024;
+
+ s->buffer = g_realloc(s->buffer, s->buffer_capacity);
+ }
+
+ memcpy(s->buffer + s->buffer_size, buf, size);
+ s->buffer_size += size;
+
return size;
}
--
1.7.11.7
- [Qemu-devel] [PATCH 11/34] buffered_file: Move from using a timer to use a thread, (continued)
- [Qemu-devel] [PATCH 11/34] buffered_file: Move from using a timer to use a thread, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 10/34] protect the ramlist with a separate mutex, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 13/34] migration: move migration thread init code to migrate_fd_put_ready, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 16/34] migration: just lock migrate_fd_put_ready, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 15/34] migration: remove unfreeze logic, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 14/34] migration: make writes blocking, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 18/34] buffered_file: don't flush on put buffer, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 17/34] buffered_file: Unfold the trick to restart generating migration data, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 22/34] migration: add XFER_LIMIT_RATIO, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 26/34] ram: rename last_block to last_seen_block, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 19/34] buffered_file: unfold buffered_append in buffered_put_buffer,
Juan Quintela <=
- [Qemu-devel] [PATCH 12/34] migration: make qemu_fopen_ops_buffered() return void, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 20/34] savevm: New save live migration method: pending, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 23/34] migration: move migration_fd_put_ready(), Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 21/34] migration: move buffered_file.c code into migration.c, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 24/34] migration: Inline qemu_fopen_ops_buffered into migrate_fd_connect, Juan Quintela, 2012/12/19
- Re: [Qemu-devel] [PATCH 00/34] migration thread and queue, Paolo Bonzini, 2012/12/19
- [Qemu-devel] [PATCH 27/34] ram: Add last_sent_block, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 31/34] ram: account the amount of transferred ram better, Juan Quintela, 2012/12/19
- [Qemu-devel] [PATCH 32/34] ram: refactor ram_save_block() return value, Juan Quintela, 2012/12/19