From nobody Mon Feb 9 00:55:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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=1626695310; cv=none; d=zohomail.com; s=zohoarc; b=X+8FXKP/gJe3s5DgFIHQ8X2KWCOvIc41rMUO9jv4Yeo+SCR5//cbn9CDL+zkGkXDzl1CRVQ98uWF4gk11TOJx0QBeY2IBNpJ/jGpZS74LydIn+Qt4yVE8b2guBQZXF+rhoGqm/Ie+YSjL4dGIY3KrLdKM8ga1R+pZ8oHGHJysuA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626695310; 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=KrG7hF+dj+lbdsB2AeCVfDLNBMTYp6RYZkEsN+s5+CQ=; b=PLLitPrkbrD7720zPFEei1+aktktvduTbWJMwCIIExSjBxIvCdhmuj7hm+cXEsMYK8f8aXUUCGNMZAX1T7bJs1z+lrS8mhsMJatIeUQ142YMNHLGalnBUHI9QZLBwu8vMBhL0ULMvT31a4vIVdGjdvG2gmcF5I5TfcpmrhJcjS0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1626695310925798.5843397022757; Mon, 19 Jul 2021 04:48:30 -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-218-sG0jt7WxMh6Bzr69a-h6Nw-1; Mon, 19 Jul 2021 07:48:28 -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 917B28018A7; Mon, 19 Jul 2021 11:48:23 +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 6F9705C23A; Mon, 19 Jul 2021 11:48:23 +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 3D4A04EA29; Mon, 19 Jul 2021 11:48:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 16JBm3xN012172 for ; Mon, 19 Jul 2021 07:48:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id A880360C9D; Mon, 19 Jul 2021 11:48:03 +0000 (UTC) Received: from andariel.local (unknown [10.40.194.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1680A60C82 for ; Mon, 19 Jul 2021 11:48:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626695309; 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=KrG7hF+dj+lbdsB2AeCVfDLNBMTYp6RYZkEsN+s5+CQ=; b=RbDGB+sU72gIuGEuzozTzrQFplYm0OLY0OV1Q3KPU3csV3GaTUhS4Mzmli9yfeFug3uzwR RiVUoRY7PUiE/wpcMl8hYOyEON8aVIellTF1+6l7lrXikuaKKzdpunWPTZYaHHpto4EtC2 b034FNLNjw1Vj+tO1vyqhmg2Ehws43I= X-MC-Unique: sG0jt7WxMh6Bzr69a-h6Nw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/5] virsh-network: Avoid 'vir' prefix for locally declared VIR_ENUM* helpers Date: Mon, 19 Jul 2021 13:47:53 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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 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 X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1626695313252100005 Content-Type: text/plain; charset="utf-8" Stuff used in virsh should use 'virsh'. Signed-off-by: Peter Krempa --- tools/virsh-network.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index d95db7f6d1..152df1086b 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -943,13 +943,13 @@ static const vshCmdOptDef opts_network_update[] =3D { {.name =3D NULL} }; -VIR_ENUM_DECL(virNetworkUpdateCommand); -VIR_ENUM_IMPL(virNetworkUpdateCommand, +VIR_ENUM_DECL(virshNetworkUpdateCommand); +VIR_ENUM_IMPL(virshNetworkUpdateCommand, VIR_NETWORK_UPDATE_COMMAND_LAST, "none", "modify", "delete", "add-last", "add-first"); -VIR_ENUM_DECL(virNetworkSection); -VIR_ENUM_IMPL(virNetworkSection, +VIR_ENUM_DECL(virshNetworkSection); +VIR_ENUM_IMPL(virshNetworkSection, VIR_NETWORK_SECTION_LAST, "none", "bridge", "domain", "ip", "ip-dhcp-host", "ip-dhcp-range", "forward", "forward-interface", @@ -983,7 +983,7 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) /* "add" is a synonym for "add-last" */ command =3D VIR_NETWORK_UPDATE_COMMAND_ADD_LAST; } else { - command =3D virNetworkUpdateCommandTypeFromString(commandStr); + command =3D virshNetworkUpdateCommandTypeFromString(commandStr); if (command <=3D 0 || command >=3D VIR_NETWORK_UPDATE_COMMAND_LAST= ) { vshError(ctl, _("unrecognized command name '%s'"), commandStr); goto cleanup; @@ -993,7 +993,7 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "section", §ionStr) < 0) goto cleanup; - section =3D virNetworkSectionTypeFromString(sectionStr); + section =3D virshNetworkSectionTypeFromString(sectionStr); if (section <=3D 0 || section >=3D VIR_NETWORK_SECTION_LAST) { vshError(ctl, _("unrecognized section name '%s'"), sectionStr); goto cleanup; --=20 2.31.1