From nobody Fri May 3 10:29:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=suse.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1623830606335214.18299812619864; Wed, 16 Jun 2021 01:03:26 -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-187-jD6trEEOONeOj_pl5K_RHA-1; Wed, 16 Jun 2021 04:03:23 -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 505C1100A8EB; Wed, 16 Jun 2021 08:03:18 +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 0D9C719630; Wed, 16 Jun 2021 08:03:18 +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 75AB61809CAD; Wed, 16 Jun 2021 08:03:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15G83BXw002284 for ; Wed, 16 Jun 2021 04:03:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id DC0CE115D7B1; Wed, 16 Jun 2021 08:03:11 +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 D710B115D7B4 for ; Wed, 16 Jun 2021 08:03:09 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (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 2EE1B1825065 for ; Wed, 16 Jun 2021 08:03:09 +0000 (UTC) Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-235-DkNLOuWIO8WyBUS2DLXeiQ-1; Wed, 16 Jun 2021 04:03:07 -0400 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04lp2051.outbound.protection.outlook.com [104.47.12.51]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-32-a8bP2uRJMN66Vr-jcChQ2A-1; Wed, 16 Jun 2021 10:03:05 +0200 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) by AM9PR04MB8892.eurprd04.prod.outlook.com (2603:10a6:20b:40b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16; Wed, 16 Jun 2021 08:03:04 +0000 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com ([fe80::cd4e:6cc0:8021:f249]) by AM9PR04MB8602.eurprd04.prod.outlook.com ([fe80::cd4e:6cc0:8021:f249%4]) with mapi id 15.20.4242.019; Wed, 16 Jun 2021 08:03:04 +0000 Received: from localhost (60.251.47.115) by PR3P251CA0018.EURP251.PROD.OUTLOOK.COM (2603:10a6:102:b5::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.16 via Frontend Transport; Wed, 16 Jun 2021 08:03:03 +0000 X-MC-Unique: jD6trEEOONeOj_pl5K_RHA-1 X-MC-Unique: DkNLOuWIO8WyBUS2DLXeiQ-1 X-MC-Unique: a8bP2uRJMN66Vr-jcChQ2A-1 From: Lin Ma To: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 1/5] virsh-pool: Remove static from virshStoragePoolList{Free, Collect} Date: Wed, 16 Jun 2021 16:02:50 +0800 Message-ID: <20210616080254.19513-2-lma@suse.com> In-Reply-To: <20210616080254.19513-1-lma@suse.com> References: <20210616080254.19513-1-lma@suse.com> X-Originating-IP: [60.251.47.115] X-ClientProxiedBy: PR3P251CA0018.EURP251.PROD.OUTLOOK.COM (2603:10a6:102:b5::26) To AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 603f373b-6d5c-4269-5c74-08d9309d2b06 X-MS-TrafficTypeDiagnostic: AM9PR04MB8892: X-LD-Processed: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba,ExtFwd X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:345 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: Ra15TD5BLm/YUie1yCES9HyYJKoxw5WpeoKicqTLDbsJH6Ko+OTt5f2vWHVZCQmXYjh33a5ozBYg/OdiCYTSOC3g7kqm2Pq64upvzZpKrbWJDreElC3itKW9G4iL1OBTuMl1aG5GUieXKy9BjFWGtNhb1QgVVVGRFozlbd8Mx7CmFgXpnU+yoSrVhGn8hQ1H8hO+dyjGy1FaOsw2pgu1FZHdJAsz57l+/Gqlb0ZOkQbm5r+LHpIGjtTN8OqanKitOklIbvgaRs5Jlv/CdsWEJv4hD4S+BXW+i2r11L165MkucqG/pG5HCP2y58Xm8y6jBv8nN03E5l40VQ5erQycoY3bEDnU8E7LF9g/huljuKfafISlsGNKvyWyavXrsWpSsl/2/qUWqrHh0sYGodQDMTGX4UN0ZdVVaAQk+5hx8E1mzeEad9kJzOgpIAPE1PGFvWpO1e29xtOZiLluT+MAIAafVEQ153EanQluxsD2+We7dIUN3AIPQG93bv6x0n6A3/b6KXfbIUTf8ExvSzIwiKD3o3EDLCa4f7aWw0SkN3R8WDLcJWQmFrJpZXrHWE1n0zNspsF2yR3BEzsZK3o8lw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9PR04MB8602.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(396003)(376002)(346002)(39860400002)(366004)(136003)(8936002)(26005)(6916009)(86362001)(956004)(4326008)(478600001)(316002)(2616005)(2906002)(38100700002)(83380400001)(36756003)(186003)(1076003)(8676002)(16526019)(66946007)(6486002)(66476007)(450100002)(5660300002)(107886003)(6666004)(55236004)(6496006)(66556008); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?g0sfUXN07ZL5ZWoKBlNAYxGrCiTihjExufxeVcqDsNr4YufEskk3/0Z+yMzY?= =?us-ascii?Q?cxXKoC7RRhlwRiOixeI/VizvmGjj3M2hh6n+NNQWyR3c9ZaUQJy/tfySspAo?= =?us-ascii?Q?pyrSxlWFg2qJHkY1N0dE2ngZwdL/QoOh+ERGauW13w12gTFoGxBbnszSgY8y?= =?us-ascii?Q?oTntxbfJSVnfkvD6zB+vziz6nAGGFjCiAzb5BIOPT//Jsqv7eTGp0ayQiYwN?= =?us-ascii?Q?9ZexgvYjOhlvyMK1Z5pD8Wb8U5Llvtbkq2dN+oThLCQgBhd07Ul5o8cGx8v2?= =?us-ascii?Q?AC35t5SkfNucU2ig/ORk7C08BK/viiiXP330bQUvICLJkZyoeHeqCFQwJSOo?= =?us-ascii?Q?Q6e34hmUHZ8s4JhnPmF3z7tqLhF9YCwOi9fgG1jg2c38y2lF1TQgNAgYz7UL?= =?us-ascii?Q?GlRv8nB6VAmmRyRSq6Qp84xbcHxeHrJsrl6y7uqNJXB3xXf/AS8aqhvPqCx7?= =?us-ascii?Q?4eBFaNNd+860/AuoIQRNyH72/C0e6/PzUwohLZ3bIlJDp7uAkAOz9tbrT44Q?= =?us-ascii?Q?12u1TulBfgW8q3baAUcw2vIe+8SRwDmJguVtHtFwCXTKxNvOr7IJ+XPflR8J?= =?us-ascii?Q?Fe0aNL4YhkMNEuCFgJxL+kgoXlZXeD1kyT0ZNqFGfCFs176doXf9P5qGSw1a?= =?us-ascii?Q?+He12y3kazWSZpZ/OpuvRqMTVDH7G6j4l8hAPR99J/WOGjt2wIXo+YmaSKXF?= =?us-ascii?Q?wLO2db/saiUvmjgLCN9/PZ4zt9CykNnt9gLjQS+BZI45zoHnX4XMCyK/rKvd?= =?us-ascii?Q?6aj2VtDyofrRMigS231tSz5YeW0YcIwO+uI9vmA2aluc/NJuPwclIApf177M?= =?us-ascii?Q?OZ5/UeyPQdANsplIAi6A7B8Ue5Fdg119JrlqVyV+8MD2LVsTwqaTEuO7jfS3?= =?us-ascii?Q?Bo10NFc1Cmbg72VlZbq9TSnqlvnmmAYY6llBvvWD/egtW11vUUqkIIKkR73t?= =?us-ascii?Q?hl7B7zeIDITjI7CiHS5Wbnc17MY5wTsLlbbynmp3decCI6xb+amA5zveAfUI?= =?us-ascii?Q?nCeTvUpWluuyZTGCHt90o66EsfeexmwKS3TegJHEnoOWbqoWl2CQwyAddLc9?= =?us-ascii?Q?FSn2vnB88+JRFO/nbqIreavvkskc4qAK7IW4v6y6Vf2sX6gdZpx9RGS7JRWv?= =?us-ascii?Q?MhplwrWAUqe4l+be1IzCt4ETJvm+7Fjt1Rqml/cJEVZDXGJ44KhpKFJG7wFt?= =?us-ascii?Q?zfUgUITTO3jpqMEXgvC22fG3BCycd8eD66vDyuA4a18BnSVtPXw/ACc0ASel?= =?us-ascii?Q?5/mc7I091lrF++O+sUG1nfNpqiBfitUrxmdvmcwL659kzYtkGNvmzfQpIQXa?= =?us-ascii?Q?OJcq/jf2M41CyVU/MWgzQwmf?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 603f373b-6d5c-4269-5c74-08d9309d2b06 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8602.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2021 08:03:04.2518 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: QCSXVdhmW+kFxTzwCNoY50BAT4gwH7Y/WC71P1i1gb+KTg9m6yzqCRPsoa78biAO X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8892 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.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 15G83BXw002284 X-loop: libvir-list@redhat.com Cc: mprivozn@redhat.com, Lin Ma 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 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 Content-Type: text/plain; charset="utf-8" The functions will be used by next patch. Signed-off-by: Lin Ma Reviewed-by: Michal Privoznik --- tools/virsh-pool.c | 10 ++-------- tools/virsh-pool.h | 11 +++++++++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 34ed86152e..18f3839a4c 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -835,13 +835,7 @@ virshStoragePoolSorter(const void *a, const void *b) virStoragePoolGetName(*pb)); } =20 -struct virshStoragePoolList { - virStoragePoolPtr *pools; - size_t npools; -}; - -static void -virshStoragePoolListFree(struct virshStoragePoolList *list) +void virshStoragePoolListFree(struct virshStoragePoolList *list) { size_t i; =20 @@ -855,7 +849,7 @@ virshStoragePoolListFree(struct virshStoragePoolList *l= ist) g_free(list); } =20 -static struct virshStoragePoolList * +struct virshStoragePoolList * virshStoragePoolListCollect(vshControl *ctl, unsigned int flags) { diff --git a/tools/virsh-pool.h b/tools/virsh-pool.h index 219f0eea42..d7bacd8731 100644 --- a/tools/virsh-pool.h +++ b/tools/virsh-pool.h @@ -40,3 +40,14 @@ typedef struct virshPoolEventCallback virshPoolEventCall= back; extern virshPoolEventCallback virshPoolEventCallbacks[]; =20 extern const vshCmdDef storagePoolCmds[]; + +struct virshStoragePoolList { + virStoragePoolPtr *pools; + size_t npools; +}; + +struct virshStoragePoolList * +virshStoragePoolListCollect(vshControl *ctl, + unsigned int flags); + +void virshStoragePoolListFree(struct virshStoragePoolList *list); --=20 2.26.2 From nobody Fri May 3 10:29:19 2024 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=quarantine dis=quarantine) header.from=suse.com 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 1623830609526933.6072862647849; Wed, 16 Jun 2021 01:03:29 -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-558-YShWf8WMO0GbzvBoTlJryA-1; Wed, 16 Jun 2021 04:03:24 -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 73C2F800685; Wed, 16 Jun 2021 08:03:19 +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 2AC9F197F9; Wed, 16 Jun 2021 08:03:19 +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 1A12C4A717; Wed, 16 Jun 2021 08:03:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15G83G3G002301 for ; Wed, 16 Jun 2021 04:03:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0A8D920A8945; Wed, 16 Jun 2021 08:03:16 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 059F120A8944 for ; Wed, 16 Jun 2021 08:03:16 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (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 DE9C080D0E2 for ; Wed, 16 Jun 2021 08:03:15 +0000 (UTC) Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-445-372pjEunNzKHFUuNuwvZ1A-1; Wed, 16 Jun 2021 04:03:13 -0400 Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03lp2056.outbound.protection.outlook.com [104.47.10.56]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-23-uaHTIMOmN9i1AmJ2jhfAHg-2; Wed, 16 Jun 2021 10:03:11 +0200 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) by AM9PR04MB8793.eurprd04.prod.outlook.com (2603:10a6:20b:408::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.18; Wed, 16 Jun 2021 08:03:08 +0000 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com ([fe80::cd4e:6cc0:8021:f249]) by AM9PR04MB8602.eurprd04.prod.outlook.com ([fe80::cd4e:6cc0:8021:f249%4]) with mapi id 15.20.4242.019; Wed, 16 Jun 2021 08:03:08 +0000 Received: from localhost (60.251.47.115) by PR3P251CA0026.EURP251.PROD.OUTLOOK.COM (2603:10a6:102:b5::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.18 via Frontend Transport; Wed, 16 Jun 2021 08:03:07 +0000 X-MC-Unique: YShWf8WMO0GbzvBoTlJryA-1 X-MC-Unique: 372pjEunNzKHFUuNuwvZ1A-1 X-MC-Unique: uaHTIMOmN9i1AmJ2jhfAHg-2 From: Lin Ma To: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 2/5] virsh-volume: Introduce virshStorageVolKeyCompleter Date: Wed, 16 Jun 2021 16:02:51 +0800 Message-ID: <20210616080254.19513-3-lma@suse.com> In-Reply-To: <20210616080254.19513-1-lma@suse.com> References: <20210616080254.19513-1-lma@suse.com> X-Originating-IP: [60.251.47.115] X-ClientProxiedBy: PR3P251CA0026.EURP251.PROD.OUTLOOK.COM (2603:10a6:102:b5::30) To AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1061afea-86ea-4d4c-93fc-08d9309d2da3 X-MS-TrafficTypeDiagnostic: AM9PR04MB8793: X-LD-Processed: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba,ExtFwd X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1013 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: p/RpOmVdDQMbJ5/MHeev6kgpeBQZEjXpGJn6n7UADmDjB7A/Oj2en+QV8B2GHS9phEOz7ctH2IT/lULalXy1Wv19fNwJR4HYjvSMmpyO6GlnuGGJkLPOP99nzN9owey7MlEGtr/r4UPWusM3Jnn6uR66eq4rvPB5y59xBd0dtyBfAxk+5aY1FlMO1bsUtXIunB/4KGskT/0HjLVbRfy9qvg/1u/TiM/lMcYnHvWG/pR3S3gDEt56MKmdfYaX31sbKlUNFScaAga+qFAlnbpy5u590fWyjxs9sZUVuUgMsy6ETAjFTaojsWaxasT0dJ5nrNSbeqCGWnXPjMeH9PinTMMY4AaDjJOMlmB0WhCUWZ2AjnooOz6aY8GB9wUq3ZQfN0LK2CIL3F0kr2xYe5QPYaUpIJLm2Z/wI9JeWgzECNSRjqb69H8Z5XGhu2iM9xcsrypS8eFGUpybWYxs8gPZ75HZr6DjDQih7szNQOG+Ai+F4Y6xdlbMYkn0it12NR3kX7u6XwHGaUolmZzI/L77erdKX76pr9pDYLV5Pjwgqz5R3Bd/MKiVrQ6DbFXKEQn5nGaDqbNqVV/movJUP4iI3azfUSU+V/bOQX1VY1xNbtoaKWzHHW11k30hrJ0VOonPDpkAnjX2+5PQG2YMQlV3SI7idRA1SDJpsmPZZK+oLcY= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9PR04MB8602.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(396003)(376002)(136003)(346002)(39860400002)(6916009)(107886003)(186003)(26005)(55236004)(1076003)(16526019)(316002)(5660300002)(38100700002)(450100002)(8936002)(6486002)(2616005)(36756003)(4326008)(66556008)(6496006)(66476007)(8676002)(956004)(86362001)(2906002)(66946007)(478600001)(6666004)(145543001)(145603002); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AUUWyCMaYo5SxKElx1M1cEPUwCIarwtob9x8eMxD38Z46eyM4/rb3IviOedg?= =?us-ascii?Q?+OydYUABR6M6V06v+Vq2aNdDi8M63kRQrevTxCmLWKTCUvTe/fNOHyDP79Q2?= =?us-ascii?Q?H2F/+9LXlk7L3LvDHgCxmrAaKjajSO0Ur03owYwMzXLDs+f+Ls5R/jN5hExR?= =?us-ascii?Q?PCrfRIoCb4p5yyHh7FGLTMqQC1MFA1atKJ+yZBmhBLCUg/Fo9AC1WQkBfeUn?= =?us-ascii?Q?bwjLZkqFT5SAEIzg5sEnZoUm1+iaiyL47bqMQMF+k8SXBLQA6+bU6dl18Zgt?= =?us-ascii?Q?m330Oq5lt+5XXEs0bZFNb1XcyjasqiB7jFWSkA+dTrTaUabO429BIRJ+dP0z?= =?us-ascii?Q?b5vs1M1OYyyh91qMOA58Oe3TXZqgKxCdXjHPvMQQNsQV3Auvxw4J8Fugervn?= =?us-ascii?Q?htVTWwhUZJdOCPksI0WQLm85xSgezKTprRKr8G10F/c4lJFkGLJ6V+PTTD6N?= =?us-ascii?Q?axYfuDsikg3CnT1xiUszpS3T/S4x64gwS7UBKzWUYkRja3NT+gJ5D3PHkJ7E?= =?us-ascii?Q?QYroSiZ4TWEihfqTojMvyClDsmeJdJnVspw4QUxLZbl4RtI1NKIEi+QbE+ep?= =?us-ascii?Q?yp3VdQmIBQAMIOAlCRAVlTyrFAQHA4UkS048bpO/pLCQWtU2Zn6WMzcq05aS?= =?us-ascii?Q?RJsh+bUwPVypmm4sQZpM527vs/QAjjgMNMot/pwSRleGLxfYn3n1QPOChhAe?= =?us-ascii?Q?xTvMs6Kx8zGTRzxI6Rn+RTsFtCHYI3UsyxNeAWdYIFIE7R+E0FM+s8VZXeAa?= =?us-ascii?Q?OLQNXNjzfGNs0TS6xHdBbg+NlMl7jCjPeTRTFwIRav4t8J/1Aj2QcbdXpfuT?= =?us-ascii?Q?yP1qzwxYzI6QRWZOj4tP4HxYM/ahniaMy/ZVLhgDzMsFy4s/6uOx/tzWUF2d?= =?us-ascii?Q?YM4fcb3r3NVN5eaOzsRHAttk5yfiNV81wxlMlSBlelcqw0ydKOzAsgor5tQp?= =?us-ascii?Q?YDS939+5qantv+vWhYH+4zwE6RIXPGgl079roqDstuBdlNCHVfa8BmXv0b6Y?= =?us-ascii?Q?uveXhgmC82iSEbbrx9zltCmeAstqcCXOpsaH/j3VdbQJApL5gZSHSSeDSZFk?= =?us-ascii?Q?iVQvKCN5QsL9a1cUJ6S0+QwrNjilnEdXbHWIVhDc5bFDlHMRNszjqkisBtyG?= =?us-ascii?Q?7ycesWAj5UeIo7Mpw3x/4ofCZz2K1yhDvNNGxkgBfDEsROYWUQ/0ygXRwa/8?= =?us-ascii?Q?myDdcTyprUHo2kaX+gRIHU3h4jYcPEF3ceS3Jn9+xrx5VNWBln1AMXd5sp7t?= =?us-ascii?Q?CKaYXglYKx/1W8C8dJPGAQ9BGj9q88mV/AW2b60oRQtTHvcX3K/sCNQGWO0r?= =?us-ascii?Q?c/aBC3o6JX36WGwzAGnTEUHo?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1061afea-86ea-4d4c-93fc-08d9309d2da3 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8602.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2021 08:03:08.4106 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: mGYIexQ1FYnwYa/oXzX8bh6n5vaSyjRnz4t2SLmJXj4qf7dZfyGll95AHgdteRBn X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8793 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.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 15G83G3G002301 X-loop: libvir-list@redhat.com Cc: mprivozn@redhat.com, Lin Ma 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 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 Content-Type: text/plain; charset="utf-8" Signed-off-by: Lin Ma Reviewed-by: Michal Privoznik --- tools/virsh-completer-volume.c | 47 ++++++++++++++++++++++++++++++++++ tools/virsh-completer-volume.h | 5 ++++ 2 files changed, 52 insertions(+) diff --git a/tools/virsh-completer-volume.c b/tools/virsh-completer-volume.c index 301ee982a5..a29c5eca41 100644 --- a/tools/virsh-completer-volume.c +++ b/tools/virsh-completer-volume.c @@ -69,3 +69,50 @@ virshStorageVolNameCompleter(vshControl *ctl, g_free(vols); return ret; } + +char ** +virshStorageVolKeyCompleter(vshControl *ctl, + const vshCmd *cmd G_GNUC_UNUSED, + unsigned int flags) +{ + virshControl *priv =3D ctl->privData; + struct virshStoragePoolList *list =3D NULL; + virStorageVolPtr *vols =3D NULL; + int rc; + int nvols =3D 0; + size_t i =3D 0, j =3D 0; + char **ret =3D NULL; + g_auto(GStrv) tmp =3D NULL; + + virCheckFlags(0, NULL); + + if (!priv->conn || virConnectIsAlive(priv->conn) <=3D 0) + return NULL; + + if (!(list =3D virshStoragePoolListCollect(ctl, + VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE))) + goto cleanup; + + for (i =3D 0; i < list->npools; i++) { + if ((rc =3D virStoragePoolListAllVolumes(list->pools[i], &vols, 0)= ) < 0) + goto cleanup; + + tmp =3D g_renew(char *, tmp, nvols + rc + 1); + memset(&tmp[nvols], 0, sizeof(*tmp) * (rc + 1)); + + for (j =3D 0; j < rc; j++) { + const char *key =3D virStorageVolGetKey(vols[j]); + tmp[nvols] =3D g_strdup(key); + nvols++; + virStorageVolFree(vols[j]); + } + + g_free(vols); + } + + ret =3D g_steal_pointer(&tmp); + + cleanup: + virshStoragePoolListFree(list); + return ret; +} diff --git a/tools/virsh-completer-volume.h b/tools/virsh-completer-volume.h index 6591e13fdf..b41d8f4f3e 100644 --- a/tools/virsh-completer-volume.h +++ b/tools/virsh-completer-volume.h @@ -26,3 +26,8 @@ char ** virshStorageVolNameCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); + + +char ** virshStorageVolKeyCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); --=20 2.26.2 From nobody Fri May 3 10:29:19 2024 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=quarantine dis=quarantine) header.from=suse.com 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 1623830620970502.6821593175947; Wed, 16 Jun 2021 01:03:40 -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-294-4PC1FQBwOMal7JGJAdIOIQ-1; Wed, 16 Jun 2021 04:03:38 -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 563581850605; Wed, 16 Jun 2021 08:03:33 +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 360B860622; Wed, 16 Jun 2021 08:03:33 +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 00B5A46F82; Wed, 16 Jun 2021 08:03:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15G83Klk002312 for ; Wed, 16 Jun 2021 04:03:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7EE5821231B7; Wed, 16 Jun 2021 08:03:20 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7989F21231B6 for ; Wed, 16 Jun 2021 08:03:18 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (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 E415010334A1 for ; Wed, 16 Jun 2021 08:03:17 +0000 (UTC) Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-349-BWXqyi8nO0-SFvnFskd8Fw-1; Wed, 16 Jun 2021 04:03:15 -0400 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2058.outbound.protection.outlook.com [104.47.14.58]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-10-5SJRyx-4Nx67ula4ROcDbQ-1; Wed, 16 Jun 2021 10:03:13 +0200 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) by AM9PR04MB8793.eurprd04.prod.outlook.com (2603:10a6:20b:408::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.18; Wed, 16 Jun 2021 08:03:12 +0000 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com ([fe80::cd4e:6cc0:8021:f249]) by AM9PR04MB8602.eurprd04.prod.outlook.com ([fe80::cd4e:6cc0:8021:f249%4]) with mapi id 15.20.4242.019; Wed, 16 Jun 2021 08:03:12 +0000 Received: from localhost (60.251.47.115) by PR0P264CA0094.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.18 via Frontend Transport; Wed, 16 Jun 2021 08:03:11 +0000 X-MC-Unique: 4PC1FQBwOMal7JGJAdIOIQ-1 X-MC-Unique: BWXqyi8nO0-SFvnFskd8Fw-1 X-MC-Unique: 5SJRyx-4Nx67ula4ROcDbQ-1 From: Lin Ma To: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 3/5] virsh-volume: Add macros VIRSH_COMMON_OPT_VOL_* Date: Wed, 16 Jun 2021 16:02:52 +0800 Message-ID: <20210616080254.19513-4-lma@suse.com> In-Reply-To: <20210616080254.19513-1-lma@suse.com> References: <20210616080254.19513-1-lma@suse.com> X-Originating-IP: [60.251.47.115] X-ClientProxiedBy: PR0P264CA0094.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::34) To AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7ba4a472-a14e-4e30-0b86-08d9309d302d X-MS-TrafficTypeDiagnostic: AM9PR04MB8793: X-LD-Processed: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba,ExtFwd X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:862 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: bSXTxoEbLBQRLdW5vRaX5Tlkyaz6VKmDcwRRESW/jgVYF4zcWVCTQ5cNsE+LSKV5p+s+k8nbIQJU9dY1XJZBx5fjK4h1HeFtASJyDHX+Y6VcHUktpvnYWNdEfnMQusonD26pvjuLXRwktriEUth22nB+rhm4QD1MFPYaojYzC2uXbkSuehWOrS2FduJKMZav41PaG6IRz0uJUDOJRIU1WhHHLgr8A5b6AcPmngmbFUDxtJSYXMDPsm5RSweWz6mHF0yfd04mxQvqKgHr6M8LhHUpbj95ZgU0rii71TvK9jBtTjGzTyw9P+EgALnimhavJ+arE8r1CwUISKlb7plkASY6HzK7XPn9h0r4j8j/WZdbZWPxALorfI0f+mNv4kFZdTguoW/q2P98Sh/EbAIYyscWd7o0b1FrJPecaLFVKK/VjELkwFMWmTphwakeSIO/ubvwPs1/SVQKcKEiw/EkSxJnYN8eA6s3ZHwLH1RLdLKBaRriOtw5jM3BD8X1Wy/aKYDRtwhh9SeuzVUhW+WJD51PlQ4KkQY3eKivUrPG/9/2JCnaqWT94TaAfmqZU4Aml9uB9FCAsj16Xerg+Vo/axL3WqO5bolauzOyk413iAk= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9PR04MB8602.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(396003)(376002)(136003)(346002)(39860400002)(6916009)(107886003)(83380400001)(186003)(26005)(55236004)(1076003)(16526019)(316002)(5660300002)(38100700002)(450100002)(8936002)(6486002)(2616005)(36756003)(4326008)(66556008)(6496006)(66476007)(8676002)(956004)(86362001)(2906002)(66946007)(478600001)(6666004); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4DXZMbyyw447nlpTw/zxxGKPXKHFi+XSlvhzHQtKEnpfEKHPCWOdF0CzeKpP?= =?us-ascii?Q?PGhoTaNf4BRS9nTR64A4ww+iknJy+Vb4SyKPKbTZlOU+ZgmiFMZgvG5UFH+/?= =?us-ascii?Q?GrBPqKW0ecrGYnQ6PwRyJ3ipBVUYVuAx/oZa6Pbl2ivXuQ1/pPXJvg8iUjy9?= =?us-ascii?Q?5xc3UWCEn0NPuSSbgY4WH8QhyPoOU1uMQ/BCNymgIh6Lvh2y1WC48yLsrjyA?= =?us-ascii?Q?ZDfyjn4ydJfCYXcNqNeHmMSFwjxGx5moEoKQAXv8g4/NTbDlCCbbitGXaVJT?= =?us-ascii?Q?LadlMYmK85IxlGAAuSbQ3tSYFbnK1xGoCj1I6exF/CrNEMULnoIutEiPzXiq?= =?us-ascii?Q?Jhs4h4o81iU3Z839tlob9833K1XlZqSJcRVt3thW9xBwAZDd/dtLLo+c8Dd1?= =?us-ascii?Q?5M0uexCmBGq+jC39u3Ke5QojDsetPQt6FAOfSDxjPtF0DX+SaQpEiIJRN62Z?= =?us-ascii?Q?Lqi+SuiEF4CApzImUFvtlx/dt7P0+MRyfVy5UMQPQJYT1K14a6gGHJC3EszN?= =?us-ascii?Q?RLWlKrYbUdK0oKewCpTzWY2d9KD6eloQJT1L0ZplZNZAiccVudpc1sVtnyED?= =?us-ascii?Q?OPBoQIDNVfBsnhBFu7PhhEY0EaGZyQTTky+0Ovwtvqbm3oZ23swY7Oo4+efA?= =?us-ascii?Q?1BcskiC8Qb8WWpCRj/VBk46z43gyNztrc//Xw/PpnFIMcBvosdk4PP/3+9Gr?= =?us-ascii?Q?1KdIe/LB6T/9cW88d9AV4ojsOrXNXktNwoew2gP4UxVFGtSvHQeQExGGcVbH?= =?us-ascii?Q?VMCNiAk89KXoZMegXM+r/wn3L4LM4Fh9rQffsGRD4Wm5+wZch+EH2SXWMNuj?= =?us-ascii?Q?F+Ug5RvQzYhtXNxsPoIKmgaOVxQULLzk9PiKQixBQlQZogqcXPvScWys5E6V?= =?us-ascii?Q?flMcPXth1DoibwKsxu0PgaEU0qbYGDUjdUPBeaDMJBLEcGrOGsBQH0s5Qea0?= =?us-ascii?Q?a9R7hOFgElPqwClQ62DttLkd6GjCJmst5RMLbcLmMvjLaH8iQGqPqBUAqPk1?= =?us-ascii?Q?thi7okGz4AOYKM2r08yzjXxR9ZaJtBIOwOrvt1VBh1xUIeoEVvI+lzwWrYzN?= =?us-ascii?Q?J23VzGy+ltz+IlqO9jMaHx3AkDiJrbIPxcm9KjqTvTCVWJgqIkjmIjf+brdr?= =?us-ascii?Q?VbH8eBQodTIS+N90HNKSOdRW2/IZQaPhUJvh3mD9ce1ODsuyWgKyS9t+8Qxp?= =?us-ascii?Q?pcy5i9tO3M+6x64agS7ih6Y+elrc73BGgG2ywh/EW6rymWpwLuRPJIhcB4Td?= =?us-ascii?Q?1bgyasMvVVFt9Biape+3rtKcHt98RfQNsL/QId3ZrDrob1yDNcSKxpO3BMuq?= =?us-ascii?Q?2ShIhHiC8bPinrgrQhF8HFMK?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ba4a472-a14e-4e30-0b86-08d9309d302d X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8602.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2021 08:03:12.7097 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: cmJFhjXKDrkQlZ/11rLV32BqsvKbaXIrT6hDBA7tPnzmsGzM+X2j60xs7mVrj/un X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8793 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.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 15G83Klk002312 X-loop: libvir-list@redhat.com Cc: mprivozn@redhat.com, Lin Ma 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 Content-Type: text/plain; charset="utf-8" Signed-off-by: Lin Ma Reviewed-by: Michal Privoznik --- tools/virsh-volume.c | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index c7d5ab8c3b..41b366a833 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -54,14 +54,28 @@ .completer_flags =3D VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE, \ } =20 -#define VIRSH_COMMON_OPT_VOLUME_VOL \ +#define VIRSH_COMMON_OPT_VOL_NAME(_helpstr) \ {.name =3D "vol", \ .type =3D VSH_OT_DATA, \ .flags =3D VSH_OFLAG_REQ, \ - .help =3D N_("vol name, key or path"), \ + .help =3D _helpstr, \ .completer =3D virshStorageVolNameCompleter, \ } =20 +#define VIRSH_COMMON_OPT_VOL_KEY(_helpstr) \ + {.name =3D "vol", \ + .type =3D VSH_OT_DATA, \ + .flags =3D VSH_OFLAG_REQ, \ + .help =3D _helpstr, \ + .completer =3D virshStorageVolKeyCompleter, \ + } + +#define VIRSH_COMMON_OPT_VOL_FULL \ + VIRSH_COMMON_OPT_VOL_NAME(N_("vol name, key or path")) + +#define VIRSH_COMMON_OPT_VOL_BY_KEY \ + VIRSH_COMMON_OPT_VOL_KEY(N_("volume key or path")) + virStorageVolPtr virshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, @@ -440,7 +454,7 @@ static const vshCmdInfo info_vol_create_from[] =3D { static const vshCmdOptDef opts_vol_create_from[] =3D { VIRSH_COMMON_OPT_POOL_FULL, VIRSH_COMMON_OPT_FILE(N_("file containing an XML vol description")), - VIRSH_COMMON_OPT_VOLUME_VOL, + VIRSH_COMMON_OPT_VOL_FULL, {.name =3D "inputpool", .type =3D VSH_OT_STRING, .help =3D N_("pool name or uuid of the input volume's pool") @@ -550,7 +564,7 @@ static const vshCmdInfo info_vol_clone[] =3D { }; =20 static const vshCmdOptDef opts_vol_clone[] =3D { - VIRSH_COMMON_OPT_VOLUME_VOL, + VIRSH_COMMON_OPT_VOL_FULL, {.name =3D "newname", .type =3D VSH_OT_DATA, .flags =3D VSH_OFLAG_REQ, @@ -646,7 +660,7 @@ static const vshCmdInfo info_vol_upload[] =3D { }; =20 static const vshCmdOptDef opts_vol_upload[] =3D { - VIRSH_COMMON_OPT_VOLUME_VOL, + VIRSH_COMMON_OPT_VOL_FULL, VIRSH_COMMON_OPT_FILE(N_("file")), VIRSH_COMMON_OPT_POOL_OPTIONAL, {.name =3D "offset", @@ -768,7 +782,7 @@ static const vshCmdInfo info_vol_download[] =3D { }; =20 static const vshCmdOptDef opts_vol_download[] =3D { - VIRSH_COMMON_OPT_VOLUME_VOL, + VIRSH_COMMON_OPT_VOL_FULL, VIRSH_COMMON_OPT_FILE(N_("file")), VIRSH_COMMON_OPT_POOL_OPTIONAL, {.name =3D "offset", @@ -889,7 +903,7 @@ static const vshCmdInfo info_vol_delete[] =3D { }; =20 static const vshCmdOptDef opts_vol_delete[] =3D { - VIRSH_COMMON_OPT_VOLUME_VOL, + VIRSH_COMMON_OPT_VOL_FULL, VIRSH_COMMON_OPT_POOL_OPTIONAL, {.name =3D "delete-snapshots", .type =3D VSH_OT_BOOL, @@ -939,7 +953,7 @@ static const vshCmdInfo info_vol_wipe[] =3D { }; =20 static const vshCmdOptDef opts_vol_wipe[] =3D { - VIRSH_COMMON_OPT_VOLUME_VOL, + VIRSH_COMMON_OPT_VOL_FULL, VIRSH_COMMON_OPT_POOL_OPTIONAL, {.name =3D "algorithm", .type =3D VSH_OT_STRING, @@ -1027,7 +1041,7 @@ static const vshCmdInfo info_vol_info[] =3D { }; =20 static const vshCmdOptDef opts_vol_info[] =3D { - VIRSH_COMMON_OPT_VOLUME_VOL, + VIRSH_COMMON_OPT_VOL_FULL, VIRSH_COMMON_OPT_POOL_OPTIONAL, {.name =3D "bytes", .type =3D VSH_OT_BOOL, @@ -1117,7 +1131,7 @@ static const vshCmdInfo info_vol_resize[] =3D { }; =20 static const vshCmdOptDef opts_vol_resize[] =3D { - VIRSH_COMMON_OPT_VOLUME_VOL, + VIRSH_COMMON_OPT_VOL_FULL, {.name =3D "capacity", .type =3D VSH_OT_DATA, .flags =3D VSH_OFLAG_REQ, @@ -1214,7 +1228,7 @@ static const vshCmdInfo info_vol_dumpxml[] =3D { }; =20 static const vshCmdOptDef opts_vol_dumpxml[] =3D { - VIRSH_COMMON_OPT_VOLUME_VOL, + VIRSH_COMMON_OPT_VOL_FULL, VIRSH_COMMON_OPT_POOL_OPTIONAL, {.name =3D NULL} }; --=20 2.26.2 From nobody Fri May 3 10:29:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=suse.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1623830625245610.5175150415586; Wed, 16 Jun 2021 01:03:45 -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-241-Oi_6oMn0MnKV_WaF8-nSKg-1; Wed, 16 Jun 2021 04:03:41 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7225E1850608; Wed, 16 Jun 2021 08:03:35 +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 50D6760C0F; Wed, 16 Jun 2021 08:03:35 +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 189271806D05; Wed, 16 Jun 2021 08:03:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15G83Mdi002321 for ; Wed, 16 Jun 2021 04:03:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id C48AD115D7B3; Wed, 16 Jun 2021 08:03:22 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BF435115D7B1 for ; Wed, 16 Jun 2021 08:03:22 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (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 A8279101A531 for ; Wed, 16 Jun 2021 08:03:22 +0000 (UTC) Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-49-MThF4RdrNrCsjimHRIH8_A-1; Wed, 16 Jun 2021 04:03:20 -0400 Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03lp2058.outbound.protection.outlook.com [104.47.10.58]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-3-9PLlzK4rP4Cbw6HttRemfQ-1; Wed, 16 Jun 2021 10:03:18 +0200 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) by AM9PR04MB8793.eurprd04.prod.outlook.com (2603:10a6:20b:408::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.18; Wed, 16 Jun 2021 08:03:17 +0000 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com ([fe80::cd4e:6cc0:8021:f249]) by AM9PR04MB8602.eurprd04.prod.outlook.com ([fe80::cd4e:6cc0:8021:f249%4]) with mapi id 15.20.4242.019; Wed, 16 Jun 2021 08:03:17 +0000 Received: from localhost (60.251.47.115) by PR0P264CA0089.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.18 via Frontend Transport; Wed, 16 Jun 2021 08:03:16 +0000 X-MC-Unique: Oi_6oMn0MnKV_WaF8-nSKg-1 X-MC-Unique: MThF4RdrNrCsjimHRIH8_A-1 X-MC-Unique: 9PLlzK4rP4Cbw6HttRemfQ-1 From: Lin Ma To: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 4/5] virsh-volume: Apply virshStorageVolKeyCompleter to vol-{name, pool} commands Date: Wed, 16 Jun 2021 16:02:53 +0800 Message-ID: <20210616080254.19513-5-lma@suse.com> In-Reply-To: <20210616080254.19513-1-lma@suse.com> References: <20210616080254.19513-1-lma@suse.com> X-Originating-IP: [60.251.47.115] X-ClientProxiedBy: PR0P264CA0089.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::29) To AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5bac63ae-0f00-40fa-9775-08d9309d3323 X-MS-TrafficTypeDiagnostic: AM9PR04MB8793: X-LD-Processed: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba,ExtFwd X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:626 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: ij9pql+Mm3K75Rj2n5B7ul+I0iGuj7BVZ0ro8v1zi2qSez0dkGH39ljcf9ITmJizGG/la9k2iCegJ7haOfBOJn9x8orWQ/z0CpbX5EpNDHMf1q6kKmGEOm6bljHo7ldr/gfaEO5X94MeFulSuQQQI6DtciXkcumKZmbIkCw1TilOZTOwT5FWpYravphI+sIYT2Z4MI6FQzfGOu0e2ekwYTfUGVMzxBKjTG+njyhokGJcP+HwlDZXMtJUWk+Of1yFig2SP7HT3MJf+/SihDCynE4FAktVGJ3NvSzg1OIv0Bw4cHNt5kGtRtgmT4K/nM0j9gtp1ftesSZ5gYrFLNffoNdj2HvmV7aNrr+vsg/Ch/GrS2xfGSZjL3OJ8IoJAdYrwJIPSbrdcDqcu9rrQQEJ05sXyaEsAdzYfMiabH4iIn4l7CXesVW2NfWyvRokEEz3lYtaqQ4gF7QQn1YTlpggC8gFPn78+7zyMtoOzc5OMseCS5AWWucMo5m4P2ZveUIDPmjBJILTq4iMhTE5kwaRn7OOcKAU/t2StLCW8Lo68Qk6w4+o89zkpENxDbSoFzCuPeeiNqskQ/L2vUxWJNHWUQ/7tbU7+8uPBXziBVl2ZkdOzOd1/60N13FPyhfsFhvWQQrGRgYp/LTNQfW1MArjSQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9PR04MB8602.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(396003)(376002)(136003)(346002)(39860400002)(6916009)(107886003)(83380400001)(186003)(4744005)(26005)(55236004)(1076003)(16526019)(316002)(5660300002)(38100700002)(450100002)(8936002)(6486002)(2616005)(36756003)(4326008)(66556008)(6496006)(66476007)(8676002)(956004)(86362001)(2906002)(66946007)(478600001)(6666004)(145543001); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RXkuJy/UJ3OxrracUhZTYJCvOqityEH/BOB6XDmoRH29EsXvssFjBLDBVA2X?= =?us-ascii?Q?wMf8VLNuCGnjW5QxiTENJf9WLzPGd7tomAtHyKJF2jiHWLmoHGsOGCpdBzcL?= =?us-ascii?Q?O2cB8YkLwMOE7MDhn0czDqlfymJqUrbqdy6cvUC6un2TZZWiDeWgqFdffmwT?= =?us-ascii?Q?OXBSEqJLK/2OhhGMUL6bI1l3S+hZaG34mnugCiTGy88rplMYXd3IEoYwRSfb?= =?us-ascii?Q?Fe/3xpBwDbCvrcxl1My2A5ebb3dEmA4Sge3CxR/ExiRaC4RSxiexQm1/L5PU?= =?us-ascii?Q?FzjDXRL7aEIH2VpZV6ju1jMyqojFNe+MkWiwRFQ/3nC5ZJtU+OFger4sgrqw?= =?us-ascii?Q?YnIRRB0kQC9BbjxdXjmD2/oJZGkc70gsCAFjTireXNxsO4WvBmmH0mWCeLDG?= =?us-ascii?Q?Y03BOGUSLit381/ngJCFlBwXPRKEZniRngK3wtN//jhyuYqY/8du16r4muEQ?= =?us-ascii?Q?qcd0S7Yohxx+YdryTUQV2ndXV+h4Dm9+7N1jHubOKtliJNqb7qMpHUe4FnRu?= =?us-ascii?Q?LqRiJ90/xuV1zFE4UiVlLyRSREXfyud4ji2osi3skd5xIbtf14UjsmJ5+Sck?= =?us-ascii?Q?tz88UF5XBCdgKZJ8lsPpma7QBGeoXyP0jBKUetCPJvB8E4v4Ezqb7xaJy/eN?= =?us-ascii?Q?A2IQ071bmUvg+Oi/KgVOMFgW9xyeat/ElKrOCXaWs/OqIzzACevw2INqODEV?= =?us-ascii?Q?KnV3Zig2Nnf+E4Yvj+yseVqSCT6fhynP7ZJTnaVFEXkbbXdpWPsB/3B+OOi/?= =?us-ascii?Q?/FuR8hWTLz+VtO5IG3/TqT+0TxUpMbMenIsqPNe9Yr5GBWiTmZihOu9H3MXz?= =?us-ascii?Q?TejX6kAVrGeNxVGN+X1Q8x/pvFb+KMUw3h626/bNpg0Q+kFRx9GBY7Nxp132?= =?us-ascii?Q?i2xdLWrki5enSrEflzAH9teWCSmR9t8d9g3u/IZ0kX7vwp6ArheHGZTxycte?= =?us-ascii?Q?Ash/JsKSWMio3v7qZjwSci1RjMxmFp1eitq8dtwB4XEJG1Qo9qAiErRtTDZL?= =?us-ascii?Q?XPvC7WUlcQ2Tc3FMuemEJAVekU88WE3azewFIVGu3cZTxV706Y1UT93YYZzN?= =?us-ascii?Q?JNv8sa37TrgTkjXPbAn8mlzyuHAlHTDS58oqPJ40bIFZq6wjZHIalcfGAIkJ?= =?us-ascii?Q?4qjXJkuLhk+DlzFQ58mrqLBGbC30lWkLHMLSf/cLKAVEXCof+HwDN+yT/FhS?= =?us-ascii?Q?+qjA89a80xZecarCLb/OZafZgwCKfOUz0NMg6k6+zwWlhJI0GtOsCOarzhbc?= =?us-ascii?Q?XncmGqgho3YP5i7OHhf00WdnrPYE/2XvGL26r63jtzRhx2kVpSzQA+2TlCFi?= =?us-ascii?Q?N/VHg8XaLyq1VH/A2d+eCGmm?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5bac63ae-0f00-40fa-9775-08d9309d3323 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8602.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2021 08:03:17.6272 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2s51kZmgt5n3KihkYHauUQAlUrYguGs0A7ywcyG+u7cy1u2vGn8EjdAVNLL3TH+i X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8793 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.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 15G83Mdi002321 X-loop: libvir-list@redhat.com Cc: mprivozn@redhat.com, Lin Ma 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.12 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 Content-Type: text/plain; charset="utf-8" Signed-off-by: Lin Ma Reviewed-by: Michal Privoznik --- tools/virsh-volume.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 41b366a833..daa205ea67 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -1552,11 +1552,7 @@ static const vshCmdInfo info_vol_name[] =3D { }; =20 static const vshCmdOptDef opts_vol_name[] =3D { - {.name =3D "vol", - .type =3D VSH_OT_DATA, - .flags =3D VSH_OFLAG_REQ, - .help =3D N_("volume key or path") - }, + VIRSH_COMMON_OPT_VOL_BY_KEY, {.name =3D NULL} }; =20 @@ -1588,11 +1584,7 @@ static const vshCmdInfo info_vol_pool[] =3D { }; =20 static const vshCmdOptDef opts_vol_pool[] =3D { - {.name =3D "vol", - .type =3D VSH_OT_DATA, - .flags =3D VSH_OFLAG_REQ, - .help =3D N_("volume key or path") - }, + VIRSH_COMMON_OPT_VOL_BY_KEY, {.name =3D "uuid", .type =3D VSH_OT_BOOL, .help =3D N_("return the pool uuid rather than pool name") --=20 2.26.2 From nobody Fri May 3 10:29:19 2024 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=quarantine dis=quarantine) header.from=suse.com 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 1623830621896926.5616236048221; Wed, 16 Jun 2021 01:03:41 -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-368-oMV1EnJcO8W8KEzHXlNgDA-1; Wed, 16 Jun 2021 04:03:38 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 09CD4801B1A; Wed, 16 Jun 2021 08:03:34 +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 CF951100238C; Wed, 16 Jun 2021 08:03:33 +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 8F6031809CBE; Wed, 16 Jun 2021 08:03:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15G83SwK002335 for ; Wed, 16 Jun 2021 04:03:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id AF9482157F28; Wed, 16 Jun 2021 08:03:28 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AAE6D2157F27 for ; Wed, 16 Jun 2021 08:03:28 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (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 931A1101D220 for ; Wed, 16 Jun 2021 08:03:28 +0000 (UTC) Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-511-zAW8J-uHOjeMPDTjFGe3JQ-1; Wed, 16 Jun 2021 04:03:26 -0400 Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03lp2059.outbound.protection.outlook.com [104.47.10.59]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-19-2wuKeyFoOQWjEvTxPK2ByQ-2; Wed, 16 Jun 2021 10:03:24 +0200 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) by AM9PR04MB8793.eurprd04.prod.outlook.com (2603:10a6:20b:408::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.18; Wed, 16 Jun 2021 08:03:22 +0000 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com ([fe80::cd4e:6cc0:8021:f249]) by AM9PR04MB8602.eurprd04.prod.outlook.com ([fe80::cd4e:6cc0:8021:f249%4]) with mapi id 15.20.4242.019; Wed, 16 Jun 2021 08:03:22 +0000 Received: from localhost (60.251.47.115) by PR0P264CA0082.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.15 via Frontend Transport; Wed, 16 Jun 2021 08:03:21 +0000 X-MC-Unique: oMV1EnJcO8W8KEzHXlNgDA-1 X-MC-Unique: zAW8J-uHOjeMPDTjFGe3JQ-1 X-MC-Unique: 2wuKeyFoOQWjEvTxPK2ByQ-2 From: Lin Ma To: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 5/5] virsh-volume: Apply virshStorageVolNameCompleter to vol-{key, path} commands Date: Wed, 16 Jun 2021 16:02:54 +0800 Message-ID: <20210616080254.19513-6-lma@suse.com> In-Reply-To: <20210616080254.19513-1-lma@suse.com> References: <20210616080254.19513-1-lma@suse.com> X-Originating-IP: [60.251.47.115] X-ClientProxiedBy: PR0P264CA0082.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::22) To AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2e4ad014-cd9b-4e7c-7ed8-08d9309d362e X-MS-TrafficTypeDiagnostic: AM9PR04MB8793: X-LD-Processed: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba,ExtFwd X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:296 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: Ukf7gzgB7f87uT/zh5dMns73+mWCDEB2nbY9WpCGLUHNuXpGELO6aUiF5IdOauNArPQ1uzIyODrEvY/bpb0mNUj2c06iSdyaJoZozwt6VfBB8hjhWtCwM5kECKM1ZivK6IgeCfIkWPYtx3FRf3y8rGaqAkj3yAvaSeGFcWHEvFJy2wmup8P8pb0+AvMg7qSYIMRc67oag/4tPhpf1dog7WAFx21WE0trVbGk+uV3ts2EPka/X8rBVT/AcM2oZLSIbe26x1DDiMbC0DgdanKBLx4SPJLRRrtmTq5ZW2PhgiiMuGH8g9AqxkjElQh/W9V9erj68CcCu1EW7dM68srUzpkBTzkBWQ8sfIqvjEv2C8WKdijhz3m+A2SPwXFw/L+4C+Ev8VsSH2evsGIG4C9psQca55v/jhDE1DWLqepXYwQ+E+a8/sRIH+z6n3cPBPpbZK4A810vDj0BydDKZNAR0WfSY/XGIAo0J2fTxQaEtr0cGDQOXXzVwlg1IB6pSVg0v3yQMnz9zM/eJ0k2KaKh0xbM10WaspPdxkxizRdzNC+YPBCcAcIehfijP1D4AGRauGUezsY47zfSKcf4hGI7xBKX+cjfl4BJaMUqxIZEiaOdMNfJQ/SB9muQxemAV/FiA8nm6ZCYiqsHnssSb7+t9w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9PR04MB8602.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(396003)(376002)(136003)(346002)(39860400002)(6916009)(107886003)(83380400001)(186003)(4744005)(26005)(55236004)(1076003)(16526019)(316002)(5660300002)(38100700002)(450100002)(8936002)(6486002)(2616005)(36756003)(4326008)(66556008)(6496006)(66476007)(8676002)(956004)(86362001)(2906002)(66946007)(478600001)(6666004)(145543001); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?TgRq0wEWnIw0w6kre+3iXkVX/f+IBsx0uZr0ztAb8QPJcFQqmMfaMaihtQZD?= =?us-ascii?Q?KBrV8AJybcs1NGfmg1GSFsX0BQeZTIyAEotqyZNGIWW3rYLmtTbopy9XZrP3?= =?us-ascii?Q?gftdAZUBgpI6NEebHJ2aRh+hIGduxjEuOJcdQ9SNUa52E+7UjvcpcE+Zsct3?= =?us-ascii?Q?Sa4Ejvyprj9/1XTtVbTk6gQhRHgswuxJPzLMc5QjD42eQnl47lUWj7MGOmN+?= =?us-ascii?Q?wzoNCD5pUKbs+p8dpIlEN9ITbC+g0QkmUNUB7lRWVfFajhs7GiQ+y7H2WswT?= =?us-ascii?Q?nXYDX3VHIjJ4qMXguxunZjwplV5N1QpHHVPZdbMdx7RShHAdccYoPQWddQlo?= =?us-ascii?Q?wvSTplKLNVxiacS2JTnEv/ZnL/jVPYiVbnRicevXFidNnPZ6HsqcFuU1beDO?= =?us-ascii?Q?8hiPhDkgOOlki4xUlsA/QHk9eDMCXDZ+V5V29CldHMCGfwL+zYZmvz3/3RBJ?= =?us-ascii?Q?O75AUWMx/ggF7w3FCxWFk1JdkNPWlK3KH8lgHajTuqE1LpNAUZ5U7uzs9HHR?= =?us-ascii?Q?D5ejY+dwCsoJ/uHTYxc0yBnILWGTrNbypLQe5FP+e0/6UcSzgpPAgNLJsqIs?= =?us-ascii?Q?i/LXYAVPMpcd/Fe0UiSi6GOWu3WPYD65cVLITySKA2bjAplAtnQ7sGoY7aG9?= =?us-ascii?Q?fIo36cT8UTqDahY5EYPp0Oe1gkUNAuMZhQTPczqAMAxMmdHGHlDZI+74VuFy?= =?us-ascii?Q?lAE2HBnnQOs7tiul/98lZg6vSttC1P0c4NUoic4BJvFSBQQq3QfUgoFY+Y2A?= =?us-ascii?Q?3p1pyHYO7iwU0VZT8nT86H8KWH+lVWlrDLHHtON21ESGL7mAPoGNHHfgThAi?= =?us-ascii?Q?3ffWX0heWoi563tbqOZq/ahmg1q7VyfjE8NM5yucSOYTieFcGMlayKa22i07?= =?us-ascii?Q?/ninW2dvnZpfK2riE7t98t+I9RfXDMizwpz71F7MbftjLUnO+vhgyXuD/aS5?= =?us-ascii?Q?un/f7nv5SK0452ZG019oFEFezT/6bKXtAaboH0msbcFD1Qexb70jR3Y2sFi2?= =?us-ascii?Q?hNhh/NQzfeb3yCKEsCdGQY6BHr0I9f/wxNYAvTjAOumkj+utJ26A4bEOb3Te?= =?us-ascii?Q?HBxPa40wsetbFHibvgq//YzidRmg/FkALmsZ6dezVCfzxp79KTksAlD2g61E?= =?us-ascii?Q?RVzpoeF1TEFSjDbrqZ/T9Ni1GmbdDI+Ry7Qg02gHLGFeXyYADKNvNNol7j2Y?= =?us-ascii?Q?nfW7FrpyYsZFFav0zMyqGcXKbvJ+UKEfLEPOP12zEA+b8TzAYdaMJiHDQiwU?= =?us-ascii?Q?RfEhYyw01nFXgq45Kpx0cP8u1L01zm/NBhrlBCMr+enEL3mZ5hU5FJNG/H7H?= =?us-ascii?Q?VkAl5roKgIhm9Np5uxQ1n5MT?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2e4ad014-cd9b-4e7c-7ed8-08d9309d362e X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8602.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2021 08:03:22.7537 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: uQrcSnKU5obLMsQ/vHiq6lZGspUODV+8sbApGbxBRbP30Fp6SStjfK78aKFlDioO X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8793 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.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 15G83SwK002335 X-loop: libvir-list@redhat.com Cc: mprivozn@redhat.com, Lin Ma 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.84 on 10.5.11.22 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 Content-Type: text/plain; charset="utf-8" Signed-off-by: Lin Ma Reviewed-by: Michal Privoznik --- tools/virsh-volume.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index daa205ea67..1da9b7217f 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -1643,11 +1643,7 @@ static const vshCmdInfo info_vol_key[] =3D { }; =20 static const vshCmdOptDef opts_vol_key[] =3D { - {.name =3D "vol", - .type =3D VSH_OT_DATA, - .flags =3D VSH_OFLAG_REQ, - .help =3D N_("volume name or path") - }, + VIRSH_COMMON_OPT_VOL_NAME(N_("volume name or path")), VIRSH_COMMON_OPT_POOL_OPTIONAL, {.name =3D NULL} }; @@ -1679,11 +1675,7 @@ static const vshCmdInfo info_vol_path[] =3D { }; =20 static const vshCmdOptDef opts_vol_path[] =3D { - {.name =3D "vol", - .type =3D VSH_OT_DATA, - .flags =3D VSH_OFLAG_REQ, - .help =3D N_("volume name or key") - }, + VIRSH_COMMON_OPT_VOL_NAME(N_("volume name or key")), VIRSH_COMMON_OPT_POOL_OPTIONAL, {.name =3D NULL} }; --=20 2.26.2