Skip to content

Commit

Permalink
migration: add migrate_set_state tracepoint
Browse files Browse the repository at this point in the history
Signed-off-by: Kazuya Saito <saito.kazuya@jp.fujitsu.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
  • Loading branch information
Kazuya Saito authored and Juan Quintela committed Mar 11, 2013
1 parent a3fa1d7 commit c09e5bb
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
9 changes: 8 additions & 1 deletion migration.c
Expand Up @@ -23,6 +23,7 @@
#include "migration/block.h"
#include "qemu/thread.h"
#include "qmp-commands.h"
#include "trace.h"

//#define DEBUG_MIGRATION

Expand Down Expand Up @@ -282,13 +283,15 @@ 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);
}

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);
}

Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions trace-events
Expand Up @@ -1091,3 +1091,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"

0 comments on commit c09e5bb

Please sign in to comment.