[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 02/17] migration: should_skip() implemented
From: |
nikita . lapshin |
Subject: |
[PATCH v3 02/17] migration: should_skip() implemented |
Date: |
Thu, 16 Jun 2022 13:27:56 +0300 |
From: Nikita Lapshin <nikita.lapshin@openvz.org>
For next changes it is convenient to make all decisions about
sections skipping in one function.
Signed-off-by: Nikita Lapshin <nikita.lapshin@openvz.org>
---
migration/savevm.c | 54 ++++++++++++++++++++++++----------------------
1 file changed, 28 insertions(+), 26 deletions(-)
diff --git a/migration/savevm.c b/migration/savevm.c
index 02ed94c180..c68f187ef7 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -943,6 +943,15 @@ static int vmstate_save(QEMUFile *f, SaveStateEntry *se,
return vmstate_save_state(f, se->vmsd, se->opaque, vmdesc);
}
+static bool should_skip(SaveStateEntry *se)
+{
+ if (se->ops && se->ops->is_active && !se->ops->is_active(se->opaque)) {
+ return true;
+ }
+
+ return false;
+}
+
/*
* Write the header for device section (QEMU_VM_SECTION START/END/PART/FULL)
*/
@@ -1207,10 +1216,8 @@ void qemu_savevm_state_setup(QEMUFile *f)
if (!se->ops || !se->ops->save_setup) {
continue;
}
- if (se->ops->is_active) {
- if (!se->ops->is_active(se->opaque)) {
- continue;
- }
+ if (should_skip(se)) {
+ continue;
}
save_section_header(f, se, QEMU_VM_SECTION_START);
@@ -1238,10 +1245,8 @@ int qemu_savevm_state_resume_prepare(MigrationState *s)
if (!se->ops || !se->ops->resume_prepare) {
continue;
}
- if (se->ops->is_active) {
- if (!se->ops->is_active(se->opaque)) {
- continue;
- }
+ if (should_skip(se)) {
+ continue;
}
ret = se->ops->resume_prepare(s, se->opaque);
if (ret < 0) {
@@ -1268,8 +1273,7 @@ int qemu_savevm_state_iterate(QEMUFile *f, bool postcopy)
if (!se->ops || !se->ops->save_live_iterate) {
continue;
}
- if (se->ops->is_active &&
- !se->ops->is_active(se->opaque)) {
+ if (should_skip(se)) {
continue;
}
if (se->ops->is_active_iterate &&
@@ -1337,10 +1341,8 @@ void qemu_savevm_state_complete_postcopy(QEMUFile *f)
if (!se->ops || !se->ops->save_live_complete_postcopy) {
continue;
}
- if (se->ops->is_active) {
- if (!se->ops->is_active(se->opaque)) {
- continue;
- }
+ if (should_skip(se)) {
+ continue;
}
trace_savevm_section_start(se->idstr, se->section_id);
/* Section type */
@@ -1374,10 +1376,8 @@ int qemu_savevm_state_complete_precopy_iterable(QEMUFile
*f, bool in_postcopy)
continue;
}
- if (se->ops->is_active) {
- if (!se->ops->is_active(se->opaque)) {
- continue;
- }
+ if (should_skip(se)) {
+ continue;
}
trace_savevm_section_start(se->idstr, se->section_id);
@@ -1417,6 +1417,9 @@ int
qemu_savevm_state_complete_precopy_non_iterable(QEMUFile *f,
trace_savevm_section_skip(se->idstr, se->section_id);
continue;
}
+ if (should_skip(se)) {
+ continue;
+ }
trace_savevm_section_start(se->idstr, se->section_id);
@@ -1522,10 +1525,8 @@ void qemu_savevm_state_pending(QEMUFile *f, uint64_t
threshold_size,
if (!se->ops || !se->ops->save_live_pending) {
continue;
}
- if (se->ops->is_active) {
- if (!se->ops->is_active(se->opaque)) {
- continue;
- }
+ if (should_skip(se)) {
+ continue;
}
se->ops->save_live_pending(f, se->opaque, threshold_size,
res_precopy_only, res_compatible,
@@ -1635,6 +1636,9 @@ int qemu_save_device_state(QEMUFile *f)
if (se->vmsd && !vmstate_save_needed(se->vmsd, se->opaque)) {
continue;
}
+ if (should_skip(se)) {
+ continue;
+ }
save_section_header(f, se, QEMU_VM_SECTION_FULL);
@@ -2542,10 +2546,8 @@ static int qemu_loadvm_state_setup(QEMUFile *f)
if (!se->ops || !se->ops->load_setup) {
continue;
}
- if (se->ops->is_active) {
- if (!se->ops->is_active(se->opaque)) {
- continue;
- }
+ if (should_skip(se)) {
+ continue;
}
ret = se->ops->load_setup(f, se->opaque);
--
2.31.1
- [PATCH v3 00/17] migration/snapshot: External snapshot utility, nikita . lapshin, 2022/06/16
- [PATCH v3 01/17] migration: Implemented new parameter stream_content, nikita . lapshin, 2022/06/16
- [PATCH v3 02/17] migration: should_skip() implemented,
nikita . lapshin <=
- [PATCH v3 03/17] migration: Add vmstate part of migration stream, nikita . lapshin, 2022/06/16
- [PATCH v3 05/17] migration: Add block part of migration stream, nikita . lapshin, 2022/06/16
- [PATCH v3 06/17] migration: Add RAM part of migration stream, nikita . lapshin, 2022/06/16
- [PATCH v3 07/17] migration: analyze-migration script changed, nikita . lapshin, 2022/06/16
- [PATCH v3 08/17] migration: Test for RAM and vmstate parts, nikita . lapshin, 2022/06/16
- [PATCH v3 11/17] migration/qemu-file: Fix qemu_ftell() for non-writable file, nikita . lapshin, 2022/06/16
- [PATCH v3 13/17] migration/snapshot: Block layer support in qemu-snapshot, nikita . lapshin, 2022/06/16
- [PATCH v3 14/17] migration/snpashot: Implement API for RAMBlock, nikita . lapshin, 2022/06/16