summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2011-11-10 10:41:42 -0200
committerAnthony Liguori <aliguori@us.ibm.com>2011-12-12 11:47:19 -0600
commita6d34a949c3546404d403bda61a5e37431b4a6ad (patch)
tree50da277062d43fc77d6815b0f402b369a93bbc70
parentce812673dc11de6c067e87a13f5ac0341df7772d (diff)
downloadqemu-a6d34a949c3546404d403bda61a5e37431b4a6ad.tar.gz
migrate_fd_cleanup: accept any negative qemu_fclose() value as error
Also, we now return the qemu_fclose() value unchanged to the caller. For reference, the migrate_fd_cleanup() callers are the following: - migrate_fd_completed(): any negative value is considered an error, so the change is OK. - migrate_fd_error(): doesn't check the migrate_fd_cleanup() return value - migrate_fd_cancel(): doesn't check the migrate_fd_cleanup() return value Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--migration.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/migration.c b/migration.c
index 75d4f02373..412fdfe5bf 100644
--- a/migration.c
+++ b/migration.c
@@ -174,9 +174,7 @@ static int migrate_fd_cleanup(MigrationState *s)
if (s->file) {
DPRINTF("closing file\n");
- if (qemu_fclose(s->file) != 0) {
- ret = -1;
- }
+ ret = qemu_fclose(s->file);
s->file = NULL;
} else {
if (s->mon) {