commit 3f879f2f319379daeb65faa3677191ba4240b45c
author Marc-André Lureau <marcandre.lureau@redhat.com> Thu May 16 12:40:20 2024 +0400
committer Fabiano Rosas <farosas@suse.de> Wed May 22 17:34:40 2024 -0300
tree d84a6254b4493ad934ac6b410e6f1bad0ecff203
parent 3dc27fac2547623d837826bbda5369d7b240c78e

migration: add "exists" info to load-state-field trace

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>
Tested-by: Fiona Ebner <f.ebner@proxmox.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>

migration/trace-events

diff --git a/migration/trace-events b/migration/trace-events
index d0c44c3..0b7c332 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -58,7 +58,7 @@
 vmstate_load_field_error(const char *field, int ret) "field \"%s\" load failed, ret = %d"
 vmstate_load_state(const char *name, int version_id) "%s v%d"
 vmstate_load_state_end(const char *name, const char *reason, int val) "%s %s/%d"
-vmstate_load_state_field(const char *name, const char *field) "%s:%s"
+vmstate_load_state_field(const char *name, const char *field, bool exists) "%s:%s exists=%d"
 vmstate_n_elems(const char *name, int n_elems) "%s: %d"
 vmstate_subsection_load(const char *parent) "%s"
 vmstate_subsection_load_bad(const char *parent,  const char *sub, const char *sub2) "%s: %s/%s"

migration/vmstate.c

diff --git a/migration/vmstate.c b/migration/vmstate.c
index ef26f26..b51212a 100644
--- a/migration/vmstate.c
+++ b/migration/vmstate.c
@@ -128,8 +128,9 @@
         }
     }
     while (field->name) {
-        trace_vmstate_load_state_field(vmsd->name, field->name);
-        if (vmstate_field_exists(vmsd, field, opaque, version_id)) {
+        bool exists = vmstate_field_exists(vmsd, field, opaque, version_id);
+        trace_vmstate_load_state_field(vmsd->name, field->name, exists);
+        if (exists) {
             void *first_elem = opaque + field->offset;
             int i, n_elems = vmstate_n_elems(opaque, field);
             int size = vmstate_size(opaque, field);