{"id":807520,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807520/?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-34-git-send-email-peterx@redhat.com>","date":"2017-08-30T08:32:30","name":"[RFC,v2,33/33] migration: init dst in migration_object_init too","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"74b6cf1c422ee4b1f1fd47b8478ebc4fab109cf3","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-34-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/807520/checks/","tags":{},"headers":{"Return-Path":"","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=)","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx04.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 3xhzsj3CKNz9t2Q\n\tfor ;\n\tWed, 30 Aug 2017 18:57:29 +1000 (AEST)","from localhost ([::1]:49127 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmyoR-0003M1-4P\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 04:57:27 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:35542)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmyTd-0001Hu-98\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:35:58 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmyTa-0004pB-Ht\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:35:57 -0400","from mx1.redhat.com ([209.132.183.28]:44028)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dmyTa-0004oK-Be\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:35:54 -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 572AD80473;\n\tWed, 30 Aug 2017 08:35:53 +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 5222C6FB87;\n\tWed, 30 Aug 2017 08:35:50 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 572AD80473","From":"Peter Xu ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 16:32:30 +0800","Message-Id":"<1504081950-2528-34-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.28]);\n\tWed, 30 Aug 2017 08:35:53 +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 33/33] migration: init dst in\n\tmigration_object_init too","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Laurent Vivier ,\n\tAndrea Arcangeli , \n\tJuan Quintela ,\n\tAlexey Perevalov , peterx@redhat.com,\n\t\"Dr . David Alan Gilbert\" ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Though we may not need it, now we init both the src/dst migration\nobjects in migration_object_init() so that even incoming migration\nobject would be thread safe (it was not).\n\nSigned-off-by: Peter Xu \n---\n migration/migration.c | 27 ++++++++++++++-------------\n 1 file changed, 14 insertions(+), 13 deletions(-)","diff":"diff --git a/migration/migration.c b/migration/migration.c\nindex 5812478..7e9ccf0 100644\n--- a/migration/migration.c\n+++ b/migration/migration.c\n@@ -103,6 +103,7 @@ enum mig_rp_message_type {\n dynamic creation of migration */\n \n static MigrationState *current_migration;\n+static MigrationIncomingState *current_incoming;\n \n static bool migration_object_check(MigrationState *ms, Error **errp);\n \n@@ -128,6 +129,17 @@ void migration_object_init(void)\n if (ms->enforce_config_section) {\n current_migration->send_configuration = true;\n }\n+\n+ /*\n+ * Init the migrate incoming object as well no matter whether\n+ * we'll use it or not.\n+ */\n+ current_incoming = g_new0(MigrationIncomingState, 1);\n+ current_incoming->state = MIGRATION_STATUS_NONE;\n+ qemu_mutex_init(¤t_incoming->rp_mutex);\n+ qemu_event_init(¤t_incoming->main_thread_load_event, false);\n+ qemu_sem_init(¤t_incoming->postcopy_pause_sem_dst, 0);\n+ qemu_sem_init(¤t_incoming->postcopy_pause_sem_fault, 0);\n }\n \n /* For outgoing */\n@@ -140,19 +152,8 @@ MigrationState *migrate_get_current(void)\n \n MigrationIncomingState *migration_incoming_get_current(void)\n {\n- static bool once;\n- static MigrationIncomingState mis_current;\n-\n- if (!once) {\n- mis_current.state = MIGRATION_STATUS_NONE;\n- memset(&mis_current, 0, sizeof(MigrationIncomingState));\n- qemu_mutex_init(&mis_current.rp_mutex);\n- qemu_event_init(&mis_current.main_thread_load_event, false);\n- qemu_sem_init(&mis_current.postcopy_pause_sem_dst, 0);\n- qemu_sem_init(&mis_current.postcopy_pause_sem_fault, 0);\n- once = true;\n- }\n- return &mis_current;\n+ assert(current_incoming);\n+ return current_incoming;\n }\n \n void migration_incoming_state_destroy(void)\n","prefixes":["RFC","v2","33/33"]}