[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [for 2.9] migration/tracing: Add tracing on save
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [for 2.9] migration/tracing: Add tracing on save |
Date: |
Mon, 12 Dec 2016 12:58:38 +0000 |
From: "Dr. David Alan Gilbert" <address@hidden>
Add some tracing to vmstate_subsection_save and vmstate_save_state
to help in debugging when you're not sure if a conditional piece
of data is being saved.
In vmstate_subsection_save I renamed the inner vmsd to avoid the aliasing
and be able to print both names.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/trace-events | 4 ++++
migration/vmstate.c | 15 ++++++++++-----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/migration/trace-events b/migration/trace-events
index 6dded4f..83ef913 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -40,6 +40,10 @@ savevm_state_iterate(void) ""
savevm_state_cleanup(void) ""
savevm_state_complete_precopy(void) ""
vmstate_save(const char *idstr, const char *vmsd_name) "%s, %s"
+vmstate_save_state_loop(const char *name, const char *field, int n_elems)
"%s/%s[%d]"
+vmstate_save_state_top(const char *idstr) "%s"
+vmstate_subsection_save_loop(const char *name, const char *sub) "%s/%s"
+vmstate_subsection_save_top(const char *idstr) "%s"
vmstate_load(const char *idstr, const char *vmsd_name) "%s, %s"
qemu_announce_self_iter(const char *mac) "%s"
diff --git a/migration/vmstate.c b/migration/vmstate.c
index 0bc9f35..42b9069 100644
--- a/migration/vmstate.c
+++ b/migration/vmstate.c
@@ -299,6 +299,8 @@ void vmstate_save_state(QEMUFile *f, const
VMStateDescription *vmsd,
{
VMStateField *field = vmsd->fields;
+ trace_vmstate_save_state_top(vmsd->name);
+
if (vmsd->pre_save) {
vmsd->pre_save(opaque);
}
@@ -318,6 +320,7 @@ void vmstate_save_state(QEMUFile *f, const
VMStateDescription *vmsd,
int64_t old_offset, written_bytes;
QJSON *vmdesc_loop = vmdesc;
+ trace_vmstate_save_state_loop(vmsd->name, field->name, n_elems);
for (i = 0; i < n_elems; i++) {
void *addr = base_addr + size * i;
@@ -427,11 +430,13 @@ static void vmstate_subsection_save(QEMUFile *f, const
VMStateDescription *vmsd,
const VMStateDescription **sub = vmsd->subsections;
bool subsection_found = false;
+ trace_vmstate_subsection_save_top(vmsd->name);
while (sub && *sub && (*sub)->needed) {
if ((*sub)->needed(opaque)) {
- const VMStateDescription *vmsd = *sub;
+ const VMStateDescription *vmsdsub = *sub;
uint8_t len;
+ trace_vmstate_subsection_save_loop(vmsd->name, vmsdsub->name);
if (vmdesc) {
/* Only create subsection array when we have any */
if (!subsection_found) {
@@ -443,11 +448,11 @@ static void vmstate_subsection_save(QEMUFile *f, const
VMStateDescription *vmsd,
}
qemu_put_byte(f, QEMU_VM_SUBSECTION);
- len = strlen(vmsd->name);
+ len = strlen(vmsdsub->name);
qemu_put_byte(f, len);
- qemu_put_buffer(f, (uint8_t *)vmsd->name, len);
- qemu_put_be32(f, vmsd->version_id);
- vmstate_save_state(f, vmsd, opaque, vmdesc);
+ qemu_put_buffer(f, (uint8_t *)vmsdsub->name, len);
+ qemu_put_be32(f, vmsdsub->version_id);
+ vmstate_save_state(f, vmsdsub, opaque, vmdesc);
if (vmdesc) {
json_end_object(vmdesc);
--
2.9.3
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [for 2.9] migration/tracing: Add tracing on save,
Dr. David Alan Gilbert (git) <=