From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31659C63697 for ; Thu, 26 Nov 2020 18:05:57 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4D40F207BC for ; Thu, 26 Nov 2020 18:05:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="au14KGdl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4D40F207BC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kiLeU-0008DR-M6 for qemu-devel@archiver.kernel.org; Thu, 26 Nov 2020 13:05:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kiLdI-0007ly-Rr for qemu-devel@nongnu.org; Thu, 26 Nov 2020 13:04:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:51620) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kiLdF-0002LG-SL for qemu-devel@nongnu.org; Thu, 26 Nov 2020 13:04:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606413876; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i8Vhl8Z2LeDd9+R4sBQ1ylEmIYIV4vecO1MYSWxRPuw=; b=au14KGdlHwyJSISMAlGTmMKAIjTbrwhgUmWtSyNYuU8eqvhQqbaJzso5HHP/CJ6OOaxxFz +J4QF+/FK4yx+5GchxvqIldh0o48zXbIsywu87pqohqmuyKn7KqH4oT9K37r2YIiXeqth8 ABGvjzpi+vyl1aHYYkkjbAA50tVeVrk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-103-rZSk3pIfO96fUWWN2a2NSQ-1; Thu, 26 Nov 2020 13:04:33 -0500 X-MC-Unique: rZSk3pIfO96fUWWN2a2NSQ-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 194E0805C08 for ; Thu, 26 Nov 2020 18:04:33 +0000 (UTC) Received: from localhost (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2FD8960855; Thu, 26 Nov 2020 18:04:13 +0000 (UTC) Date: Thu, 26 Nov 2020 19:04:11 +0100 From: Igor Mammedov To: Paolo Bonzini Subject: Re: [PATCH 23/36] migration, vl: start migration via qmp_migrate_incoming Message-ID: <20201126190411.23300d9e@redhat.com> In-Reply-To: <20201123141435.2726558-24-pbonzini@redhat.com> References: <20201123141435.2726558-1-pbonzini@redhat.com> <20201123141435.2726558-24-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=imammedo@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, 23 Nov 2020 09:14:22 -0500 Paolo Bonzini wrote: > Make qemu_start_incoming_migration local to migration/migration.c. > By using the runstate instead of a separate flag, vl need not do > anything to setup deferred incoming migration. > > qmp_migrate_incoming also does not need the deferred_incoming flag > anymore, because "-incoming PROTOCOL" will clear the "once" flag > before the main loop starts. Therefore, later invocations of > the migrate-incoming command will fail with the existing > "The incoming migration has already been started" error message. > > Signed-off-by: Paolo Bonzini Reviewed-by: Igor Mammedov > --- > include/migration/misc.h | 1 - > migration/migration.c | 33 ++++++++------------------------- > softmmu/vl.c | 11 +++++++---- > 3 files changed, 15 insertions(+), 30 deletions(-) > > diff --git a/include/migration/misc.h b/include/migration/misc.h > index 34e7d75713..bccc1b6b44 100644 > --- a/include/migration/misc.h > +++ b/include/migration/misc.h > @@ -58,7 +58,6 @@ void dump_vmstate_json_to_file(FILE *out_fp); > /* migration/migration.c */ > void migration_object_init(void); > void migration_shutdown(void); > -void qemu_start_incoming_migration(const char *uri, Error **errp); > bool migration_is_idle(void); > bool migration_is_active(MigrationState *); > void add_migration_state_change_notifier(Notifier *notify); > diff --git a/migration/migration.c b/migration/migration.c > index d9e94f4080..e0dbde4091 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -118,8 +118,6 @@ > static NotifierList migration_state_notifiers = > NOTIFIER_LIST_INITIALIZER(migration_state_notifiers); > > -static bool deferred_incoming; > - > /* Messages sent on the return path from destination to source */ > enum mig_rp_message_type { > MIG_RP_MSG_INVALID = 0, /* Must be 0 */ > @@ -275,19 +273,6 @@ static bool migrate_late_block_activate(void) > MIGRATION_CAPABILITY_LATE_BLOCK_ACTIVATE]; > } > > -/* > - * Called on -incoming with a defer: uri. > - * The migration can be started later after any parameters have been > - * changed. > - */ > -static void deferred_incoming_migration(Error **errp) > -{ > - if (deferred_incoming) { > - error_setg(errp, "Incoming migration already deferred"); > - } > - deferred_incoming = true; > -} > - > /* > * Send a message on the return channel back to the source > * of the migration. > @@ -429,16 +414,14 @@ void migrate_add_address(SocketAddress *address) > addrs->value = QAPI_CLONE(SocketAddress, address); > } > > -void qemu_start_incoming_migration(const char *uri, Error **errp) > +static void qemu_start_incoming_migration(const char *uri, Error **errp) > { > const char *p = NULL; > > qapi_event_send_migration(MIGRATION_STATUS_SETUP); > - if (!strcmp(uri, "defer")) { > - deferred_incoming_migration(errp); > - } else if (strstart(uri, "tcp:", &p) || > - strstart(uri, "unix:", NULL) || > - strstart(uri, "vsock:", NULL)) { > + if (strstart(uri, "tcp:", &p) || > + strstart(uri, "unix:", NULL) || > + strstart(uri, "vsock:", NULL)) { > socket_start_incoming_migration(p ? p : uri, errp); > #ifdef CONFIG_RDMA > } else if (strstart(uri, "rdma:", &p)) { > @@ -1988,14 +1971,14 @@ void qmp_migrate_incoming(const char *uri, Error **errp) > Error *local_err = NULL; > static bool once = true; > > - if (!deferred_incoming) { > - error_setg(errp, "For use with '-incoming defer'"); > - return; > - } > if (!once) { > error_setg(errp, "The incoming migration has already been started"); > return; > } > + if (!runstate_check(RUN_STATE_INMIGRATE)) { > + error_setg(errp, "'-incoming' was not specified on the command line"); > + return; > + } > > qemu_start_incoming_migration(uri, &local_err); > > diff --git a/softmmu/vl.c b/softmmu/vl.c > index ccc3b8e838..d548c31ba0 100644 > --- a/softmmu/vl.c > +++ b/softmmu/vl.c > @@ -109,6 +109,7 @@ > #include "qapi/qapi-visit-block-core.h" > #include "qapi/qapi-visit-ui.h" > #include "qapi/qapi-commands-block-core.h" > +#include "qapi/qapi-commands-migration.h" > #include "qapi/qapi-commands-run-state.h" > #include "qapi/qapi-commands-ui.h" > #include "qapi/qmp/qerror.h" > @@ -4549,10 +4550,12 @@ void qemu_init(int argc, char **argv, char **envp) > } > if (incoming) { > Error *local_err = NULL; > - qemu_start_incoming_migration(incoming, &local_err); > - if (local_err) { > - error_reportf_err(local_err, "-incoming %s: ", incoming); > - exit(1); > + if (strcmp(incoming, "defer") != 0) { > + qmp_migrate_incoming(incoming, &local_err); > + if (local_err) { > + error_reportf_err(local_err, "-incoming %s: ", incoming); > + exit(1); > + } > } > } else if (autostart) { > vm_start();