[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 24/38] migration: Perform vmsd structure check during tests
From: |
Juan Quintela |
Subject: |
[PULL 24/38] migration: Perform vmsd structure check during tests |
Date: |
Thu, 27 Jan 2022 16:05:34 +0100 |
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
Perform a check on vmsd structures during test runs in the hope
of catching any missing terminators and other simple screwups.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/savevm.c | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/migration/savevm.c b/migration/savevm.c
index b17e624d3f..302babc8cf 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -66,6 +66,7 @@
#include "net/announce.h"
#include "qemu/yank.h"
#include "yank_functions.h"
+#include "sysemu/qtest.h"
const unsigned int postcopy_ram_discard_version;
@@ -839,6 +840,39 @@ void unregister_savevm(VMStateIf *obj, const char *idstr,
void *opaque)
}
}
+/*
+ * Perform some basic checks on vmsd's at registration
+ * time.
+ */
+static void vmstate_check(const VMStateDescription *vmsd)
+{
+ const VMStateField *field = vmsd->fields;
+ const VMStateDescription **subsection = vmsd->subsections;
+
+ if (field) {
+ while (field->name) {
+ if (field->flags & (VMS_STRUCT | VMS_VSTRUCT)) {
+ /* Recurse to sub structures */
+ vmstate_check(field->vmsd);
+ }
+ /* Carry on */
+ field++;
+ }
+ /* Check for the end of field list canary */
+ assert(field->flags == VMS_END);
+ }
+
+ while (subsection && *subsection) {
+ /*
+ * The name of a subsection should start with the name of the
+ * current object.
+ */
+ assert(!strncmp(vmsd->name, (*subsection)->name, strlen(vmsd->name)));
+ vmstate_check(*subsection);
+ subsection++;
+ }
+}
+
int vmstate_register_with_alias_id(VMStateIf *obj, uint32_t instance_id,
const VMStateDescription *vmsd,
void *opaque, int alias_id,
@@ -884,6 +918,11 @@ int vmstate_register_with_alias_id(VMStateIf *obj,
uint32_t instance_id,
} else {
se->instance_id = instance_id;
}
+
+ /* Perform a recursive sanity check during the test runs */
+ if (qtest_enabled()) {
+ vmstate_check(vmsd);
+ }
assert(!se->compat || se->instance_id == 0);
savevm_state_handler_insert(se);
return 0;
--
2.34.1
- [PULL 15/38] multifd: Use normal pages array on the recv side, (continued)
- [PULL 15/38] multifd: Use normal pages array on the recv side, Juan Quintela, 2022/01/27
- [PULL 17/38] multifd: Rename pages_used to normal_pages, Juan Quintela, 2022/01/27
- [PULL 18/38] Remove unnecessary minimum_version_id_old fields, Juan Quintela, 2022/01/27
- [PULL 19/38] migration/migration.c: Add missed default error handler for migration state, Juan Quintela, 2022/01/27
- [PULL 20/38] migration/migration.c: Avoid COLO boot in postcopy migration, Juan Quintela, 2022/01/27
- [PULL 21/38] migration/migration.c: Remove the MIGRATION_STATUS_ACTIVE when migration finished, Juan Quintela, 2022/01/27
- [PULL 22/38] migration: Report the error returned when save_live_iterate fails, Juan Quintela, 2022/01/27
- [PULL 23/38] migration: Add canary to VMSTATE_END_OF_LIST, Juan Quintela, 2022/01/27
- [PULL 25/38] migration/ram: clean up unused comment., Juan Quintela, 2022/01/27
- [PULL 26/38] migration: Drop dead code of ram_debug_dump_bitmap(), Juan Quintela, 2022/01/27
- [PULL 24/38] migration: Perform vmsd structure check during tests,
Juan Quintela <=
- [PULL 28/38] migration: Drop postcopy_chunk_hostpages(), Juan Quintela, 2022/01/27
- [PULL 27/38] migration: Don't return for postcopy_chunk_hostpages(), Juan Quintela, 2022/01/27
- [PULL 29/38] migration: Do chunk page in postcopy_each_ram_send_discard(), Juan Quintela, 2022/01/27
- [PULL 30/38] migration: Drop return code for disgard ram process, Juan Quintela, 2022/01/27
- [PULL 31/38] migration: Don't return for postcopy_send_discard_bm_ram(), Juan Quintela, 2022/01/27
- [PULL 32/38] migration: Introduce ram_transferred_add(), Juan Quintela, 2022/01/27
- [PULL 33/38] migration: Tally pre-copy, downtime and post-copy bytes independently, Juan Quintela, 2022/01/27
- [PULL 34/38] migration: No off-by-one for pss->page update in host page size, Juan Quintela, 2022/01/27
- [PULL 35/38] migration: Enable UFFD_FEATURE_THREAD_ID even without blocktime feat, Juan Quintela, 2022/01/27
- [PULL 36/38] migration: Add postcopy_has_request(), Juan Quintela, 2022/01/27