From nobody Tue Feb 10 05:27:16 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1604404897; cv=none; d=zohomail.com; s=zohoarc; b=iUFDRTu1aimpQJB8YZYxt2zpW5CD4synSIFnbvCXZcvk18uTXnuy0QvW6s7Y7kQCzRZ2sQkgP7CdzR5Jt9STqfEgm2SUtvu31qSuCmCLxcPDcUmrcJo4NHVc1nTDNToph5OfTqUD2d3v7mYDr6lGgIwH7zvJySsXuMgwTrrQlh0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604404897; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=XjQRzp9pp+kjPkXYc1jXuTXm0SqmiKULMrtyFmwsDA0=; b=AL9kvrtiyDzxMnXWIFimX8m+qPF/YiY8P6TyeU9B7gbKLazJPf9G9Vsr3yqkxcqMVkuhN9vGF7Tj/hjwWx5m5h6/cxxiEz6RtoakWD7gGS+LgZP/npytOe7vxkKADkT+J8Zoah/V6VHIDM07hVPLV2vrGZy1BFAe4VuFFjBUZKg= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1604404897471200.18904160867692; Tue, 3 Nov 2020 04:01:37 -0800 (PST) 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-168-sfC13MN5MkaBjNM-je19Cw-1; Tue, 03 Nov 2020 07:01:31 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0C0F88015FB; Tue, 3 Nov 2020 12:01:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DBFE35576E; Tue, 3 Nov 2020 12:01:25 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id A6339181A050; Tue, 3 Nov 2020 12:01:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0A3C1Orq011530 for ; Tue, 3 Nov 2020 07:01:24 -0500 Received: by smtp.corp.redhat.com (Postfix) id 73B63201C0DC; Tue, 3 Nov 2020 12:01:24 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6EC79202348E for ; Tue, 3 Nov 2020 12:01:21 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2458D185A7A2 for ; Tue, 3 Nov 2020 12:01:21 +0000 (UTC) Received: from relay3.sw.ru (relay.sw.ru [185.231.240.75]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-322-bq6199dhPXuM0rH4a9pfqA-1; Tue, 03 Nov 2020 07:01:18 -0500 Received: from [10.28.15.159] (helo=vz7.sw.ru) by relay3.sw.ru with esmtp (Exim 4.94) (envelope-from ) id 1kZuzg-007EMR-8R for libvir-list@redhat.com; Tue, 03 Nov 2020 15:00:56 +0300 X-MC-Unique: sfC13MN5MkaBjNM-je19Cw-1 X-MC-Unique: bq6199dhPXuM0rH4a9pfqA-1 From: Nikolay Shirokovskiy To: libvir-list@redhat.com Subject: [PATCH v2 03/10] qemu: rename: return instead of goto if no cleanup required Date: Tue, 3 Nov 2020 15:00:01 +0300 Message-Id: <1604404808-825155-4-git-send-email-nshirokovskiy@virtuozzo.com> In-Reply-To: <1604404808-825155-1-git-send-email-nshirokovskiy@virtuozzo.com> References: <1604404808-825155-1-git-send-email-nshirokovskiy@virtuozzo.com> X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Going to cleanup label is mere return -1 thus let's just return instead of goto to this label. Signed-off-by: Nikolay Shirokovskiy --- src/qemu/qemu_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 22df0f6..621facc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19135,20 +19135,20 @@ qemuDomainRenameCallback(virDomainObjPtr vm, new_dom_name)) || !(old_dom_cfg_file =3D virDomainConfigFile(cfg->configDir, vm->def->name))) - goto cleanup; + return -1; =20 if (vm->autostart) { if (!(new_dom_autostart_link =3D virDomainConfigFile(cfg->autostar= tDir, new_dom_name)) || !(old_dom_autostart_link =3D virDomainConfigFile(cfg->autostar= tDir, vm->def->name))) - goto cleanup; + return -1; =20 if (symlink(new_dom_cfg_file, new_dom_autostart_link) < 0) { virReportSystemError(errno, _("Failed to create symlink '%s to '%s'"), new_dom_autostart_link, new_dom_cfg_file); - goto cleanup; + return -1; } } =20 --=20 1.8.3.1