[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/42] migration: add migrate_set_state tracepoint
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 13/42] migration: add migrate_set_state tracepoint |
Date: |
Fri, 22 Feb 2013 17:36:19 +0100 |
From: Kazuya Saito <address@hidden>
Signed-off-by: Kazuya Saito <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
migration.c | 9 ++++++++-
trace-events | 3 +++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/migration.c b/migration.c
index 9a234c7..b091532 100644
--- a/migration.c
+++ b/migration.c
@@ -23,6 +23,7 @@
#include "migration/block.h"
#include "qemu/thread.h"
#include "qmp-commands.h"
+#include "trace.h"
//#define DEBUG_MIGRATION
@@ -282,6 +283,7 @@ void migrate_fd_error(MigrationState *s)
{
DPRINTF("setting error state\n");
s->state = MIG_STATE_ERROR;
+ trace_migrate_set_state(MIG_STATE_ERROR);
migrate_fd_cleanup(s);
}
@@ -289,6 +291,7 @@ static void migrate_fd_completed(MigrationState *s)
{
DPRINTF("setting completed state\n");
s->state = MIG_STATE_COMPLETED;
+ trace_migrate_set_state(MIG_STATE_COMPLETED);
migrate_fd_cleanup(s);
}
@@ -319,6 +322,7 @@ static void migrate_fd_cancel(MigrationState *s)
DPRINTF("cancelling migration\n");
s->state = MIG_STATE_CANCELLED;
+ trace_migrate_set_state(MIG_STATE_CANCELLED);
migrate_fd_cleanup(s);
}
@@ -377,8 +381,9 @@ static MigrationState *migrate_init(const MigrationParams
*params)
s->bandwidth_limit = bandwidth_limit;
s->state = MIG_STATE_SETUP;
- s->total_time = qemu_get_clock_ms(rt_clock);
+ trace_migrate_set_state(MIG_STATE_SETUP);
+ s->total_time = qemu_get_clock_ms(rt_clock);
return s;
}
@@ -738,6 +743,8 @@ static const QEMUFileOps buffered_file_ops = {
void migrate_fd_connect(MigrationState *s)
{
s->state = MIG_STATE_ACTIVE;
+ trace_migrate_set_state(MIG_STATE_ACTIVE);
+
s->bytes_xfer = 0;
s->buffer = NULL;
s->buffer_size = 0;
diff --git a/trace-events b/trace-events
index a27ae43..2999c0e 100644
--- a/trace-events
+++ b/trace-events
@@ -1090,3 +1090,6 @@ css_io_interrupt(int cssid, int ssid, int schid, uint32_t
intparm, uint8_t isc,
# hw/s390x/virtio-ccw.c
virtio_ccw_interpret_ccw(int cssid, int ssid, int schid, int cmd_code)
"VIRTIO-CCW: %x.%x.%04x: interpret command %x"
virtio_ccw_new_device(int cssid, int ssid, int schid, int devno, const char
*devno_mode) "VIRTIO-CCW: add subchannel %x.%x.%04x, devno %04x (%s)"
+
+# migration.c
+migrate_set_state(int new_state) "new state %d"
--
1.8.1.2
- [Qemu-devel] [PATCH 01/42] migration: simplify while loop, (continued)
- [Qemu-devel] [PATCH 01/42] migration: simplify while loop, Paolo Bonzini, 2013/02/22
- [Qemu-devel] [PATCH 04/42] migration: push qemu_savevm_state_cancel out of qemu_savevm_state_*, Paolo Bonzini, 2013/02/22
- [Qemu-devel] [PATCH 05/42] block-migration: remove useless calls to blk_mig_cleanup, Paolo Bonzini, 2013/02/22
- [Qemu-devel] [PATCH 02/42] migration: always use vm_stop_force_state, Paolo Bonzini, 2013/02/22
- [Qemu-devel] [PATCH 06/42] qemu-file: pass errno from qemu_fflush via f->last_error, Paolo Bonzini, 2013/02/22
- [Qemu-devel] [PATCH 08/42] qemu-file: temporarily expose qemu_file_set_error and qemu_fflush, Paolo Bonzini, 2013/02/22
- [Qemu-devel] [PATCH 03/42] migration: move more error handling to migrate_fd_cleanup, Paolo Bonzini, 2013/02/22
- [Qemu-devel] [PATCH 11/42] migration: simplify error handling, Paolo Bonzini, 2013/02/22
- [Qemu-devel] [PATCH 09/42] migration: flush all data to fd when buffered_flush is called, Paolo Bonzini, 2013/02/22
- [Qemu-devel] [PATCH 16/42] block-migration: remove variables that are never read, Paolo Bonzini, 2013/02/22
- [Qemu-devel] [PATCH 13/42] migration: add migrate_set_state tracepoint,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 12/42] migration: do not nest flushing of device data, Paolo Bonzini, 2013/02/22
- [Qemu-devel] [PATCH 14/42] migration: prepare to access s->state outside critical sections, Paolo Bonzini, 2013/02/22
- [Qemu-devel] [PATCH 18/42] block-migration: document usage of state across threads, Paolo Bonzini, 2013/02/22
- [Qemu-devel] [PATCH 20/42] migration: reorder SaveVMHandlers members, Paolo Bonzini, 2013/02/22
- [Qemu-devel] [PATCH 22/42] migration: run setup callbacks out of big lock, Paolo Bonzini, 2013/02/22
- [Qemu-devel] [PATCH 21/42] migration: run pending/iterate callbacks out of big lock, Paolo Bonzini, 2013/02/22
- [Qemu-devel] [PATCH 24/42] Rename buffered_ to migration_, Paolo Bonzini, 2013/02/22
- [Qemu-devel] [PATCH 23/42] migration: yay, buffering is gone, Paolo Bonzini, 2013/02/22
- [Qemu-devel] [PATCH 25/42] qemu-file: make qemu_fflush and qemu_file_set_error private again, Paolo Bonzini, 2013/02/22