From afe419319de1e5e98b131368ba14f85f98ab3a76 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Mon, 14 Jan 2013 13:36:28 +0100 Subject: qemu-file: Only set last_error if it is not already set Signed-off-by: Juan Quintela Reviewed-by: Reviewed-by: Eric Blake Reviewed-by: Paolo Bonzini --- savevm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'savevm.c') diff --git a/savevm.c b/savevm.c index 4e970ca0db..611e997d42 100644 --- a/savevm.c +++ b/savevm.c @@ -419,7 +419,9 @@ int qemu_file_get_error(QEMUFile *f) static void qemu_file_set_error(QEMUFile *f, int ret) { - f->last_error = ret; + if (f->last_error == 0) { + f->last_error = ret; + } } /** Flushes QEMUFile buffer -- cgit v1.2.1 From 6522773f88a2e37800f0bf7dc3632a14649f53c6 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Mon, 14 Jan 2013 14:14:42 +0100 Subject: migration: remove argument to qemu_savevm_state_cancel Signed-off-by: Juan Quintela Reviewed-by: Reviewed-by: Eric Blake Reviewed-by: Paolo Bonzini --- savevm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'savevm.c') diff --git a/savevm.c b/savevm.c index 611e997d42..913a6235ab 100644 --- a/savevm.c +++ b/savevm.c @@ -1590,13 +1590,13 @@ int qemu_savevm_state_begin(QEMUFile *f, ret = se->ops->save_live_setup(f, se->opaque); if (ret < 0) { - qemu_savevm_state_cancel(f); + qemu_savevm_state_cancel(); return ret; } } ret = qemu_file_get_error(f); if (ret != 0) { - qemu_savevm_state_cancel(f); + qemu_savevm_state_cancel(); } return ret; @@ -1647,7 +1647,7 @@ int qemu_savevm_state_iterate(QEMUFile *f) } ret = qemu_file_get_error(f); if (ret != 0) { - qemu_savevm_state_cancel(f); + qemu_savevm_state_cancel(); } return ret; } @@ -1727,7 +1727,7 @@ uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size) return ret; } -void qemu_savevm_state_cancel(QEMUFile *f) +void qemu_savevm_state_cancel(void) { SaveStateEntry *se; -- cgit v1.2.1