[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/5] migration: extend section_start/end traces
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 4/5] migration: extend section_start/end traces |
Date: |
Sat, 8 Mar 2014 02:23:36 +0100 |
From: Alexey Kardashevskiy <address@hidden>
This adds @idstr to savevm_section_start and savevm_section_end
tracepoints.
Signed-off-by: Alexey Kardashevskiy <address@hidden>
Signed-off-by: Amit Shah <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
savevm.c | 12 ++++++------
trace-events | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/savevm.c b/savevm.c
index 7329fc5..d094fbb 100644
--- a/savevm.c
+++ b/savevm.c
@@ -527,13 +527,13 @@ int qemu_savevm_state_iterate(QEMUFile *f)
if (qemu_file_rate_limit(f)) {
return 0;
}
- trace_savevm_section_start();
+ trace_savevm_section_start(se->idstr, se->section_id);
/* Section type */
qemu_put_byte(f, QEMU_VM_SECTION_PART);
qemu_put_be32(f, se->section_id);
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) {
qemu_file_set_error(f, ret);
@@ -565,13 +565,13 @@ void qemu_savevm_state_complete(QEMUFile *f)
continue;
}
}
- trace_savevm_section_start();
+ trace_savevm_section_start(se->idstr, se->section_id);
/* Section type */
qemu_put_byte(f, QEMU_VM_SECTION_END);
qemu_put_be32(f, se->section_id);
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) {
qemu_file_set_error(f, ret);
return;
@@ -584,7 +584,7 @@ void qemu_savevm_state_complete(QEMUFile *f)
if ((!se->ops || !se->ops->save_state) && !se->vmsd) {
continue;
}
- trace_savevm_section_start();
+ trace_savevm_section_start(se->idstr, se->section_id);
/* Section type */
qemu_put_byte(f, QEMU_VM_SECTION_FULL);
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);
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);
diff --git a/trace-events b/trace-events
index 466c27e..002c260 100644
--- a/trace-events
+++ b/trace-events
@@ -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"
# savevm.c
-savevm_section_start(void) ""
-savevm_section_end(unsigned int section_id) "section_id %u"
+savevm_section_start(const char *id, unsigned int section_id) "%s, section_id
%u"
+savevm_section_end(const char *id, unsigned int section_id) "%s, section_id %u"
# arch_init.c
migration_bitmap_sync_start(void) ""
--
1.8.5.3
- [Qemu-devel] [PULL 0/5] migration queue, Juan Quintela, 2014/03/07
- [Qemu-devel] [PATCH 2/5] qemu_file: Fix mismerge of "use fwrite() correctly", Juan Quintela, 2014/03/07
- [Qemu-devel] [PATCH 3/5] vl: add system_wakeup_request tracepoint, Juan Quintela, 2014/03/07
- [Qemu-devel] [PATCH 1/5] XBZRLE: Fix qemu crash when resize the xbzrle cache, Juan Quintela, 2014/03/07
- [Qemu-devel] [PATCH 5/5] migration: add more traces, Juan Quintela, 2014/03/07
- [Qemu-devel] [PATCH 4/5] migration: extend section_start/end traces,
Juan Quintela <=
- Re: [Qemu-devel] [PULL 0/5] migration queue, Peter Maydell, 2014/03/08