mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-28 22:33:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

migration: Trace improvements

Browse Source 
A couple of improvements to tracing that have come out of helping
people with migration problems:
  * vmstate_n_elems trace the count/name - for when you have problems
    getting array counts right
  * vmstate_subsection_load_bad - add the idstr, for when you receive a
    subsection you weren't expecting.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <1465896986-16132-1-git-send-email-dgilbert@redhat.com>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2016-06-14 10:36:26 +01:00 committed by Amit Shah
parent 4d88513157
commit 023ad1a6e9
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
migration/vmstate.c
View File

@ -32,6 +32,7 @@ static int vmstate_n_elems(void *opaque, VMStateField *field)
n_elems *= field->num; n_elems *= field->num;
} }
trace_vmstate_n_elems(field->name, n_elems);
return n_elems; return n_elems;
} }
@ -381,25 +382,25 @@ static int vmstate_subsection_load(QEMUFile *f, const VMStateDescription *vmsd,
len = qemu_peek_byte(f, 1); len = qemu_peek_byte(f, 1);
if (len < strlen(vmsd->name) + 1) { if (len < strlen(vmsd->name) + 1) {
/* subsection name has be be "section_name/a" */ /* subsection name has be be "section_name/a" */
trace_vmstate_subsection_load_bad(vmsd->name, "(short)"); trace_vmstate_subsection_load_bad(vmsd->name, "(short)", "");
return 0; return 0;
} }
size = qemu_peek_buffer(f, (uint8_t **)&idstr_ret, len, 2); size = qemu_peek_buffer(f, (uint8_t **)&idstr_ret, len, 2);
if (size != len) { if (size != len) {
trace_vmstate_subsection_load_bad(vmsd->name, "(peek fail)"); trace_vmstate_subsection_load_bad(vmsd->name, "(peek fail)", "");
return 0; return 0;
} }
memcpy(idstr, idstr_ret, size); memcpy(idstr, idstr_ret, size);
idstr[size] = 0; idstr[size] = 0;
if (strncmp(vmsd->name, idstr, strlen(vmsd->name)) != 0) { if (strncmp(vmsd->name, idstr, strlen(vmsd->name)) != 0) {
trace_vmstate_subsection_load_bad(vmsd->name, idstr); trace_vmstate_subsection_load_bad(vmsd->name, idstr, "(prefix)");
/* it don't have a valid subsection name */ /* it doesn't have a valid subsection name */
return 0; return 0;
} }
sub_vmsd = vmstate_get_subsection(vmsd->subsections, idstr); sub_vmsd = vmstate_get_subsection(vmsd->subsections, idstr);
if (sub_vmsd == NULL) { if (sub_vmsd == NULL) {
trace_vmstate_subsection_load_bad(vmsd->name, "(lookup)"); trace_vmstate_subsection_load_bad(vmsd->name, idstr, "(lookup)");
return -ENOENT; return -ENOENT;
} }
qemu_file_skip(f, 1); /* subsection */ qemu_file_skip(f, 1); /* subsection */
@ -409,7 +410,7 @@ static int vmstate_subsection_load(QEMUFile *f, const VMStateDescription *vmsd,
ret = vmstate_load_state(f, sub_vmsd, opaque, version_id); ret = vmstate_load_state(f, sub_vmsd, opaque, version_id);
if (ret) { if (ret) {
trace_vmstate_subsection_load_bad(vmsd->name, "(child)"); trace_vmstate_subsection_load_bad(vmsd->name, idstr, "(child)");
return ret; return ret;
} }
} }

3
trace-events
View File

@ -1271,8 +1271,9 @@ vmstate_load_field_error(const char *field, int ret) "field \"%s\" load failed,
vmstate_load_state(const char *name, int version_id) "%s v%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_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) "%s:%s"
vmstate_n_elems(const char *name, int n_elems) "%s: %d"
vmstate_subsection_load(const char *parent) "%s" vmstate_subsection_load(const char *parent) "%s"
vmstate_subsection_load_bad(const char *parent, const char *sub) "%s: %s" vmstate_subsection_load_bad(const char *parent, const char *sub, const char *sub2) "%s: %s/%s"
vmstate_subsection_load_good(const char *parent) "%s" vmstate_subsection_load_good(const char *parent) "%s"
# qemu-file.c # qemu-file.c