OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

migration: extend section_start/end traces 

This adds @idstr to savevm_section_start and savevm_section_end
tracepoints.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Alexey Kardashevskiy 2014-03-07 01:33:37 +05:30 committed by Juan Quintela
parent 4fed9421e9
commit 464400f6a5
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
savevm.c
View File

@ -527,13 +527,13 @@ int qemu_savevm_state_iterate(QEMUFile *f)
if (qemu_file_rate_limit(f)) { if (qemu_file_rate_limit(f)) {
return 0; return 0;
} }
trace_savevm_section_start(); trace_savevm_section_start(se->idstr, se->section_id);
/* Section type */ /* Section type */
qemu_put_byte(f, QEMU_VM_SECTION_PART); qemu_put_byte(f, QEMU_VM_SECTION_PART);
qemu_put_be32(f, se->section_id); qemu_put_be32(f, se->section_id);
ret = se->ops->save_live_iterate(f, se->opaque); ret = se->ops->save_live_iterate(f, se->opaque);
trace_savevm_section_end(se->section_id); trace_savevm_section_end(se->idstr, se->section_id);
if (ret < 0) { if (ret < 0) {
qemu_file_set_error(f, ret); qemu_file_set_error(f, ret);
@ -565,13 +565,13 @@ void qemu_savevm_state_complete(QEMUFile *f)
continue; continue;
} }
} }
trace_savevm_section_start(); trace_savevm_section_start(se->idstr, se->section_id);
/* Section type */ /* Section type */
qemu_put_byte(f, QEMU_VM_SECTION_END); qemu_put_byte(f, QEMU_VM_SECTION_END);
qemu_put_be32(f, se->section_id); qemu_put_be32(f, se->section_id);
ret = se->ops->save_live_complete(f, se->opaque); ret = se->ops->save_live_complete(f, se->opaque);
trace_savevm_section_end(se->section_id); trace_savevm_section_end(se->idstr, se->section_id);
if (ret < 0) { if (ret < 0) {
qemu_file_set_error(f, ret); qemu_file_set_error(f, ret);
return; return;
@ -584,7 +584,7 @@ void qemu_savevm_state_complete(QEMUFile *f)
if ((!se->ops || !se->ops->save_state) && !se->vmsd) { if ((!se->ops || !se->ops->save_state) && !se->vmsd) {
continue; continue;
} }
trace_savevm_section_start(); trace_savevm_section_start(se->idstr, se->section_id);
/* Section type */ /* Section type */
qemu_put_byte(f, QEMU_VM_SECTION_FULL); qemu_put_byte(f, QEMU_VM_SECTION_FULL);
qemu_put_be32(f, se->section_id); qemu_put_be32(f, se->section_id);
@ -598,7 +598,7 @@ void qemu_savevm_state_complete(QEMUFile *f)
qemu_put_be32(f, se->version_id); qemu_put_be32(f, se->version_id);
vmstate_save(f, se); vmstate_save(f, se);
trace_savevm_section_end(se->section_id); trace_savevm_section_end(se->idstr, se->section_id);
} }
qemu_put_byte(f, QEMU_VM_EOF); qemu_put_byte(f, QEMU_VM_EOF);

4
trace-events
View File

@ -1040,8 +1040,8 @@ vmware_scratch_write(uint32_t index, uint32_t value) "index %d, value 0x%x"
vmware_setmode(uint32_t w, uint32_t h, uint32_t bpp) "%dx%d @ %d bpp" vmware_setmode(uint32_t w, uint32_t h, uint32_t bpp) "%dx%d @ %d bpp"
# savevm.c # savevm.c
savevm_section_start(void) "" savevm_section_start(const char *id, unsigned int section_id) "%s, section_id %u"
savevm_section_end(unsigned int section_id) "section_id %u" savevm_section_end(const char *id, unsigned int section_id) "%s, section_id %u"
# arch_init.c # arch_init.c
migration_bitmap_sync_start(void) "" migration_bitmap_sync_start(void) ""