From nobody Sun Feb 8 09:13:09 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=1652196204; cv=none; d=zohomail.com; s=zohoarc; b=POw9yxbyVywZiRfkbR10TKxQhR2SnfDnCiDkeUnRE95WfYkQVib8Okk8+sxg6heAXCT5vwhrMmlIBNlh+yGDthG1qfDbGQncixieS+BU3aRSyQUs6Uhd2rnfilNeFv2WkRXfusMFhaBDmTO1ZoyazOrJrznEwz/34Iaa4HT7qK0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652196204; 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=ICkdytyi5kyBcEg5VmsEwEIFVzycjOT2Rhxr5HkSDr4=; b=UdKLwoPi9sXaCTIatH7U91Rk98pstTJXwql0Kt8Q0DRv9CpjY7lMtk4N5auVF6s/1RArHWEsklsVgqcb36AWHo9X5Vx3JowYYQtwFExA8yaN6OTf9WJIMnM6eFYFVj/3Hd3TjMopyWCpAN4ACMY4CHwOGGnl8p82LSr5C8H0fsc= 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 1652196204535290.069226428982; Tue, 10 May 2022 08:23:24 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-343-tqkdCqfIPFKizEL6Ycas7g-1; Tue, 10 May 2022 11:23:14 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5511285A5A8; Tue, 10 May 2022 15:22:13 +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 425BA54B072; Tue, 10 May 2022 15:22:13 +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 72734193F504; Tue, 10 May 2022 15:22:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id F0C0E194E12A for ; Tue, 10 May 2022 15:21:59 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CA4322166B13; Tue, 10 May 2022 15:21:59 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.187]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AA2A12166B4F for ; Tue, 10 May 2022 15:21:47 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 94936244601; 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=1652196203; 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=ICkdytyi5kyBcEg5VmsEwEIFVzycjOT2Rhxr5HkSDr4=; b=RPJDGR0NF2jc4qrc5m/tppsYpIGXKjX0VemxSsOXqrcfLGzkCi1v6ZlXQJx8HKjAAo8/vF 67g6IaCo4C9Mjtlh/EfHAEDUyOVbKK482Huid1XLk8PKCGZPeAdikmMpwzWpCZL8PJUMST RChgy2fPfvmm+3Y/vySYVinsnG9QzuM= X-MC-Unique: tqkdCqfIPFKizEL6Ycas7g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 27/80] qemu: Rename "endjob" label in qemuMigrationDstFinish Date: Tue, 10 May 2022 17:20:48 +0200 Message-Id: <737117ea25f2d7149a7fc6b62fa5260cc40e1cec.1652196064.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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.85 on 10.11.54.9 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: 1652196204935100001 Content-Type: text/plain; charset="utf-8" Let's call it "error" so that it's clear the label is only used in failure path. Signed-off-by: Jiri Denemark Reviewed-by: Peter Krempa --- src/qemu/qemu_migration.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 0c6d2c041b..4096aba0a6 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5840,7 +5840,7 @@ qemuMigrationDstFinish(virQEMUDriver *driver, =20 if (!(mig =3D qemuMigrationCookieParse(driver, vm->def, priv->origname= , priv, cookiein, cookieinlen, cookie_fla= gs))) - goto endjob; + goto error; =20 if (flags & VIR_MIGRATE_OFFLINE) { if (retcode =3D=3D 0 && @@ -5864,31 +5864,31 @@ qemuMigrationDstFinish(virQEMUDriver *driver, * earlier than monitor EOF handler got a chance to process the er= ror */ qemuDomainCheckMonitor(driver, vm, VIR_ASYNC_JOB_MIGRATION_IN); - goto endjob; + goto error; } =20 if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); qemuMigrationDstErrorReport(driver, vm->def->name); - goto endjob; + goto error; } =20 if (qemuMigrationDstVPAssociatePortProfiles(vm->def) < 0) - goto endjob; + goto error; =20 if (mig->network && qemuMigrationDstOPDRelocate(driver, vm, mig) < 0) VIR_WARN("unable to provide network data for relocation"); =20 if (qemuMigrationDstStopNBDServer(driver, vm, mig) < 0) - goto endjob; + goto error; =20 if (qemuRefreshVirtioChannelState(driver, vm, VIR_ASYNC_JOB_MIGRATION_IN) < 0) - goto endjob; + goto error; =20 if (qemuConnectAgent(driver, vm) < 0) - goto endjob; + goto error; =20 if (flags & VIR_MIGRATE_PERSIST_DEST) { if (qemuMigrationDstPersist(driver, vm, mig, !v3proto) < 0) { @@ -5905,7 +5905,7 @@ qemuMigrationDstFinish(virQEMUDriver *driver, * to restart during confirm() step, so we kill it off now. */ if (v3proto) - goto endjob; + goto error; } } =20 @@ -5919,7 +5919,7 @@ qemuMigrationDstFinish(virQEMUDriver *driver, * original domain on the source host is already gone. */ if (v3proto) - goto endjob; + goto error; } =20 /* Now that the state data was transferred we can refresh the actual s= tate @@ -5928,7 +5928,7 @@ qemuMigrationDstFinish(virQEMUDriver *driver, /* Similarly to the case above v2 protocol will not be able to rec= over * from this. Let's ignore this and perhaps stuff will not break. = */ if (v3proto) - goto endjob; + goto error; } =20 if (priv->job.current->status =3D=3D VIR_DOMAIN_JOB_STATUS_POSTCOPY) @@ -5960,7 +5960,7 @@ qemuMigrationDstFinish(virQEMUDriver *driver, * things up. */ if (v3proto) - goto endjob; + goto error; } =20 if (inPostCopy) @@ -5983,7 +5983,7 @@ qemuMigrationDstFinish(virQEMUDriver *driver, if (qemuMigrationDstWaitForCompletion(driver, vm, VIR_ASYNC_JOB_MIGRATION_IN, false) < 0) { - goto endjob; + goto error; } if (virDomainObjGetState(vm, NULL) =3D=3D VIR_DOMAIN_RUNNING) { virDomainObjSetState(vm, @@ -6060,7 +6060,7 @@ qemuMigrationDstFinish(virQEMUDriver *driver, virReportError(VIR_ERR_MIGRATE_FINISH_OK, NULL); return dom; =20 - endjob: + error: if (virDomainObjIsActive(vm)) { if (doKill) { qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, --=20 2.35.1