[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 34/41] savevm: Only qemu_fflush() can generate error
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 34/41] savevm: Only qemu_fflush() can generate errors |
Date: |
Tue, 2 Oct 2012 13:33:29 +0200 |
Move the error check to the beggining of the callers. Once this is fixed
qemu_file_set_if_error() is not used anymore, so remove it.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
---
savevm.c | 35 ++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/savevm.c b/savevm.c
index 4e4aa3c..59ec8bf 100644
--- a/savevm.c
+++ b/savevm.c
@@ -445,18 +445,6 @@ void qemu_file_set_error(QEMUFile *f, int ret)
f->last_error = ret;
}
-/** Sets last_error conditionally
- *
- * Sets last_error only if ret is negative _and_ no error
- * was set before.
- */
-static void qemu_file_set_if_error(QEMUFile *f, int ret)
-{
- if (ret < 0 && !f->last_error) {
- qemu_file_set_error(f, ret);
- }
-}
-
/** Flushes QEMUFile buffer
*
*/
@@ -544,13 +532,17 @@ void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int
size)
{
int l;
- if (!f->last_error && f->is_write == 0 && f->buf_index > 0) {
+ if (f->last_error) {
+ return;
+ }
+
+ if (f->is_write == 0 && f->buf_index > 0) {
fprintf(stderr,
"Attempted to write to buffer while read buffer is not
empty\n");
abort();
}
- while (!f->last_error && size > 0) {
+ while (size > 0) {
l = IO_BUF_SIZE - f->buf_index;
if (l > size)
l = size;
@@ -561,14 +553,21 @@ void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int
size)
size -= l;
if (f->buf_index >= IO_BUF_SIZE) {
int ret = qemu_fflush(f);
- qemu_file_set_if_error(f, ret);
+ if (ret < 0) {
+ qemu_file_set_error(f, ret);
+ break;
+ }
}
}
}
void qemu_put_byte(QEMUFile *f, int v)
{
- if (!f->last_error && f->is_write == 0 && f->buf_index > 0) {
+ if (f->last_error) {
+ return;
+ }
+
+ if (f->is_write == 0 && f->buf_index > 0) {
fprintf(stderr,
"Attempted to write to buffer while read buffer is not
empty\n");
abort();
@@ -578,7 +577,9 @@ void qemu_put_byte(QEMUFile *f, int v)
f->is_write = 1;
if (f->buf_index >= IO_BUF_SIZE) {
int ret = qemu_fflush(f);
- qemu_file_set_if_error(f, ret);
+ if (ret < 0) {
+ qemu_file_set_error(f, ret);
+ }
}
}
--
1.7.11.4
- [Qemu-devel] [PATCH 37/41] block-migration: Switch meaning of return value, (continued)
- [Qemu-devel] [PATCH 37/41] block-migration: Switch meaning of return value, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 38/41] block-migration: handle errors with the return codes correctly, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 40/41] savevm: make qemu_file_put_notify() return errors, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 39/41] savevm: un-export qemu_file_set_error(), Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 31/41] savevm: unfold qemu_fclose_internal(), Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 24/41] buffered_file: callers of buffered_flush() already check for errors, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 41/41] cpus: create qemu_in_vcpu_thread(), Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 27/41] savevm: unexport qemu_fflush, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 23/41] buffered_file: We can access directly to bandwidth_limit, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 25/41] buffered_file: make buffered_flush return the error code, Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 34/41] savevm: Only qemu_fflush() can generate errors,
Juan Quintela <=
- [Qemu-devel] [PATCH 32/41] savevm: unexport qemu_ftell(), Juan Quintela, 2012/10/02
- [Qemu-devel] [PATCH 35/41] buffered_file: buffered_put_buffer() don't need to set last_error, Juan Quintela, 2012/10/02