From nobody Sat Feb 7 18:51:36 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1605217754; cv=none; d=zohomail.com; s=zohoarc; b=ln5biedlSId3lJicFGi6Ywsu3i/2Q3NHOj9sa2mAIseYPra64GpLg9mJ6YZLkdWS3tg7orNDCl1Gjtu7DNj1HfHXtnevGK/MPcDZdT8/XlZ9TthrzJWabdVvxfh2r9xvwSdN7Z4tn2BApeWz2dxR46p5vo50cFSsW0KTTAvVjUk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605217754; 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=IcFvpag/FLXGiZHzGEz1znS6wkKOxybEJgelcAllVW8=; b=IdoVWOBwgQVhyw9e4cbGoXLSw+Zz+FOa6K1bZap9O+oDRWtzEIys405yoOGlrVhDMM/JiskA0cS29kVa9yCdG3DcUb8MEd+MSUqeyXo0IlA8miJA/Cot1WQdE13x9MGF9Pqhgxf1F0X5NGte7TMThiETyDSunCbuA61/UFMbPms= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1605217754126366.5063644008018; Thu, 12 Nov 2020 13:49:14 -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-331-MSSFuk0nPCGhDkajJaWZ3w-1; Thu, 12 Nov 2020 16:49:11 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9655F1882FAB; Thu, 12 Nov 2020 21:49:05 +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 71A065C5BB; Thu, 12 Nov 2020 21:49:05 +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 3F39B180B791; Thu, 12 Nov 2020 21:49:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0ACLn2Vu005475 for ; Thu, 12 Nov 2020 16:49:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id 98EE9107125; Thu, 12 Nov 2020 21:49:02 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 93F34107272 for ; Thu, 12 Nov 2020 21:49:02 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (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 810E4811E90 for ; Thu, 12 Nov 2020 21:49:02 +0000 (UTC) Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-8-HwwdR1-AOTWv7dBf-08wfg-1; Thu, 12 Nov 2020 16:49:00 -0500 Received: by mail-qt1-f195.google.com with SMTP id j31so5280339qtb.8 for ; Thu, 12 Nov 2020 13:49:00 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:b9cd:904e:d02:53c4:1c05]) by smtp.gmail.com with ESMTPSA id i15sm5136931qke.16.2020.11.12.13.48.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 13:48:58 -0800 (PST) X-MC-Unique: MSSFuk0nPCGhDkajJaWZ3w-1 X-MC-Unique: HwwdR1-AOTWv7dBf-08wfg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IcFvpag/FLXGiZHzGEz1znS6wkKOxybEJgelcAllVW8=; b=ndeclSVeBpdyYEkeDX/RL2DfDp9sJ/+BOwXMjI+30kENqAz/19SS05m3YUF5g9TfvC slG5zljoTV66bA2wAfY6ng2F8RKzr6opDFTuRTBCt8fUIyMAdIsUyPW/0NFJzGakyPAh K7Ael5ZJzlrCKY+zFAcl6Bork8I5uFOpo6danQJTawwN3qsXNcoe57WosyMPdaMr14TG uvDSs3PTk4aUqoFNdgg266f24mxXTvGjXDLojif5HpAZMz2qJbkKomgaejJM3cZ5/p+o zSuuUTk9UO/qUf49Bjs3z0dFvcm2myU3E84Glpycl9ZOQn4l7beuoHsb6/iIjqMxaEsm xMaA== X-Gm-Message-State: AOAM530nhq+oGUbYgGJmsJf3/TqsbLLhAZveQbeyRZfl1p9mClmYk/2l yh0jSdBwnW2CoOr8sy3cyZG+yUnuVUk= X-Google-Smtp-Source: ABdhPJzJGP9wShyPzyzfmAATYWlvFEJArVKWUlbH71Df4PBwwh9Atc8H3MjyK8wm307njyU+1ruF+g== X-Received: by 2002:ac8:580c:: with SMTP id g12mr1372907qtg.340.1605217739522; Thu, 12 Nov 2020 13:48:59 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH v1 07/10] qemu_domain.c: remove unneeded cleanup labels Date: Thu, 12 Nov 2020 18:48:37 -0300 Message-Id: <20201112214840.636909-8-danielhb413@gmail.com> In-Reply-To: <20201112214840.636909-1-danielhb413@gmail.com> References: <20201112214840.636909-1-danielhb413@gmail.com> MIME-Version: 1.0 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.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza 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.16 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 Content-Type: text/plain; charset="utf-8" Remove obsolete 'cleanup' labels after the changes from the previous patch. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_domain.c | 42 +++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 3c17e6e4b4..2fe8d06fdf 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5795,7 +5795,6 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr drive= r, unsigned int flags, virBuffer *buf) { - int ret =3D -1; g_autoptr(virDomainDef) copy =3D NULL; =20 virCheckFlags(VIR_DOMAIN_XML_COMMON_FLAGS | VIR_DOMAIN_XML_UPDATE_CPU,= -1); @@ -5805,7 +5804,7 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr drive= r, =20 if (!(copy =3D virDomainDefCopy(def, driver->xmlopt, qemuCaps, flags & VIR_DOMAIN_XML_MIGRATABLE))) - goto cleanup; + return -1; =20 def =3D copy; =20 @@ -5823,13 +5822,13 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr dri= ver, def->virtType, def->emulator, def->os.machine))) - goto cleanup; + return -1; } =20 if (virCPUUpdate(def->os.arch, def->cpu, virQEMUCapsGetHostModel(qCaps, def->virtType, VIR_QEMU_CAPS_HOST_CPU_MI= GRATABLE)) < 0) - goto cleanup; + return -1; } =20 if ((flags & VIR_DOMAIN_XML_MIGRATABLE)) { @@ -5959,19 +5958,16 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr dri= ver, if (origCPU) { virCPUDefFree(def->cpu); if (!(def->cpu =3D virCPUDefCopy(origCPU))) - goto cleanup; + return -1; } =20 if (def->cpu && qemuDomainMakeCPUMigratable(def->cpu) < 0) - goto cleanup; + return -1; } =20 format: - ret =3D virDomainDefFormatInternal(def, driver->xmlopt, buf, - virDomainDefFormatConvertXMLFlags(fla= gs)); - - cleanup: - return ret; + return virDomainDefFormatInternal(def, driver->xmlopt, buf, + virDomainDefFormatConvertXMLFlags(fl= ags)); } =20 =20 @@ -7940,18 +7936,14 @@ qemuDomainDefCheckABIStability(virQEMUDriverPtr dri= ver, { g_autoptr(virDomainDef) migratableDefSrc =3D NULL; g_autoptr(virDomainDef) migratableDefDst =3D NULL; - bool ret =3D false; =20 if (!(migratableDefSrc =3D qemuDomainDefCopy(driver, qemuCaps, src, CO= PY_FLAGS)) || !(migratableDefDst =3D qemuDomainDefCopy(driver, qemuCaps, dst, CO= PY_FLAGS))) - goto cleanup; - - ret =3D qemuDomainMigratableDefCheckABIStability(driver, - src, migratableDefSrc, - dst, migratableDefDst); + return false; =20 - cleanup: - return ret; + return qemuDomainMigratableDefCheckABIStability(driver, + src, migratableDefSrc, + dst, migratableDefDst); } =20 =20 @@ -7964,19 +7956,15 @@ qemuDomainCheckABIStability(virQEMUDriverPtr driver, g_autoptr(virDomainDef) migratableSrc =3D NULL; g_autoptr(virDomainDef) migratableDst =3D NULL; g_autofree char *xml =3D NULL; - bool ret =3D false; =20 if (!(xml =3D qemuDomainFormatXML(driver, vm, COPY_FLAGS)) || !(migratableSrc =3D qemuDomainDefFromXML(driver, priv->qemuCaps, x= ml)) || !(migratableDst =3D qemuDomainDefCopy(driver, priv->qemuCaps, dst,= COPY_FLAGS))) - goto cleanup; - - ret =3D qemuDomainMigratableDefCheckABIStability(driver, - vm->def, migratableSrc, - dst, migratableDst); + return false; =20 - cleanup: - return ret; + return qemuDomainMigratableDefCheckABIStability(driver, + vm->def, migratableSrc, + dst, migratableDst); } =20 #undef COPY_FLAGS --=20 2.26.2