From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35613) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dpbRP-0006zI-JH for qemu-devel@nongnu.org; Wed, 06 Sep 2017 10:36:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dpbRK-0000sV-Pw for qemu-devel@nongnu.org; Wed, 06 Sep 2017 10:36:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41504) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dpbRK-0000rU-K2 for qemu-devel@nongnu.org; Wed, 06 Sep 2017 10:36:26 -0400 Date: Wed, 6 Sep 2017 15:36:19 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20170906143618.GE2215@work-vm> References: <1504081950-2528-1-git-send-email-peterx@redhat.com> <1504081950-2528-5-git-send-email-peterx@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1504081950-2528-5-git-send-email-peterx@redhat.com> Subject: Re: [Qemu-devel] [RFC v2 04/33] migration: dump str in migrate_set_state trace List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Xu Cc: qemu-devel@nongnu.org, Laurent Vivier , "Daniel P . Berrange" , Alexey Perevalov , Juan Quintela , Andrea Arcangeli * Peter Xu (peterx@redhat.com) wrote: > Strings are more readable for debugging. > > Reviewed-by: Dr. David Alan Gilbert > Signed-off-by: Peter Xu I've queued this individual patch; it's standalone and useful as is. Dave > --- > migration/migration.c | 3 ++- > migration/trace-events | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index eb7d767..c818412 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -914,8 +914,9 @@ void qmp_migrate_start_postcopy(Error **errp) > > void migrate_set_state(int *state, int old_state, int new_state) > { > + assert(new_state < MIGRATION_STATUS__MAX); > if (atomic_cmpxchg(state, old_state, new_state) == old_state) { > - trace_migrate_set_state(new_state); > + trace_migrate_set_state(MigrationStatus_lookup[new_state]); > migrate_generate_event(new_state); > } > } > diff --git a/migration/trace-events b/migration/trace-events > index 7a3b514..d2910a6 100644 > --- a/migration/trace-events > +++ b/migration/trace-events > @@ -80,7 +80,7 @@ ram_save_queue_pages(const char *rbname, size_t start, size_t len) "%s: start: 0 > # migration/migration.c > await_return_path_close_on_source_close(void) "" > await_return_path_close_on_source_joining(void) "" > -migrate_set_state(int new_state) "new state %d" > +migrate_set_state(const char *new_state) "new state %s" > migrate_fd_cleanup(void) "" > migrate_fd_error(const char *error_desc) "error=%s" > migrate_fd_cancel(void) "" > -- > 2.7.4 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK