From nobody Sun Feb 8 18:43:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1589369002; cv=none; d=zohomail.com; s=zohoarc; b=E2ng3RmIqc+9zfGYzMcfvAEO3HU3c2t3aVyJgCMTEJ/GyKnOu1P8AO1rl/ImAcPHSwnRTwqigwro3TIFrHx2pAgR18V5WD2hsFWFYZDYX/Lpc/ebUVU70klWavifuOnLQ9DC1nftZKVp3Wh27tE34EURTXcpR2LLpc715mvly64= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589369002; 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=DLWWy8lLzfyZTP/4iP/7QrSoaIL+lv2ZnkeEMty4uwU=; b=Mc8VaUymNbkGw915kW89VzhLN5Z+gF/bozg5ZgXMBAGswts/U+Dans7h8H4D8lOC/YomyyW9RRCiuFWwvA0AK6NC+OibZ3dghqrd1ZKcgHMQ5Cl87/qENOVQeveAX3bv5ytJambWaXxDIOhbCGzISoLPg5BDnr78Nx4aYlT9XJM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 158936900247863.23221895076324; Wed, 13 May 2020 04:23:22 -0700 (PDT) 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-504-NDGxIEhSOBCGfv1etNlCGA-1; Wed, 13 May 2020 07:23:18 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7B6A181E22C; Wed, 13 May 2020 11:23:13 +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 5C07076E98; Wed, 13 May 2020 11:23:13 +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 2E5481809563; Wed, 13 May 2020 11:23:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 04DBNB9j013203 for ; Wed, 13 May 2020 07:23:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id A24057D8F7; Wed, 13 May 2020 11:23:11 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.195.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 20CAF6A960 for ; Wed, 13 May 2020 11:23:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589369001; 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=DLWWy8lLzfyZTP/4iP/7QrSoaIL+lv2ZnkeEMty4uwU=; b=Wv1ZKF/dcwECNuMoQSQKXkr1NpBsIg0cWxMjKLUxBvZPns1botzf2TsWnuDdYma90lWAbM +cLD+QGi5mICR/Sx/WT2sQYNDGQg09WcisXWZ08z8HxaZh0KS8/LnzQzHGTvmZMUNVs0OB gNw2JOJdk5Lm5JiMvUdh2Lxj55FRwYk= X-MC-Unique: NDGxIEhSOBCGfv1etNlCGA-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 5/5] virNetDevOpenvswitchGetVhostuserIfname: Drop cleanup label Date: Wed, 13 May 2020 13:23:02 +0200 Message-Id: <9d190efc85a9c1c407512de4707acb4ffbbc04a4.1589368474.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik --- src/util/virnetdevopenvswitch.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitc= h.c index bc6a130035..dbb489d174 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -485,7 +485,6 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path, { const char *tmpIfname =3D NULL; int status; - int ret =3D -1; g_autoptr(virCommand) cmd =3D NULL; =20 /* Openvswitch vhostuser path are hardcoded to @@ -495,10 +494,8 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *pat= h, * so we pick the filename and check it's a openvswitch interface */ if (!path || - !(tmpIfname =3D strrchr(path, '/'))) { - ret =3D 0; - goto cleanup; - } + !(tmpIfname =3D strrchr(path, '/'))) + return 0; =20 tmpIfname++; cmd =3D virCommandNew(OVSVSCTL); @@ -507,15 +504,11 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *pa= th, if (virCommandRun(cmd, &status) < 0 || status) { /* it's not a openvswitch vhostuser interface. */ - ret =3D 0; - goto cleanup; + return 0; } =20 *ifname =3D g_strdup(tmpIfname); - ret =3D 1; - - cleanup: - return ret; + return 1; } =20 /** --=20 2.26.2