[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/12] rename is_active to is_block_active
From: |
Lei Li |
Subject: |
[Qemu-devel] [PATCH 03/12] rename is_active to is_block_active |
Date: |
Fri, 26 Jul 2013 04:18:10 +0800 |
Signed-off-by: Lei Li <address@hidden>
---
block-migration.c | 2 +-
include/migration/vmstate.h | 2 +-
savevm.c | 16 ++++++++--------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/block-migration.c b/block-migration.c
index 2fd7699..171b8b8 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -814,7 +814,7 @@ SaveVMHandlers savevm_block_handlers = {
.save_live_pending = block_save_pending,
.load_state = block_load,
.cancel = block_migration_cancel,
- .is_active = block_is_active,
+ .is_block_active = block_is_active,
};
void blk_mig_init(void)
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index ebc4d09..acf847b 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -40,7 +40,7 @@ typedef struct SaveVMHandlers {
int (*save_live_complete)(QEMUFile *f, void *opaque);
/* This runs both outside and inside the iothread lock. */
- bool (*is_active)(void *opaque);
+ bool (*is_block_active)(void *opaque);
/* This runs outside the iothread lock in the migration case, and
* within the lock in the savevm case. The callback had better only
diff --git a/savevm.c b/savevm.c
index 1695102..e18ca22 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1817,8 +1817,8 @@ void qemu_savevm_state_begin(QEMUFile *f,
if (!se->ops || !se->ops->save_live_setup) {
continue;
}
- if (se->ops && se->ops->is_active) {
- if (!se->ops->is_active(se->opaque)) {
+ if (se->ops && se->ops->is_block_active) {
+ if (!se->ops->is_block_active(se->opaque)) {
continue;
}
}
@@ -1857,8 +1857,8 @@ int qemu_savevm_state_iterate(QEMUFile *f)
if (!se->ops || !se->ops->save_live_iterate) {
continue;
}
- if (se->ops && se->ops->is_active) {
- if (!se->ops->is_active(se->opaque)) {
+ if (se->ops && se->ops->is_block_active) {
+ if (!se->ops->is_block_active(se->opaque)) {
continue;
}
}
@@ -1898,8 +1898,8 @@ void qemu_savevm_state_complete(QEMUFile *f)
if (!se->ops || !se->ops->save_live_complete) {
continue;
}
- if (se->ops && se->ops->is_active) {
- if (!se->ops->is_active(se->opaque)) {
+ if (se->ops && se->ops->is_block_active) {
+ if (!se->ops->is_block_active(se->opaque)) {
continue;
}
}
@@ -1952,8 +1952,8 @@ uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t
max_size)
if (!se->ops || !se->ops->save_live_pending) {
continue;
}
- if (se->ops && se->ops->is_active) {
- if (!se->ops->is_active(se->opaque)) {
+ if (se->ops && se->ops->is_block_active) {
+ if (!se->ops->is_block_active(se->opaque)) {
continue;
}
}
--
1.7.7.6
- [Qemu-devel] [PATCH 0/12 RFC v2] Localhost migration, Lei Li, 2013/07/25
- [Qemu-devel] [PATCH 04/12] arch_init: introduce ram_page_save(), Lei Li, 2013/07/25
- [Qemu-devel] [PATCH 03/12] rename is_active to is_block_active,
Lei Li <=
- [Qemu-devel] [PATCH 02/12] savevm: export qemu_save_device_state(), Lei Li, 2013/07/25
- [Qemu-devel] [PATCH 05/12] arch_init: introduce ram_save_local(), Lei Li, 2013/07/25
- [Qemu-devel] [PATCH 06/12] arch_init: add save_local_setup to savevm_ram_handlers, Lei Li, 2013/07/25
- [Qemu-devel] [PATCH 07/12] savevm: introduce qemu_savevm_local(), Lei Li, 2013/07/25
- [Qemu-devel] [PATCH 08/12] savevm: adjust is_ram check in register_savevm_live(), Lei Li, 2013/07/25
- [Qemu-devel] [PATCH 01/12] migration: export MIG_STATE_xxx flags, Lei Li, 2013/07/25
- [Qemu-devel] [PATCH 12/12] hmp: add hmp_localhost_migration interface, Lei Li, 2013/07/25
- [Qemu-devel] [PATCH 10/12] migration-local: implementation of incoming part, Lei Li, 2013/07/25
- [Qemu-devel] [PATCH 09/12] migration-local: implementation of outgoing part, Lei Li, 2013/07/25
- [Qemu-devel] [PATCH 11/12] migration-local: add option to commandline for incoming-local, Lei Li, 2013/07/25