From nobody Wed Jan 15 09:22:27 2025 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1705419039633805.2996893380201; Tue, 16 Jan 2024 07:30:39 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 88A971D8B; Tue, 16 Jan 2024 10:30:38 -0500 (EST) Received: from lists.libvirt.org.85.43.8.in-addr.arpa (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 671F91D8A; Tue, 16 Jan 2024 10:25:36 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 15E5F1D23; Tue, 16 Jan 2024 10:25:12 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 74F921D0E for ; Tue, 16 Jan 2024 10:25:11 -0500 (EST) Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-237-Y9Td0_aFOE-R6cNSfX8yZA-1; Tue, 16 Jan 2024 10:25:09 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EE0E83C0ED71 for ; Tue, 16 Jan 2024 15:25:08 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 278CB1121306 for ; Tue, 16 Jan 2024 15:25:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: Y9Td0_aFOE-R6cNSfX8yZA-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 3/3] qemuMigrationDstStartNBDServer: Refactor cleanup Date: Tue, 16 Jan 2024 16:25:04 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: O2YNHAU3O2K67CYWUSTHABT2V3PLIT2K X-Message-ID-Hash: O2YNHAU3O2K67CYWUSTHABT2V3PLIT2K X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1705419039986100001 There's nothing under the 'cleanup:' label thus the whole code can be simplified. Signed-off-by: Peter Krempa Reviewed-by: Andrea Bolognani --- src/qemu/qemu_migration.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 182e51f0f0..832cbd1c17 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -541,7 +541,6 @@ qemuMigrationDstStartNBDServer(virQEMUDriver *driver, const char *nbdURI, const char *tls_alias) { - int ret =3D -1; qemuDomainObjPrivate *priv =3D vm->privateData; size_t i; virStorageNetHostDef server =3D { @@ -610,22 +609,22 @@ qemuMigrationDstStartNBDServer(virQEMUDriver *driver, virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("Cannot migrate empty or read-only disk %1$s"= ), disk->dst); - goto cleanup; + return -1; } if (!(diskAlias =3D qemuAliasDiskDriveFromDisk(disk))) - goto cleanup; + return -1; if (!server_started && server.transport =3D=3D VIR_STORAGE_NET_HOST_TRANS_TCP) { if (server.port) { if (virPortAllocatorSetUsed(server.port) < 0) - goto cleanup; + return -1; } else { unsigned short port =3D 0; if (virPortAllocatorAcquire(driver->migrationPorts, &port)= < 0) - goto cleanup; + return -1; server.port =3D port; } @@ -635,7 +634,7 @@ qemuMigrationDstStartNBDServer(virQEMUDriver *driver, } if (qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_MIGRATION_IN)= < 0) - goto cleanup; + return -1; if (!server_started) { if (qemuMonitorNBDServerStart(priv->mon, &server, tls_alias) <= 0) @@ -648,14 +647,11 @@ qemuMigrationDstStartNBDServer(virQEMUDriver *driver, qemuDomainObjExitMonitor(vm); } - ret =3D 0; - - cleanup: - return ret; + return 0; exit_monitor: qemuDomainObjExitMonitor(vm); - goto cleanup; + return -1; } --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org