From nobody Sun Feb 8 20:17:34 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=1626695296; cv=none; d=zohomail.com; s=zohoarc; b=T/yZVTM5gQscu7lWeNlEe6qQRgSxqoe63BKCF0FnrhqOA3lI1wwdXHUmK3wQ3jNE4vr6BeShNElxDkroVFjB7DVzAc8uHCGP7FA+pxXuyJcLrjkX00jBwZn3/PAPXwS8Qvausa3OI3EHFYw8a/X37FnRLRe9A6wZ8FbXe3uMdzk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626695296; 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=+99S/4VsvYkTQ3t73iG42b4MFNamInpE98EjJxfMvXA=; b=aatA++m1fTiuSkQsFdybG5wKu9YlE0wkwihP+Q+gCQdMANnhrbxLWg1FoYP580j7g8OZWS5PBNsN/Kub3EGWjwrjYFg9o3yyBYDcg7e0ohEyNzqVPeKqkVzEIdPPsKTsyL2d1HT32C8eOEYDy44/OCKr2++QYB051b7ybyK6V1s= 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 162669529635935.49612167715259; Mon, 19 Jul 2021 04:48:16 -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-388-BZgCSN61PG6Br_m1u1DxBg-1; Mon, 19 Jul 2021 07:48:13 -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 EFF63100C609; Mon, 19 Jul 2021 11:48:08 +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 BF83260916; Mon, 19 Jul 2021 11:48:07 +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 967404A712; Mon, 19 Jul 2021 11:48:03 +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 16JBm1Jf012154 for ; Mon, 19 Jul 2021 07:48:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id B798E60C82; Mon, 19 Jul 2021 11:48:01 +0000 (UTC) Received: from andariel.local (unknown [10.40.194.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id 24C3F60CC9 for ; Mon, 19 Jul 2021 11:48:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1626695295; 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=+99S/4VsvYkTQ3t73iG42b4MFNamInpE98EjJxfMvXA=; b=SjtR/wzt3eGA7TRcqgb2w6L1U2VLsj+J9ab37k1YhFDUS7bMsWca5wGBAsjEqcvg5S10lT GfxT6HY8k3cZlRKKkwPlLFJmGG9i1/f/c2ZeaVMwRNqWUN23ZPwWXbOWAyJadmYdf5G4ek 6mdJnqHbfjOvanTZ85CgB5wnpBGB7rY= X-MC-Unique: BZgCSN61PG6Br_m1u1DxBg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/5] virsh-host: Avoid 'vir' prefix for locally declared VIR_ENUM* helpers Date: Mon, 19 Jul 2021 13:47:51 +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.13 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: 1626695306683100003 Content-Type: text/plain; charset="utf-8" Stuff used in virsh should use 'virsh'. Signed-off-by: Peter Krempa --- tools/virsh-completer-host.c | 2 +- tools/virsh-domain.c | 2 +- tools/virsh-host.c | 4 ++-- tools/virsh-host.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/virsh-completer-host.c b/tools/virsh-completer-host.c index d17bc5f5ce..3795d1fd3a 100644 --- a/tools/virsh-completer-host.c +++ b/tools/virsh-completer-host.c @@ -183,7 +183,7 @@ virshNodeSuspendTargetCompleter(vshControl *ctl G_GNUC_= UNUSED, ret =3D g_new0(char *, VIR_NODE_SUSPEND_TARGET_LAST + 1); for (i =3D 0; i < VIR_NODE_SUSPEND_TARGET_LAST; i++) - ret[i] =3D g_strdup(virNodeSuspendTargetTypeToString(i)); + ret[i] =3D g_strdup(virshNodeSuspendTargetTypeToString(i)); return ret; } diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 29748b0257..f59be4e29d 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3488,7 +3488,7 @@ cmdDomPMSuspend(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "target", &target) < 0) goto cleanup; - if ((suspendTarget =3D virNodeSuspendTargetTypeFromString(target)) < 0= ) { + if ((suspendTarget =3D virshNodeSuspendTargetTypeFromString(target)) <= 0) { vshError(ctl, "%s", _("Invalid target")); goto cleanup; } diff --git a/tools/virsh-host.c b/tools/virsh-host.c index f42e995122..7b47b7583d 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -951,7 +951,7 @@ cmdNodeMemStats(vshControl *ctl, const vshCmd *cmd) * "nodesuspend" command */ -VIR_ENUM_IMPL(virNodeSuspendTarget, +VIR_ENUM_IMPL(virshNodeSuspendTarget, VIR_NODE_SUSPEND_TARGET_LAST, "mem", "disk", @@ -998,7 +998,7 @@ cmdNodeSuspend(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptLongLong(ctl, cmd, "duration", &duration) < 0) return false; - if ((suspendTarget =3D virNodeSuspendTargetTypeFromString(target)) < 0= ) { + if ((suspendTarget =3D virshNodeSuspendTargetTypeFromString(target)) <= 0) { vshError(ctl, "%s", _("Invalid target")); return false; } diff --git a/tools/virsh-host.h b/tools/virsh-host.h index 840f0b4538..f12258018d 100644 --- a/tools/virsh-host.h +++ b/tools/virsh-host.h @@ -25,4 +25,4 @@ extern const vshCmdDef hostAndHypervisorCmds[]; -VIR_ENUM_DECL(virNodeSuspendTarget); +VIR_ENUM_DECL(virshNodeSuspendTarget); --=20 2.31.1