[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 05/11] qemu_fclose: return last_error if set
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [RFC PATCH 05/11] qemu_fclose: return last_error if set |
Date: |
Tue, 1 Nov 2011 17:20:24 -0200 |
This will make sure no error will be missed as long as callers always
check for qemu_fclose() return value. For reference, this is the
complete list of qemu_fclose() callers:
- exec_close(): already fixed to check for negative values, not -1
- migrate_fd_cleanup(): already fixed to consider only negative values
as error, not any non-zero value
- exec_accept_incoming_migration(): no return value check (yet)
- fd_accept_incoming_migration(): no return value check (yet)
- tcp_accept_incoming_migration(): no return value check (yet)
- unix_accept_incoming_migration(): no return value check (yet)
- do_savevm(): no return value check (yet)
- load_vmstate(): no return value check (yet)
Signed-off-by: Eduardo Habkost <address@hidden>
---
savevm.c | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/savevm.c b/savevm.c
index dc3311b..3c746a6 100644
--- a/savevm.c
+++ b/savevm.c
@@ -436,6 +436,21 @@ 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
+ *
+ * In case of error, last_error is set.
+ */
void qemu_fflush(QEMUFile *f)
{
if (!f->put_buffer)
@@ -480,12 +495,37 @@ static void qemu_fill_buffer(QEMUFile *f)
qemu_file_set_error(f, len);
}
-int qemu_fclose(QEMUFile *f)
+/** Calls close function and set last_error if needed
+ *
+ * Internal function. qemu_fflush() must be called before this.
+ *
+ * Returns f->close() return value, or 0 if close function is not set.
+ */
+static int qemu_close(QEMUFile *f)
{
int ret = 0;
- qemu_fflush(f);
- if (f->close)
+ if (f->close) {
ret = f->close(f->opaque);
+ qemu_file_set_if_error(f, ret);
+ }
+ return ret;
+}
+
+/** Closes the file
+ *
+ * Returns negative error value if any error happened on previous operations or
+ * while closing the file. Returns 0 or positive number on success.
+ *
+ * The meaning of return value on success depends on the specific backend
+ * being used.
+ */
+int qemu_fclose(QEMUFile *f)
+{
+ int ret;
+ qemu_fflush(f);
+ ret = qemu_close(f);
+ if (f->last_error)
+ ret = f->last_error;
g_free(f);
return ret;
}
--
1.7.3.2
- [Qemu-devel] [RFC PATCH 00/11] qemu_fclose() error handling fixes, Eduardo Habkost, 2011/11/01
- [Qemu-devel] [RFC PATCH 04/11] migrate_fd_cleanup: accept any negative qemu_fclose() value as error, Eduardo Habkost, 2011/11/01
- [Qemu-devel] [RFC PATCH 10/11] tcp_close(): check for close() errors too, Eduardo Habkost, 2011/11/01
- [Qemu-devel] [RFC PATCH 02/11] QEMUFileCloseFunc: add return value documentation, Eduardo Habkost, 2011/11/01
- [Qemu-devel] [RFC PATCH 01/11] savevm: use qemu_file_set_error() instead of setting last_error directly, Eduardo Habkost, 2011/11/01
- [Qemu-devel] [RFC PATCH 11/11] unix_close(): check for close() errors too, Eduardo Habkost, 2011/11/01
- [Qemu-devel] [RFC PATCH 07/11] stdio_fclose: return -errno on errors, Eduardo Habkost, 2011/11/01
- [Qemu-devel] [RFC PATCH 03/11] exec_close(): accept any negative value as qemu_fclose() error, Eduardo Habkost, 2011/11/01
- [Qemu-devel] [RFC PATCH 09/11] fd_close(): check for close() errors too, Eduardo Habkost, 2011/11/01
- [Qemu-devel] [RFC PATCH 08/11] exec_close(): return -errno on errors, Eduardo Habkost, 2011/11/01
- [Qemu-devel] [RFC PATCH 05/11] qemu_fclose: return last_error if set,
Eduardo Habkost <=
[Qemu-devel] [RFC PATCH 06/11] stdio_pclose: return -errno on error, Eduardo Habkost, 2011/11/01
Re: [Qemu-devel] [RFC PATCH 00/11] qemu_fclose() error handling fixes, Juan Quintela, 2011/11/02
Re: [Qemu-devel] [RFC PATCH 00/11] qemu_fclose() error handling fixes, Michael Roth, 2011/11/04