From nobody Sun Feb 8 23:37:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1652196151; cv=none; d=zohomail.com; s=zohoarc; b=d19NTSe9+zGfBQqP8ZaD4AThZ1CQf7MJ8xKfuG5NTLHKop9I8z1xgModkv3KroEwNDbdNl/nCqHmU/WNMBw3Xvy3Ism/4ivdre3+XZLOAakpTTwe2a1JuTmkRRSIBWVc0Fj50fgh1BT6el5WSXb+SspAx/6Dm3bGBWzSUlovFUM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652196151; h=Content-Type:Content-Transfer-Encoding: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=08KCn2F04/5BhMeV+viDJZGwO9mVHmJlheRX6wPijSI=; b=QqE4ocdsa9OnXXa261J2mskSfiaog3wsr8/5klUmoOrg8juXiIWc+zLIiX5hdFRggMEO/b5eLkBDVfdYynd7RW5/a0DX5/bDHoqkoGPVISyBrlUaSSgXo6bkbgORIjeNHvV0kdgsvFUBV+Io7CGDVs7cteo/9zI+sofTWJ5ZfIY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1652196151396518.8877550011996; Tue, 10 May 2022 08:22:31 -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-644-Es-8D8a_NwOsqCUyaxtHKg-1; Tue, 10 May 2022 11:22:19 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 70B6D29324A9; Tue, 10 May 2022 15:21:58 +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 5CC14403D161; Tue, 10 May 2022 15:21:58 +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 2F4641947B9E; Tue, 10 May 2022 15:21:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 6F6AD1947B83 for ; Tue, 10 May 2022 15:21:48 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 318A240CFD33; Tue, 10 May 2022 15:21:48 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.187]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 104EA40CFD27 for ; Tue, 10 May 2022 15:21:48 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id A039E24460B; Tue, 10 May 2022 17:21:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652196150; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=08KCn2F04/5BhMeV+viDJZGwO9mVHmJlheRX6wPijSI=; b=YlMdQwa0izwxNVCx2xIcT3vRxLJNjXPXUsoAzcRE8D03vCbs8ePxanwuqY7sVX7zuRGnoQ RCC0PEL2pB5vxMZbHtoJqCt0swE5AqrhqI7b5vmewE56O3Gq105UUeFpwrAecFdBknKY24 qEamV5XT4xa3sunDT64McfM1C7oyQDY= X-MC-Unique: Es-8D8a_NwOsqCUyaxtHKg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 36/80] qemu: Handle migration job in qemuMigrationDstFinish Date: Tue, 10 May 2022 17:20:57 +0200 Message-Id: <2018a84a5d980628eb637b4c85e681db90c45c24.1652196064.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 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: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 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: 1652196152774100001 Content-Type: text/plain; charset="utf-8" The function which started a migration phase should also finish it by calling qemuMigrationJobFinish/qemuMigrationJobContinue so that the code is easier to follow. Signed-off-by: Jiri Denemark Reviewed-by: Peter Krempa --- src/qemu/qemu_migration.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index d02e8132e4..b62f7256c4 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -6017,7 +6017,8 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver, int retcode, bool v3proto, unsigned long long timeReceived, - virErrorPtr *orig_err) + virErrorPtr *orig_err, + bool *finishJob) { virDomainPtr dom =3D NULL; g_autoptr(qemuMigrationCookie) mig =3D NULL; @@ -6065,8 +6066,6 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver, qemuMigrationDstComplete(driver, vm, inPostCopy, VIR_ASYNC_JOB_MIGRATION_IN); =20 - qemuMigrationJobFinish(vm); - return dom; =20 error: @@ -6092,12 +6091,10 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver, if (virDomainObjIsFailedPostcopy(vm)) { qemuProcessAutoDestroyRemove(driver, vm); qemuDomainCleanupAdd(vm, qemuProcessCleanupMigrationJob); - qemuMigrationJobContinue(vm); + *finishJob =3D false; } else { qemuMigrationParamsReset(driver, vm, VIR_ASYNC_JOB_MIGRATION_IN, jobPriv->migParams, priv->job.apiFlags); - - qemuMigrationJobFinish(vm); } =20 if (!virDomainObjIsActive(vm)) @@ -6162,18 +6159,21 @@ qemuMigrationDstFinish(virQEMUDriver *driver, cookiein, cookieinlen, cookieout, cookieoutlen); } + } else { + bool finishJob =3D true; =20 - qemuMigrationJobFinish(vm); - goto cleanup; + dom =3D qemuMigrationDstFinishActive(driver, dconn, vm, cookie_fla= gs, + cookiein, cookieinlen, + cookieout, cookieoutlen, + flags, retcode, v3proto, timeRe= ceived, + &orig_err, &finishJob); + if (!finishJob) { + qemuMigrationJobContinue(vm); + goto cleanup; + } } =20 - dom =3D qemuMigrationDstFinishActive(driver, dconn, vm, cookie_flags, - cookiein, cookieinlen, - cookieout, cookieoutlen, - flags, retcode, v3proto, timeReceiv= ed, - &orig_err); - if (!dom) - goto cleanup; + qemuMigrationJobFinish(vm); =20 cleanup: virPortAllocatorRelease(port); --=20 2.35.1