From nobody Sat Apr 20 01:40:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1589368999; cv=none; d=zohomail.com; s=zohoarc; b=RN2MLV6pso/+RBCsa8/05/ELEGPfjFagg3Sd+siMFAnXz3NZ8sQ2/jP2BRArMrsg00lwv3YkntDT5xOvAh0qbZU7E2PSApCSvrAAXY89zrT8Dpnn3dTqiNmK3K9kbHGXzjylR7Mi1DLEVsyHmcDC44Xjrpd5Gia/61bDx6nXtrs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589368999; 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=/onb0pVErNWDsW6gr9NQ2LjxrIpZ3f32l2jrDzCGP78=; b=WunVHDmQKjKRz7vv38oApcS4vWcqExcdT9U88pngZSlKI9zB8dDooDZPU7ZSApRzu/54lnMQbV3wUsRlCbzmGBITaOO3b3q2MSJWBvKJoSc9voG5IQH69x8KPm+Gn9CPLKl2CPA9XQEDd1Qzm3vei6sI4xSj7xqhj8P1utYquno= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1589368999433820.5677520351694; Wed, 13 May 2020 04:23:19 -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-122--E2dvT3yOxaNAOnPKJBTOw-1; Wed, 13 May 2020 07:23:15 -0400 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 AB3A0107ACF4; Wed, 13 May 2020 11:23:09 +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 8D3715C5D9; Wed, 13 May 2020 11:23:09 +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 5AFDC1809543; Wed, 13 May 2020 11:23:09 +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 04DBN87I013168 for ; Wed, 13 May 2020 07:23:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 291717D8EE; Wed, 13 May 2020 11:23:08 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.195.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BE626A960 for ; Wed, 13 May 2020 11:23:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589368998; 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=/onb0pVErNWDsW6gr9NQ2LjxrIpZ3f32l2jrDzCGP78=; b=UAti7dlz2GTofbgsJAnF2cfohunhbzye9nrGaMvId/DQo8DIgexBqUnrCgiyqP+/8jkqps 5QYYo5urNxD3KrBU/aPSc3cahSavxPIra6oOiD/GQ2vTug+Y7n959LSrK/saX03X1ZRUBl nkzuOPCxfVrJcwAVI1nbdRF7uiG+BY4= X-MC-Unique: -E2dvT3yOxaNAOnPKJBTOw-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 1/5] virNetDevOpenvswitchConstructVlans: Use g_auto() for virBuffer Date: Wed, 13 May 2020 13:22:58 +0200 Message-Id: <6752a3ec7a6e7ea35aeac7f699ba7abbbd51ace9.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.16 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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitc= h.c index d16af72bdf..6c4e817941 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -72,7 +72,7 @@ virNetDevOpenvswitchConstructVlans(virCommandPtr cmd, con= st virNetDevVlan *virtV { int ret =3D -1; size_t i =3D 0; - virBuffer buf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (!virtVlan || !virtVlan->nTags) return 0; @@ -113,7 +113,6 @@ virNetDevOpenvswitchConstructVlans(virCommandPtr cmd, c= onst virNetDevVlan *virtV } =20 ret =3D 0; - virBufferFreeAndReset(&buf); return ret; } =20 --=20 2.26.2 From nobody Sat Apr 20 01:40:44 2024 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=nXPLFdUQnctnNuYGjULWmJQYfubRQOl23fRZ8ppPYE5GzbmThDCuadxav3OpaikKVlaCxldmJ9iJeEMfAq0fHZhVvmY69VIY9yW5p+ksMRex4dfI6J2xuo5ZyYQNrxElkOE/Jf5BsUOdBTAFeB4piocaWNdrbv/WmU+TyJo+/SQ= 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=bELKxzqbbEtPPZgDv1kDpfadD1yNYEmUrs+0wHFJgJk=; b=I1E8RXxRI7etwDdH4lQu2vrMsw8SjUwkO68ls0bxLEESY3bPT3guXN/PeP2lX6ozMAna9wJg6fqKaQr+dlx6eNfDfZXINYz+L1Wy2jY/YR8bDvhRN2tSNpByBfa/TkjuxbOUfLp8oq05O59QMjSskLuCnzQPlP4q6j9GTNz3pcI= 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 1589369002124734.0456133479281; 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-478-OZ3FZ6yZNW--Bm2AvkubaQ-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 E741D18FE879; Wed, 13 May 2020 11:23:12 +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 C9D4176E98; Wed, 13 May 2020 11:23:12 +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 96FC71809554; Wed, 13 May 2020 11:23:12 +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 04DBN9i9013178 for ; Wed, 13 May 2020 07:23:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0AB206A960; Wed, 13 May 2020 11:23:09 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.195.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7D1487D945 for ; Wed, 13 May 2020 11:23:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589369000; 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=bELKxzqbbEtPPZgDv1kDpfadD1yNYEmUrs+0wHFJgJk=; b=R9Hieu8QRciu+BKVUtJt/ciOKSyHAEnMclPKcR6PA6OVQ607y53+dfP8ih67cSYHXHVkNj P2yVK4xMJ1L2SnDMdfV5/0z+cQRoRV5N52DhYunxb++SDbkiIhk9HRmgm+j+638FhCHL1E 2+tNUzAtk4Zhpp23p16GIEAZdVzac5M= X-MC-Unique: OZ3FZ6yZNW--Bm2AvkubaQ-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 2/5] virNetDevOpenvswitchConstructVlans: Bring @i into the block where it's used Date: Wed, 13 May 2020 13:22:59 +0200 Message-Id: <27761b17fc84ca490eb01903f910b9160b3fd0d1.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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitc= h.c index 6c4e817941..c9e0c4e956 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -71,7 +71,6 @@ static int virNetDevOpenvswitchConstructVlans(virCommandPtr cmd, const virNetDevVlan = *virtVlan) { int ret =3D -1; - size_t i =3D 0; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (!virtVlan || !virtVlan->nTags) @@ -92,6 +91,8 @@ virNetDevOpenvswitchConstructVlans(virCommandPtr cmd, con= st virNetDevVlan *virtV } =20 if (virtVlan->trunk) { + size_t i; + virBufferAddLit(&buf, "trunk=3D"); =20 /* @@ -100,7 +101,7 @@ virNetDevOpenvswitchConstructVlans(virCommandPtr cmd, c= onst virNetDevVlan *virtV * start of the for loop if there are more than one VLANs * on this trunk port. */ - virBufferAsprintf(&buf, "%d", virtVlan->tag[i]); + virBufferAsprintf(&buf, "%d", virtVlan->tag[0]); =20 for (i =3D 1; i < virtVlan->nTags; i++) { virBufferAddLit(&buf, ","); --=20 2.26.2 From nobody Sat Apr 20 01:40:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; 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 207.211.31.81 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=1589369003; cv=none; d=zohomail.com; s=zohoarc; b=m5Ca2ObYdQQ5hLQ7SQJTcrH9qi6YnMeMf27maDwdfkE9FeLkjYpjiu3wOyI4SUgOrQnUoG9Z3YQlmHp7iajpopyG4Tyx7daBADCa7aIzVXZBouvVXiYRCVOk4bIyv8ZpZJ2ueofXYLLR3d6cRuQveFW8eDFJR46Y6K5RWeI7vfg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589369003; 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=6HC2fAafFkIdB7PV8jvTYqJsfO6Eai3Eau9/mPRnB2I=; b=Wc9Zh+0LBWmLMDJuwKFGziNl2bhSqCCFplCyP2tPgwZ8u/IJIXYlpb9lZYt5lsFq5XzZEO+pUZEf8eWLk1Sc8UZWq1xK9epHMO/6q5NFXMfLDYY4mPY1wXGzTHBdD0kdLbM+bF+vtvu3AE/MyaFAzYq88scv3L/DgMm7CA9Iwtw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 158936900385620.04804924236589; Wed, 13 May 2020 04:23:23 -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-511-C2FlAIxgN4ufh4jVCHue3Q-1; Wed, 13 May 2020 07:23:20 -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 4C3B4107ACF5; Wed, 13 May 2020 11:23:15 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2C53C78376; Wed, 13 May 2020 11:23:15 +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 F24B74CAA8; Wed, 13 May 2020 11:23:14 +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 04DBN90I013187 for ; Wed, 13 May 2020 07:23:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id DFFAD7D8F7; Wed, 13 May 2020 11:23:09 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.195.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E33E6A960 for ; Wed, 13 May 2020 11:23:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589369002; 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=6HC2fAafFkIdB7PV8jvTYqJsfO6Eai3Eau9/mPRnB2I=; b=RD+kdHcTajVzrvslNpafsbPifb3I4bjj24gv5Tz/Swc9GENryAEeoHoFEQfhQgQ0g2D9lS owsif+o4febRpO3W9wr9y5OaF1p2HVP7SQZxdZhkQ9Pv8od0IubbyeBXIor2vi60IAmUlC Ne/RAg0MkWLwn/JaTt7LR1/vcJ9CdDo= X-MC-Unique: C2FlAIxgN4ufh4jVCHue3Q-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 3/5] virNetDevOpenvswitchConstructVlans: return void Date: Wed, 13 May 2020 13:23:00 +0200 Message-Id: <6c0af6be64e80ec234b0e88eb46561a521894873.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" This function returns nothing else than zero. Make it void. Signed-off-by: Michal Privoznik --- src/util/virnetdevopenvswitch.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitc= h.c index c9e0c4e956..c4cf2cf476 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -64,17 +64,14 @@ virNetDevOpenvswitchAddTimeout(virCommandPtr cmd) * * Construct the VLAN configuration parameters to be passed to * ovs-vsctl command. - * - * Returns 0 in case of success or -1 in case of failure. */ -static int +static void virNetDevOpenvswitchConstructVlans(virCommandPtr cmd, const virNetDevVlan = *virtVlan) { - int ret =3D -1; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 if (!virtVlan || !virtVlan->nTags) - return 0; + return; =20 switch (virtVlan->nativeMode) { case VIR_NATIVE_VLAN_MODE_TAGGED: @@ -112,9 +109,6 @@ virNetDevOpenvswitchConstructVlans(virCommandPtr cmd, c= onst virNetDevVlan *virtV } else if (virtVlan->nTags) { virCommandAddArgFormat(cmd, "tag=3D%d", virtVlan->tag[0]); } - - ret =3D 0; - return ret; } =20 /** @@ -162,8 +156,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, con= st char *ifname, virCommandAddArgList(cmd, "--", "--if-exists", "del-port", ifname, "--", "add-port", brname, ifname, NULL); =20 - if (virNetDevOpenvswitchConstructVlans(cmd, virtVlan) < 0) - return -1; + virNetDevOpenvswitchConstructVlans(cmd, virtVlan); =20 if (ovsport->profileID[0] =3D=3D '\0') { virCommandAddArgList(cmd, @@ -547,8 +540,7 @@ int virNetDevOpenvswitchUpdateVlan(const char *ifname, "--", "--if-exists", "clear", "Port", ifname, "vl= an_mode", "--", "--if-exists", "set", "Port", ifname, NULL); =20 - if (virNetDevOpenvswitchConstructVlans(cmd, virtVlan) < 0) - return -1; + virNetDevOpenvswitchConstructVlans(cmd, virtVlan); =20 if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, --=20 2.26.2 From nobody Sat Apr 20 01:40:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=ZG4XVEYaPpkVsWqxK7b4lh3eTj0VS0OGcBvCzLppx3Ba0EeaYG1Wuz4kf/NCCo6+ksQY9cCpkZgWSIOHcDwSFwQDIS0+78Frk15K/4ICzve3SRFlUqFxeSJZ7LLG/hIGPEDCvzIj2P2pYWOdL3wi3xoBO5ZSauyhQfXx2V4kvr0= 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=2nP6qRn5Bs45xhmKXiAcxmQVjq5vUCijGuwtMsP2H0c=; b=XAJrUBiBSC/LaRqurqCfWrt98GK7yM34SIUWsNWaKMlkF3Oz+RRJzrhtDMPCJ/eaquKcHZyYV20f+LaRa4Oai1dq5L0tG+R4zhcacmV/95ZFNNmCXDWQ4qY03o2YhKjeV17gsW7MsxU7aqFJmvYEq+MKVs+7fE1ZrbhUhi1bAVY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 15893690022051021.4548190877282; 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-305-uiIdkql4OGeyvhv3_XykBA-1; Wed, 13 May 2020 07:23:18 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0B033835B4A; 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 E05336A960; Wed, 13 May 2020 11:23:12 +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 ADF4E1809557; Wed, 13 May 2020 11:23:12 +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 04DBNAG6013195 for ; Wed, 13 May 2020 07:23:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id C19B96A960; Wed, 13 May 2020 11:23:10 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.195.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F6937D948 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=2nP6qRn5Bs45xhmKXiAcxmQVjq5vUCijGuwtMsP2H0c=; b=MszsrQZFqAmvRfxKI9J+v/6OIkHyDf/EOTgLinlxDvub4iInRHqaSC0qiCUuiVW5NiWKXf Esith7F/aSnjjUA3yjaOoMjrP/ywgph0FUq9lpdZeGRZFSk5gjkxjnsSpLp4mxvKCATMHB +YxkUdbmEaDGCB9yvs3WI0nC85zDjMQ= X-MC-Unique: uiIdkql4OGeyvhv3_XykBA-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 4/5] virNetDevOpenvswitchGetVhostuserIfname: Fix const correctness Date: Wed, 13 May 2020 13:23:01 +0200 Message-Id: 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.13 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" The @tmpIfname is a pointer into a const string. To avoid mistakenly changing the const string via the pointer, make the pointer const too. Signed-off-by: Michal Privoznik --- src/util/virnetdevopenvswitch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitc= h.c index c4cf2cf476..bc6a130035 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -483,7 +483,7 @@ int virNetDevOpenvswitchGetVhostuserIfname(const char *path, char **ifname) { - char *tmpIfname =3D NULL; + const char *tmpIfname =3D NULL; int status; int ret =3D -1; g_autoptr(virCommand) cmd =3D NULL; --=20 2.26.2 From nobody Sat Apr 20 01:40:44 2024 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