{"id":807490,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807490/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<1504081950-2528-5-git-send-email-peterx@redhat.com>","date":"2017-08-30T08:32:01","name":"[RFC,v2,04/33] migration: dump str in migrate_set_state trace","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"87e2db7ed4b16d4128ed5dac2897a9535b2fd373","submitter":{"id":67717,"url":"http://patchwork.ozlabs.org/api/1.0/people/67717/?format=json","name":"Peter Xu","email":"peterx@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504081950-2528-5-git-send-email-peterx@redhat.com/mbox/","series":[{"id":552,"url":"http://patchwork.ozlabs.org/api/1.0/series/552/?format=json","date":"2017-08-30T08:31:59","name":"Migration: postcopy failure recovery","version":2,"mbox":"http://patchwork.ozlabs.org/series/552/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807490/checks/","tags":{},"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=peterx@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xhzPW346Rz9sRq\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 30 Aug 2017 18:36:31 +1000 (AEST)","from localhost ([::1]:49024 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dmyU9-00015c-4r\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 04:36:29 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:33947)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <peterx@redhat.com>) id 1dmyQn-0006wQ-Oa\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:33:02 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <peterx@redhat.com>) id 1dmyQi-0003Ag-8A\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:33:01 -0400","from mx1.redhat.com ([209.132.183.28]:33948)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <peterx@redhat.com>) id 1dmyQi-0003AN-23\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:32:56 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 13333356ED;\n\tWed, 30 Aug 2017 08:32:55 +0000 (UTC)","from pxdev.xzpeter.org.com (dhcp-14-103.nay.redhat.com\n\t[10.66.14.103])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 30C22871DD;\n\tWed, 30 Aug 2017 08:32:51 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 13333356ED","From":"Peter Xu <peterx@redhat.com>","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 16:32:01 +0800","Message-Id":"<1504081950-2528-5-git-send-email-peterx@redhat.com>","In-Reply-To":"<1504081950-2528-1-git-send-email-peterx@redhat.com>","References":"<1504081950-2528-1-git-send-email-peterx@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tWed, 30 Aug 2017 08:32:55 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [RFC v2 04/33] migration: dump str in\n\tmigrate_set_state trace","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"Laurent Vivier <lvivier@redhat.com>,\n\tAndrea Arcangeli <aarcange@redhat.com>, \n\tJuan Quintela <quintela@redhat.com>,\n\tAlexey Perevalov <a.perevalov@samsung.com>, peterx@redhat.com,\n\t\"Dr . David Alan Gilbert\" <dgilbert@redhat.com>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"Strings are more readable for debugging.\n\nReviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>\nSigned-off-by: Peter Xu <peterx@redhat.com>\n---\n migration/migration.c  | 3 ++-\n migration/trace-events | 2 +-\n 2 files changed, 3 insertions(+), 2 deletions(-)","diff":"diff --git a/migration/migration.c b/migration/migration.c\nindex eb7d767..c818412 100644\n--- a/migration/migration.c\n+++ b/migration/migration.c\n@@ -914,8 +914,9 @@ void qmp_migrate_start_postcopy(Error **errp)\n \n void migrate_set_state(int *state, int old_state, int new_state)\n {\n+    assert(new_state < MIGRATION_STATUS__MAX);\n     if (atomic_cmpxchg(state, old_state, new_state) == old_state) {\n-        trace_migrate_set_state(new_state);\n+        trace_migrate_set_state(MigrationStatus_lookup[new_state]);\n         migrate_generate_event(new_state);\n     }\n }\ndiff --git a/migration/trace-events b/migration/trace-events\nindex 7a3b514..d2910a6 100644\n--- a/migration/trace-events\n+++ b/migration/trace-events\n@@ -80,7 +80,7 @@ ram_save_queue_pages(const char *rbname, size_t start, size_t len) \"%s: start: 0\n # migration/migration.c\n await_return_path_close_on_source_close(void) \"\"\n await_return_path_close_on_source_joining(void) \"\"\n-migrate_set_state(int new_state) \"new state %d\"\n+migrate_set_state(const char *new_state) \"new state %s\"\n migrate_fd_cleanup(void) \"\"\n migrate_fd_error(const char *error_desc) \"error=%s\"\n migrate_fd_cancel(void) \"\"\n","prefixes":["RFC","v2","04/33"]}