From nobody Sun Feb 8 20:59:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1654088172; cv=none; d=zohomail.com; s=zohoarc; b=YCloXt6BFCZAkVnIj1VVX5vlgu8MavqsORlz76TVdx1aDnrF496tPS6mPq1/CfikZlF7D2TpHHNt9iNC68Mmzp3gKejqEB7tgs2gdXlyU+1JNntWBVmLmkirWhbi1tPC2dh3ZE6NFImS+d4ucX4AO27Jq2qoeB0l5+BfCSAcOhQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654088172; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iUZLsQ8RMxKgINmMJ/TqAkDg9CKyzuHGoYQH+++s8Bw=; b=Wf+ho068Tj63Hu3iW3LZp4FpZPGhmiE+VnLZm3Xqk6WBNn6mTJ9fcu8mKuABjtJ9Z5LC9DI5c28Lo70w2xzdflYewQmApjeemPpD+QkntsMhC+zDF5D8B5H8z9RxK7J8SxLiMBFT0u5hSRNqZNy0gsa/I0mNfi2atADEIhRhf+U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1654088172525408.09962354297204; Wed, 1 Jun 2022 05:56:12 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-57-EZW7IZmLOVGCtv4gmgfbqQ-1; Wed, 01 Jun 2022 08:56:02 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 786972809CC2; Wed, 1 Jun 2022 12:55:56 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C6AF1415103; Wed, 1 Jun 2022 12:55:56 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AF47B1947B8F; Wed, 1 Jun 2022 12:55:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 5A93E1947B95 for ; Wed, 1 Jun 2022 12:55:53 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id EAB14112131B; Wed, 1 Jun 2022 12:55:52 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.227]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C9C711121314; Wed, 1 Jun 2022 12:55:52 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id B9712245B90; Wed, 1 Jun 2022 14:50:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654088171; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=iUZLsQ8RMxKgINmMJ/TqAkDg9CKyzuHGoYQH+++s8Bw=; b=Tvdi7TDjJL6nzxJ1GqpRloUkKvHJ1YnH7/RboElxfj2tAH6H+Wbt+JKNJ6Vji7qfy1MgZe uPKvbrCwuaPAx8tYtcNnyqxCihqZw+0Es0yXtiI6QJcZjkBudKyXGZ3VTGtMRheSwWvljW vQtj0Hd4ltbrAqH7Dp1wFc6dqyr1Puc= X-MC-Unique: EZW7IZmLOVGCtv4gmgfbqQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH v2 67/81] qemu: Implement VIR_MIGRATE_POSTCOPY_RESUME for Finish phase Date: Wed, 1 Jun 2022 14:50:07 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Krempa , Pavel Hrdina Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1654088173104100001 Content-Type: text/plain; charset="utf-8" Everything was already done in the normal Finish phase and vCPUs are running. We just need to wait for all remaining data to be transferred. Signed-off-by: Jiri Denemark Reviewed-by: Peter Krempa Reviewed-by: Pavel Hrdina --- Notes: Version 2: - no change src/qemu/qemu_migration.c | 46 ++++++++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index dbebd215b4..a078cbcd41 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -6556,6 +6556,22 @@ qemuMigrationDstFinishFresh(virQEMUDriver *driver, } =20 =20 +static int +qemuMigrationDstFinishResume(virQEMUDriver *driver, + virDomainObj *vm) +{ + VIR_DEBUG("vm=3D%p", vm); + + if (qemuMigrationDstWaitForCompletion(driver, vm, + VIR_ASYNC_JOB_MIGRATION_IN, + false) < 0) { + return -1; + } + + return 0; +} + + static virDomainPtr qemuMigrationDstFinishActive(virQEMUDriver *driver, virConnectPtr dconn, @@ -6603,8 +6619,14 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver, goto error; } =20 - rc =3D qemuMigrationDstFinishFresh(driver, vm, mig, flags, v3proto, - timeReceived, &doKill, &inPostCopy); + if (flags & VIR_MIGRATE_POSTCOPY_RESUME) { + rc =3D qemuMigrationDstFinishResume(driver, vm); + inPostCopy =3D true; + } else { + rc =3D qemuMigrationDstFinishFresh(driver, vm, mig, flags, v3proto, + timeReceived, &doKill, &inPostCop= y); + } + if (rc < 0 || !(dom =3D virGetDomain(dconn, vm->def->name, vm->def->uuid, vm->de= f->id))) goto error; @@ -6675,6 +6697,8 @@ qemuMigrationDstFinish(virQEMUDriver *driver, qemuDomainObjPrivate *priv =3D vm->privateData; unsigned short port; unsigned long long timeReceived =3D 0; + int phase =3D v3proto ? QEMU_MIGRATION_PHASE_FINISH3 + : QEMU_MIGRATION_PHASE_FINISH2; =20 VIR_DEBUG("driver=3D%p, dconn=3D%p, vm=3D%p, cookiein=3D%s, cookieinle= n=3D%d, " "cookieout=3D%p, cookieoutlen=3D%p, flags=3D0x%lx, retcode= =3D%d", @@ -6689,14 +6713,24 @@ qemuMigrationDstFinish(virQEMUDriver *driver, goto cleanup; } =20 + if (flags & VIR_MIGRATE_POSTCOPY_RESUME) { + if (!qemuMigrationAnyCanResume(vm, VIR_ASYNC_JOB_MIGRATION_IN, fla= gs, + QEMU_MIGRATION_PHASE_PREPARE_RESUME= )) + goto cleanup; + phase =3D QEMU_MIGRATION_PHASE_FINISH_RESUME; + } ignore_value(virTimeMillisNow(&timeReceived)); =20 - if (qemuMigrationJobStartPhase(vm, - v3proto ? QEMU_MIGRATION_PHASE_FINISH3 - : QEMU_MIGRATION_PHASE_FINISH2)= < 0) + if (qemuMigrationJobStartPhase(vm, phase) < 0) goto cleanup; =20 - qemuDomainCleanupRemove(vm, qemuMigrationDstPrepareCleanup); + if (flags & VIR_MIGRATE_POSTCOPY_RESUME) { + virCloseCallbacksUnset(driver->closeCallbacks, vm, + qemuMigrationAnyConnectionClosed); + qemuDomainCleanupRemove(vm, qemuProcessCleanupMigrationJob); + } else { + qemuDomainCleanupRemove(vm, qemuMigrationDstPrepareCleanup); + } g_clear_pointer(&priv->job.completed, virDomainJobDataFree); =20 cookie_flags =3D QEMU_MIGRATION_COOKIE_NETWORK | --=20 2.35.1