From nobody Tue Feb 10 15:46:38 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; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=weirdnatto.in 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 1648895583843391.35176315662954; Sat, 2 Apr 2022 03:33:03 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-270-CAKhu06oOm-CEb6Dfcmp-g-1; Sat, 02 Apr 2022 06:32:15 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 20DC582A6C2; Sat, 2 Apr 2022 10:32:13 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B6CD40470EC; Sat, 2 Apr 2022 10:32:13 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BCF421940360; Sat, 2 Apr 2022 10:32:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 53A941940360 for ; Sat, 2 Apr 2022 10:32:12 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 391BDC44B1F; Sat, 2 Apr 2022 10:32:12 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3441CC4C7CD for ; Sat, 2 Apr 2022 10:32:12 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1D4C1185A794 for ; Sat, 2 Apr 2022 10:32:12 +0000 (UTC) Received: from mail.weirdnatto.in (140.238.230.155 [140.238.230.155]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-304-fxtJ-LqfOzm6YeU2s-oRTg-1; Sat, 02 Apr 2022 06:32:10 -0400 X-MC-Unique: CAKhu06oOm-CEb6Dfcmp-g-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: fxtJ-LqfOzm6YeU2s-oRTg-1 From: Amneesh Singh To: libvir-list@redhat.com Subject: [PATCH 2/3] virsh: Provide completer for CPU architectures Date: Sat, 2 Apr 2022 16:01:46 +0530 Message-Id: <20220402103147.428242-3-natto@weirdnatto.in> In-Reply-To: <20220402103147.428242-1-natto@weirdnatto.in> References: <20220402103147.428242-1-natto@weirdnatto.in> 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.85 on 10.11.54.8 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Amneesh Singh Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 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-ZM-MESSAGEID: 1648895584521100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Related: https://gitlab.com/libvirt/libvirt/-/issues/9 Signed-off-by: Amneesh Singh --- src/util/virarch.c | 2 +- src/util/virarch.h | 2 +- tools/virsh-completer-host.c | 12 ++++++++++++ tools/virsh-completer-host.h | 5 +++++ tools/virsh-host.c | 4 ++++ 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/util/virarch.c b/src/util/virarch.c index 2134dd6..b1ea85e 100644 --- a/src/util/virarch.c +++ b/src/util/virarch.c @@ -123,7 +123,7 @@ virArchEndian virArchGetEndian(virArch arch) * * Return the string name of the architecture */ -const char *virArchToString(virArch arch) +const char *virArchToString(int arch) { if (arch >=3D VIR_ARCH_LAST) arch =3D VIR_ARCH_NONE; diff --git a/src/util/virarch.h b/src/util/virarch.h index 81b1b27..7daa0f1 100644 --- a/src/util/virarch.h +++ b/src/util/virarch.h @@ -110,7 +110,7 @@ typedef enum { =20 unsigned int virArchGetWordSize(virArch arch); virArchEndian virArchGetEndian(virArch arch); -const char *virArchToString(virArch arch); +const char *virArchToString(int arch); virArch virArchFromString(const char *name); =20 virArch virArchFromHost(void); diff --git a/tools/virsh-completer-host.c b/tools/virsh-completer-host.c index 14c68d3..67a7687 100644 --- a/tools/virsh-completer-host.c +++ b/tools/virsh-completer-host.c @@ -27,6 +27,7 @@ #include "virxml.h" #include "virutil.h" #include "virsh-host.h" +#include "virarch.h" #include "conf/domain_conf.h" =20 static char * @@ -192,3 +193,14 @@ virshVirtTypeCompleter(vshControl *ctl G_GNUC_UNUSED, return virshEnumComplete(VIR_DOMAIN_VIRT_LAST, virDomainVirtTypeToString); } + +char ** +virshArchCompleter(vshControl *ctl G_GNUC_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, + unsigned int flags) +{ + virCheckFlags(0, NULL); + + return virshEnumComplete(VIR_ARCH_LAST, + virArchToString); +} diff --git a/tools/virsh-completer-host.h b/tools/virsh-completer-host.h index 372ac14..b34163c 100644 --- a/tools/virsh-completer-host.h +++ b/tools/virsh-completer-host.h @@ -46,3 +46,8 @@ char ** virshVirtTypeCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); + +char ** +virshArchCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 664f9fd..8f94d2a 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -86,6 +86,7 @@ static const vshCmdOptDef opts_domcapabilities[] =3D { }, {.name =3D "arch", .type =3D VSH_OT_STRING, + .completer =3D virshArchCompleter, .help =3D N_("domain architecture (/domain/os/type/@arch)"), }, {.name =3D "machine", @@ -1312,6 +1313,7 @@ static const vshCmdInfo info_cpu_models[] =3D { static const vshCmdOptDef opts_cpu_models[] =3D { {.name =3D "arch", .type =3D VSH_OT_DATA, + .completer =3D virshArchCompleter, .flags =3D VSH_OFLAG_REQ, .help =3D N_("architecture") }, @@ -1588,6 +1590,7 @@ static const vshCmdOptDef opts_hypervisor_cpu_compare= [] =3D { }, {.name =3D "arch", .type =3D VSH_OT_STRING, + .completer =3D virshArchCompleter, .help =3D N_("CPU architecture (/domain/os/type/@arch)"), }, {.name =3D "machine", @@ -1698,6 +1701,7 @@ static const vshCmdOptDef opts_hypervisor_cpu_baselin= e[] =3D { }, {.name =3D "arch", .type =3D VSH_OT_STRING, + .completer =3D virshArchCompleter, .help =3D N_("CPU architecture (/domain/os/type/@arch)"), }, {.name =3D "machine", --=20 2.35.1