From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58233) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv4XU-00045w-AJ for qemu-devel@nongnu.org; Tue, 15 Jan 2013 06:18:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tv4XS-0001BL-VP for qemu-devel@nongnu.org; Tue, 15 Jan 2013 06:18:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:31720) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv4XS-0001BD-NT for qemu-devel@nongnu.org; Tue, 15 Jan 2013 06:18:42 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r0FBIgGd023771 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 15 Jan 2013 06:18:42 -0500 From: Juan Quintela Date: Tue, 15 Jan 2013 12:18:21 +0100 Message-Id: <1358248702-14278-14-git-send-email-quintela@redhat.com> In-Reply-To: <1358248702-14278-1-git-send-email-quintela@redhat.com> References: <1358248702-14278-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 13/14] migration: remove argument to qemu_savevm_state_cancel List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Juan Quintela --- include/sysemu/sysemu.h | 2 +- migration.c | 2 +- savevm.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index c07d4ee..d65a9f1 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -77,7 +77,7 @@ int qemu_savevm_state_begin(QEMUFile *f, const MigrationParams *params); int qemu_savevm_state_iterate(QEMUFile *f); int qemu_savevm_state_complete(QEMUFile *f); -void qemu_savevm_state_cancel(QEMUFile *f); +void qemu_savevm_state_cancel(void); uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size); int qemu_loadvm_state(QEMUFile *f); diff --git a/migration.c b/migration.c index fe1a103..77c1971 100644 --- a/migration.c +++ b/migration.c @@ -330,7 +330,7 @@ static void migrate_fd_cancel(MigrationState *s) s->state = MIG_STATE_CANCELLED; notifier_list_notify(&migration_state_notifiers, s); - qemu_savevm_state_cancel(s->file); + qemu_savevm_state_cancel(); migrate_fd_cleanup(s); } diff --git a/savevm.c b/savevm.c index 611e997..913a623 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; -- 1.8.1