[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/14] migration: remove argument to qemu_savevm_sta
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 13/14] migration: remove argument to qemu_savevm_state_cancel |
Date: |
Tue, 15 Jan 2013 12:18:21 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
---
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
- Re: [Qemu-devel] [PATCH 03/14] use XFER_LIMIT_RATIO consistently, (continued)
- [Qemu-devel] [PATCH 04/14] migration: make function static, Juan Quintela, 2013/01/15
- [Qemu-devel] [PATCH 05/14] migration: remove double call to migrate_fd_close, Juan Quintela, 2013/01/15
- [Qemu-devel] [PATCH 07/14] qemu-file: Only set last_error if it is not already set, Juan Quintela, 2013/01/15
- [Qemu-devel] [PATCH 06/14] migration: fix off-by-one in buffered_rate_limit, Juan Quintela, 2013/01/15
- [Qemu-devel] [PATCH 09/14] migration: Add buffered_flush error handling, Juan Quintela, 2013/01/15
- [Qemu-devel] [PATCH 08/14] migration: move begining stage to the migration thread, Juan Quintela, 2013/01/15
- [Qemu-devel] [PATCH 10/14] migration: move exit condition to migration thread, Juan Quintela, 2013/01/15
- [Qemu-devel] [PATCH 12/14] migration: Only go to the iterate stage if there is anything to send, Juan Quintela, 2013/01/15
- [Qemu-devel] [PATCH 13/14] migration: remove argument to qemu_savevm_state_cancel,
Juan Quintela <=
- [Qemu-devel] [PATCH 11/14] migration: unfold rest of migrate_fd_put_ready() into thread, Juan Quintela, 2013/01/15
- [Qemu-devel] [PATCH 14/14] Rename buffered_ to migration_, Juan Quintela, 2013/01/15
- Re: [Qemu-devel] [PATCH 00/14] migration queue, Eric Blake, 2013/01/15
- Re: [Qemu-devel] [PATCH 00/14] migration queue, Anthony Liguori, 2013/01/16