From nobody Thu May 2 16:31:46 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 162371765483616.947251606549116; Mon, 14 Jun 2021 17:40:54 -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-584-46MrPAMhMY6iPDSnINMUww-1; Mon, 14 Jun 2021 20:40:51 -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 D4024EC1A0; Tue, 15 Jun 2021 00:40:46 +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 B146F60E3A; Tue, 15 Jun 2021 00:40:46 +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 7DF371806D10; Tue, 15 Jun 2021 00:40:46 +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 15F0cvb3001773 for ; Mon, 14 Jun 2021 20:38:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4CED72077FA2; Tue, 15 Jun 2021 00:38:57 +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 47E232077FA0 for ; Tue, 15 Jun 2021 00:38:55 +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 E8094811E9C for ; Tue, 15 Jun 2021 00:38:54 +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-448-5SJV6bTYMOqrSilkzH3ARw-1; Mon, 14 Jun 2021 20:38:52 -0400 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04lp2058.outbound.protection.outlook.com [104.47.12.58]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-3-OMkNXm51PouWYILk2nQtAw-1; Tue, 15 Jun 2021 02:38:50 +0200 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) by AM9PR04MB9013.eurprd04.prod.outlook.com (2603:10a6:20b:409::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.24; Tue, 15 Jun 2021 00:38:49 +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.4219.025; Tue, 15 Jun 2021 00:38:48 +0000 Received: from localhost (139.212.198.59) by HKAPR03CA0002.apcprd03.prod.outlook.com (2603:1096:203:c8::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.9 via Frontend Transport; Tue, 15 Jun 2021 00:38:48 +0000 X-MC-Unique: 46MrPAMhMY6iPDSnINMUww-1 X-MC-Unique: 5SJV6bTYMOqrSilkzH3ARw-1 X-MC-Unique: OMkNXm51PouWYILk2nQtAw-1 From: Lin Ma To: libvir-list@redhat.com Subject: [libvirt] [PATCH 01/12] virsh: Add comp-methods completion to migrate command Date: Tue, 15 Jun 2021 08:38:21 +0800 Message-ID: <20210615003832.5571-2-lma@suse.com> In-Reply-To: <20210615003832.5571-1-lma@suse.com> References: <20210615003832.5571-1-lma@suse.com> X-Originating-IP: [139.212.198.59] X-ClientProxiedBy: HKAPR03CA0002.apcprd03.prod.outlook.com (2603:1096:203:c8::7) 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: 712d165f-dc76-4ba5-5c9c-08d92f95f0cc X-MS-TrafficTypeDiagnostic: AM9PR04MB9013: 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:561 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: yC8pYmRgjDQCTPXaOCWBxhq8p+2H1J2oCldTKTMPnEN1kiBlIavfvzAVkbYuAk/7D/HMzHxZkTABKtbybnOk0LIwwyz3qRentRQGwBR3/KVPqb6Pu449JSM50yzercA8Sj6BxRY+uFY62M9XQboDbV/r+NVcVKa9epNrXXXfMod+AuJf29fGOaTnOl4hycOMtxJAiR9my8+pyZ4AX9/7XG8QucjOlejuJ6ebF28TwSZhYiSBOYZyonErF6+HGh+erTYaJ5Z67n3ciRZvdcvSFHKJACAJykynVezXjy7TVNBq1lm//Fh2zfLBgmM/bd1wbq3SoJzD/hciA01a/8AfVVVD3ZNUpz+EwcDwpv+lhZ30Xy6LOzZO7nd6x2DRjJx+FKc6B7rkCfxrqE4/q076oLi2d2RjHIg+pqIAsE6OOX/3/ACqSvIMVxsJuqFpd17TBwe6RJVRoqQVpvZAeebJZ0OAyhYL4HRiVxRCMHkEh40Dz6k7Nzz5t0xmY/jVszbZnASHdUF1J6UzkfrHppY/c1eX8FzuerGA1M+xVq4zRAFVPoy2TfPV3QkcPJhkflbb2oAgsfPmv/wW/w8FCMTN/nTFHd7OUW4zCSsi6X4gURI= 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:(39860400002)(346002)(366004)(376002)(136003)(396003)(107886003)(186003)(16526019)(36756003)(6486002)(4326008)(478600001)(316002)(5660300002)(66946007)(66476007)(66556008)(6916009)(86362001)(38100700002)(8936002)(26005)(450100002)(956004)(1076003)(6496006)(2616005)(6666004)(8676002)(2906002); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?1bdeg8/iNyzTaWIs8WUVG5cAYX4sxdQ1jkLYASASublVsRN2IJCkbxhHPfCV?= =?us-ascii?Q?fNHjC1/LalJNWD9rW+fZKk6Efqj4FPOnGtPDYpjvqkUBHrShfXnhIOQk/JH8?= =?us-ascii?Q?sjGxSit3OwLuCahpJLt/Aasnk2YpsUhWSgj51Yt5fMx/AeejI6nDKyayzYLM?= =?us-ascii?Q?G2Nl0zBnWvYmoJdevK15wZARQ3xyOMVlS300kyC7KyGBXsziWKgwIAa/CMn5?= =?us-ascii?Q?NK5/+G8Z78sXUuu1JjexeAH0SNvz9GQZjHplk/0oZKveDVmWB3t1w+mLHlRK?= =?us-ascii?Q?ymx3KOqmSjqP85UHZmQ7Re2PWzTxbE55wMd+BoTAE1dHUr7K6FjCwsoPgkLR?= =?us-ascii?Q?Rzdwqx/OegZFLADC00SykL7qrwZMfFNlEad2gxGQAUi+1RpUGJ7l/PosQB4T?= =?us-ascii?Q?r1c5CInK6OWbmC/arhUWWWDZpW8xZ4mmtZaQA2MQLM985u1k+AqxaPomeLHR?= =?us-ascii?Q?J9NkiWxDItkEsvYOnKH3e6UTO1ek+KLyn9pggtW2o/L6bBG12M7ygwIh8S7d?= =?us-ascii?Q?DqRoWaHtJucZYhAkv+RjXtCUuZ11KZWBy2yV4TT6ay8B3HR8LFSay15zV6zr?= =?us-ascii?Q?qH32+pBJ6hj3AYCOx+9t/3s3gWc6VN0r1qUlWMGnn8tdei5uKItYc7VRGuXz?= =?us-ascii?Q?Qj3GqP4BkiJc56HObl646TEOsak30+F53qyDXTqyJEY66L1eFbPaVnXxU1ev?= =?us-ascii?Q?j5g12jVpraoTKF2yZPT15IiQpouscY9WX0Cm7+ioCunlLbPsAMHrtsEvLnCJ?= =?us-ascii?Q?ZQCEfnju6rJ/o1fJJbbTUfSJmwdS4a3OGpauHJBqQAWVK4kAex13vwDNkT/4?= =?us-ascii?Q?05oFxYiQ0R34Ajuztc3SoSCt1gY3WZg5MLV1gc1OMQfFJOVO1ixF4mACgT9e?= =?us-ascii?Q?kg/4qdZ8DF3A99HurEaP9t3zQ3mvsl50ZPe6tZRDwMUqc25uE+pekqrTIAJg?= =?us-ascii?Q?7EJFSyhVdWPK0VbOjlUbHa6O+0uuFJeMRq8GSJl0XSB8zpBkl+Z+fqDzBOQJ?= =?us-ascii?Q?EffpY1pxvjmyArfvSJb5cDuoT00sepMmMJmBmGIGpiEEypD2ehnDJ+TYyy+P?= =?us-ascii?Q?yy1L2JLjq2oCjyEEyS1aBJ2Kv3iWCREiT1y8myn9pVFys+l5a36eHmf9BHxX?= =?us-ascii?Q?tDAINcGenXThKH6OFSY5LLG4aNzJsn5uoidXhvY/GbJclv4H+ZCbbIfH/9XI?= =?us-ascii?Q?U9No6mGF7YtimpbcRmgAbc4wq0vLQebNmsXwkEtmUCrg+bCranzofJnSfR7w?= =?us-ascii?Q?eIhOYs/wFKQMUy4VIzXHgMQzPPdXZOuPxQObVD/PEhIEhR7Sy6aM8GuZq5LY?= =?us-ascii?Q?j9F89pUhLWLUqFeEOJAgq8q9?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 712d165f-dc76-4ba5-5c9c-08d92f95f0cc X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8602.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 00:38:48.7328 (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: xzVuHjXUn5gY/Vw6viR/2MwIQZsZqRVMEMC3LzBoNp9UDpKCfCjigo4fDqk+cTsW X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB9013 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 15F0cvb3001773 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 --- tools/virsh-completer-domain.c | 17 +++++++++++++++++ tools/virsh-completer-domain.h | 5 +++++ tools/virsh-domain.c | 1 + 3 files changed, 23 insertions(+) diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c index 20d503ff09..256ac0b593 100644 --- a/tools/virsh-completer-domain.c +++ b/tools/virsh-completer-domain.c @@ -959,3 +959,20 @@ virshDomainCoreDumpFormatCompleter(vshControl *ctl G_G= NUC_UNUSED, =20 return ret; } + + +char ** +virshDomainMigrateCompMethodsCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags) +{ + const char *methods[] =3D {"xbzrle", "mt", NULL}; + const char *method =3D NULL; + + virCheckFlags(0, NULL); + + if (vshCommandOptStringQuiet(ctl, cmd, "comp-methods", &method) < 0) + return NULL; + + return virshCommaStringListComplete(method, methods); +} diff --git a/tools/virsh-completer-domain.h b/tools/virsh-completer-domain.h index 4e16d84514..5d56090504 100644 --- a/tools/virsh-completer-domain.h +++ b/tools/virsh-completer-domain.h @@ -127,3 +127,8 @@ char ** virshDomainCoreDumpFormatCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); + +char ** +virshDomainMigrateCompMethodsCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index ecad3a5e5d..0100652e76 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10619,6 +10619,7 @@ static const vshCmdOptDef opts_migrate[] =3D { }, {.name =3D "comp-methods", .type =3D VSH_OT_STRING, + .completer =3D virshDomainMigrateCompMethodsCompleter, .help =3D N_("comma separated list of compression methods to be used") }, {.name =3D "comp-mt-level", --=20 2.26.2 From nobody Thu May 2 16:31:46 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 1623717559061729.4972710191613; Mon, 14 Jun 2021 17:39: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-541-YJcW_EBtNuWKOggKKlWJ7A-1; Mon, 14 Jun 2021 20:39:16 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E981B803620; Tue, 15 Jun 2021 00:39: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 A289A19C66; Tue, 15 Jun 2021 00:39:08 +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 CE2371809C80; Tue, 15 Jun 2021 00:39:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15F0d30i001808 for ; Mon, 14 Jun 2021 20:39:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 329EC63ABA; Tue, 15 Jun 2021 00:39:03 +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 2CCED63AB9 for ; Tue, 15 Jun 2021 00:39:00 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.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 9639A101A55F for ; Tue, 15 Jun 2021 00:39:00 +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-174-aX46KpzPMYeC3sJKjKlYhQ-1; Mon, 14 Jun 2021 20:38:58 -0400 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03lp2058.outbound.protection.outlook.com [104.47.9.58]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-7-kzKgZRpuM3aHFUXZVEI51A-1; Tue, 15 Jun 2021 02:38:56 +0200 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) by AM9PR04MB9013.eurprd04.prod.outlook.com (2603:10a6:20b:409::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.24; Tue, 15 Jun 2021 00:38:55 +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.4219.025; Tue, 15 Jun 2021 00:38:55 +0000 Received: from localhost (139.212.198.59) by HKAPR03CA0013.apcprd03.prod.outlook.com (2603:1096:203:c8::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.9 via Frontend Transport; Tue, 15 Jun 2021 00:38:54 +0000 X-MC-Unique: YJcW_EBtNuWKOggKKlWJ7A-1 X-MC-Unique: aX46KpzPMYeC3sJKjKlYhQ-1 X-MC-Unique: kzKgZRpuM3aHFUXZVEI51A-1 From: Lin Ma To: libvir-list@redhat.com Subject: [libvirt] [PATCH 02/12] virsh: Use VIR_ENUM_* for --target argument in cmdNodeSuspend Date: Tue, 15 Jun 2021 08:38:22 +0800 Message-ID: <20210615003832.5571-3-lma@suse.com> In-Reply-To: <20210615003832.5571-1-lma@suse.com> References: <20210615003832.5571-1-lma@suse.com> X-Originating-IP: [139.212.198.59] X-ClientProxiedBy: HKAPR03CA0013.apcprd03.prod.outlook.com (2603:1096:203:c8::18) 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: a81fda63-bd3e-426a-55e0-08d92f95f487 X-MS-TrafficTypeDiagnostic: AM9PR04MB9013: 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:2958 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: tDM/0WsM2FGZNelUPBll1mpgBCC6BVWFX8Fl4uyJoN6URXjkSNmtdknaGCX1T/2UFZX5HKBm4ZKpJ9LrNwuDUthSphOJTT7m1oMHx5ILLKIPEMBkyjBLXcXD6vckQtu44aLkOMAIBV+SS+vW2oYzM9q9+ICSznzy+XOb7H0KjFmCzISAFVa2SKAuryI82pc6/TNQdAvuWp5GaX+lv8bb+6Vwr1C0FLJcrXium9HpEl1F5N2omgy9p+tQY2TtUhXBiUGmjpkh8gvo/NSb06hd1nL4iJD/o3TAyc0SA3u4OQ+rj/vTONWbgHbZsF9L+BCGW5Sy5+TQqx7XjocsvmhaetbIUAxI3VfwVSd6D8veazBlsxYWYYV3J1QPfwbXN13Htl3N3md5y3X1/37X9pM+aTG2r1k/gqLXIN4EEBj67xF54rgwmykfRY3lGTBzVnkfNkVUu6Wg2mcfNBkhF2FDQ6Ok0H1N5iB8TLZ5fUN5EUUCDCrign/T6ERFUfCctqwQlMiF1iL3qei6FJ5Og0wiXEva82dO5rBQxCIMUCljzDixFPHFkl8gmH7RKS+FUdB90ArImzKaaeMGmWhjNyBxWrqTuRIPCLJf1PzS2c/l+rQ= 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:(39860400002)(346002)(366004)(376002)(136003)(396003)(107886003)(186003)(16526019)(36756003)(6486002)(4326008)(478600001)(316002)(5660300002)(83380400001)(66946007)(66476007)(66556008)(6916009)(86362001)(38100700002)(8936002)(26005)(450100002)(956004)(1076003)(6496006)(2616005)(6666004)(8676002)(2906002); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dD4aFAYpSvlim/e7PlIhhgUT8G3gj3MmNINuIjrJ5wso6IGiuyjJUWORw9yg?= =?us-ascii?Q?ajTOBWtGbhvM07/hii5J7zsR9e9+I0hbpBKySlgV+JPEX9YdeaGKdr36EsqP?= =?us-ascii?Q?x/oVrDO6+qyvlX0tVsf5JSrkD/glYE8DGhA+PBn4E3Xv/kFphP2q1VmIRAk4?= =?us-ascii?Q?6EWhfbkx3hH+nfubGvv18QTdEbtJcJFziIVZuFOBmUyo4PaD4tq8lLcrVNYe?= =?us-ascii?Q?kkcWmzHjrKUa9y23S4JViMFnhZmtlkaJZClXKh0RqkRqwHSm3TJUy/zSpweR?= =?us-ascii?Q?3/C+MxzLQDyrtSto+kX9Lkxxrv78xvFqEF7jzX9s5iwkzbpH7GTzWWum9Xe8?= =?us-ascii?Q?ulnp5XM2WluTct++n314zHEzShOrfT8UY6sraelCBOZc0r7SExCImZ9Uj7/p?= =?us-ascii?Q?5UBQexRbIA8t5kTdJcM7+YQhUTgujLLB6i4Asnjgn4oRQtwpqEgL1GX7BlA3?= =?us-ascii?Q?EA0dqlwZLou9Ul1Hk6r6wUBXsrXddAgCMEhLG0n85wzTVHv9iXTIjGMDtNv8?= =?us-ascii?Q?A4hBzxwMwJk3FGgz+SaEYH1P7mHLShBoR/pLko0Big8elVfvAovMbOmcC4aO?= =?us-ascii?Q?otCuO/NqK00OSgpi9U2Wr7QdxuBvkC6emSkN1ZxoGcEgsqySThvrmrYUCxda?= =?us-ascii?Q?fU/ZZUxaHTMmmNVqDdfMr8v/C9zcFsQhHZxBh7BYXD7gZpmDP9WYBlX4wfwO?= =?us-ascii?Q?OmaKng56jyIBTz//D3f7hhEAe/ob8KnN5h5Oqg6u9RuTRkfCeNzB6DfLFO1h?= =?us-ascii?Q?bhYid9ePmuD4Ihgc2ohemB26qoWnBiZhT7GATlJoxaF/zKHE0eVSNOTVZPGY?= =?us-ascii?Q?6Lc/tlizlRRr4zisboQ6P3IbDv18yYxhYXXwC/rNzZ4S4S8/qrasXxTYRax7?= =?us-ascii?Q?gs7Ed7CXBHIT1X70z/1Ln1J3nqAasnuR2ktykzWdd6fQ1rGWHGs8IiTkVqpF?= =?us-ascii?Q?O9QuCchnfSXALvpESHNXz0z9hMaLQD/1iq/oTVbmk7Oh2tha9n7TaS5usvHl?= =?us-ascii?Q?LSHHL1i/jxUi4uMrs/3k/bKomlz9UK2/blKNEo3FCTnGJhNRlbFCmHt9IIL/?= =?us-ascii?Q?BXbdmQSB6/Z1B2pLwgynbBAPRfg4/dbECiWp76JVZs6Sj5Dx/Jn89vmwgYc1?= =?us-ascii?Q?o/oCiiNkAXJ3W7A10T4Q4OhZOnXjZ0exZ7WwN735mB+xYSBKPPykjnJM/7jN?= =?us-ascii?Q?zfUaTHKHSqRy2Ro5avxXGKTV78UcwPdVkmAxVf98jI0/zVOrU5OQAKHMCnIh?= =?us-ascii?Q?dgBICL6fwsrMrIdgrBLZSUq3CsHRHV3QIs24hBfOwtGdhtzGysDGfiwz0sHz?= =?us-ascii?Q?+lPlcAJV74DObkuFD6R8nDr9?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a81fda63-bd3e-426a-55e0-08d92f95f487 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8602.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 00:38:55.2093 (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: nP2ZiYLStDylU5AvykH4Fo40ijsLYLSCM9SXyA2z0eutZU1Qe/+yiWJGnGrkBwx4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB9013 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.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 15F0d30i001808 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.23 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 --- tools/virsh-host.c | 17 +++++++++-------- tools/virsh-host.h | 3 +++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 1eca0bc231..9d6d2b3645 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -950,6 +950,13 @@ cmdNodeMemStats(vshControl *ctl, const vshCmd *cmd) /* * "nodesuspend" command */ + +VIR_ENUM_IMPL(virNodeSuspendTarget, + VIR_NODE_SUSPEND_TARGET_LAST, + "mem", + "disk", + "hybrid"); + static const vshCmdInfo info_nodesuspend[] =3D { {.name =3D "help", .data =3D N_("suspend the host node for a given time duration") @@ -980,7 +987,7 @@ static bool cmdNodeSuspend(vshControl *ctl, const vshCmd *cmd) { const char *target =3D NULL; - unsigned int suspendTarget; + int suspendTarget; long long duration; virshControl *priv =3D ctl->privData; =20 @@ -990,13 +997,7 @@ cmdNodeSuspend(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptLongLong(ctl, cmd, "duration", &duration) < 0) return false; =20 - if (STREQ(target, "mem")) { - suspendTarget =3D VIR_NODE_SUSPEND_TARGET_MEM; - } else if (STREQ(target, "disk")) { - suspendTarget =3D VIR_NODE_SUSPEND_TARGET_DISK; - } else if (STREQ(target, "hybrid")) { - suspendTarget =3D VIR_NODE_SUSPEND_TARGET_HYBRID; - } else { + if ((suspendTarget =3D virNodeSuspendTargetTypeFromString(target)) < 0= ) { vshError(ctl, "%s", _("Invalid target")); return false; } diff --git a/tools/virsh-host.h b/tools/virsh-host.h index 92328c7deb..840f0b4538 100644 --- a/tools/virsh-host.h +++ b/tools/virsh-host.h @@ -21,5 +21,8 @@ #pragma once =20 #include "vsh.h" +#include "virenum.h" =20 extern const vshCmdDef hostAndHypervisorCmds[]; + +VIR_ENUM_DECL(virNodeSuspendTarget); --=20 2.26.2 From nobody Thu May 2 16:31:46 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 1623717571240498.0986307142432; Mon, 14 Jun 2021 17:39:31 -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-413-Pd6W9v0MMLesLIheIyA-Gg-1; Mon, 14 Jun 2021 20:39:27 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C70918015D0; Tue, 15 Jun 2021 00:39:22 +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 2981C19C66; Tue, 15 Jun 2021 00:39:22 +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 B761F1809CBC; Tue, 15 Jun 2021 00:39:21 +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 15F0d8Yk001815 for ; Mon, 14 Jun 2021 20:39:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2B9B82077FA0; Tue, 15 Jun 2021 00:39:08 +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 26DE82077FA5 for ; Tue, 15 Jun 2021 00:39:08 +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 EC04B80D0E1 for ; Tue, 15 Jun 2021 00:39:07 +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-287--lc8MgitP9C4wFk_IuOBbw-1; Mon, 14 Jun 2021 20:39:05 -0400 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03lp2054.outbound.protection.outlook.com [104.47.9.54]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-4-fMwvkYy7NsmFe2TystkXcQ-1; Tue, 15 Jun 2021 02:39:03 +0200 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) by AM9PR04MB9013.eurprd04.prod.outlook.com (2603:10a6:20b:409::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.24; Tue, 15 Jun 2021 00:39:01 +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.4219.025; Tue, 15 Jun 2021 00:39:01 +0000 Received: from localhost (139.212.198.59) by HKAPR03CA0015.apcprd03.prod.outlook.com (2603:1096:203:c8::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.9 via Frontend Transport; Tue, 15 Jun 2021 00:39:01 +0000 X-MC-Unique: Pd6W9v0MMLesLIheIyA-Gg-1 X-MC-Unique: -lc8MgitP9C4wFk_IuOBbw-1 X-MC-Unique: fMwvkYy7NsmFe2TystkXcQ-1 From: Lin Ma To: libvir-list@redhat.com Subject: [libvirt] [PATCH 03/12] virsh: Add target completion to nodesuspend command Date: Tue, 15 Jun 2021 08:38:23 +0800 Message-ID: <20210615003832.5571-4-lma@suse.com> In-Reply-To: <20210615003832.5571-1-lma@suse.com> References: <20210615003832.5571-1-lma@suse.com> X-Originating-IP: [139.212.198.59] X-ClientProxiedBy: HKAPR03CA0015.apcprd03.prod.outlook.com (2603:1096:203:c8::20) 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: cdad91e3-ac0e-4a6f-4978-08d92f95f874 X-MS-TrafficTypeDiagnostic: AM9PR04MB9013: 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:1091 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: ablkUOgVb4aRUgtcqlzw4x8LtPlqmOkAqXGNjk6JBhzpwq7x8kwIYOz6pfj1dauUxi+jWod4zbuwdUnx+QA9fMgJH9xPeFK+RfdpopLtm+LajvslBuFJAOxi5SExtqmEEff9fxGehXQ7RGLXzD/uGolbmmuKtYvsetJSlS+rIfHLLWmxqNxDCvFlEzFmKRbi3vtZOuOZeJALWIpsWakvURo0G0FxHJfBdfrIbmomWAQYqnbUdI7MQPcIUkce5YqlkZmTLtlqF/nHEDJU/Nps9Ze3dIWg9Uk07qQlXC8omo2D71PV6mLjymi115XFrWW43Mp3laSrXNKtI5Rqkhm9XG7vNwPhw7HWcwokKV9WeOKfRjogECYRhk25OPapSuaa+SxujjlgE1hbl6BUl8LIYfgOkFA+WY7evioozUQ5WULD1G+mj4NEuSMKND0oO398CpvujkE/4XORnJmXhwHEeWwHgs31NwntZxVdYU3l0wChKTvYulhZ3F6aLgGPmTskv6bBdJxWLdXr21fOIU975oJyPmjw0Tg86+AOlqdssOXxuguWpd1Fj622qZD6ve8foTq1Ge9bEsI47WWR7NYja8JmTB9jXJoP93sfmwoL/ag= 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:(39860400002)(346002)(366004)(376002)(136003)(396003)(107886003)(186003)(16526019)(36756003)(6486002)(4326008)(478600001)(316002)(5660300002)(83380400001)(66946007)(66476007)(66556008)(6916009)(86362001)(38100700002)(8936002)(26005)(450100002)(956004)(1076003)(6496006)(2616005)(6666004)(8676002)(2906002); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0/7dRGJ2LfSZMSfujqVOIicua4JN/SB7tjEY/VKXwuPWpWNaT0HbnPWnOojb?= =?us-ascii?Q?TU8aUg1cPxXqaL67tXvOIz03v98pCywyrmnIBQKPUGbRWADJQHlduAymzwE2?= =?us-ascii?Q?jq6AfdswFY/t6Bm9jrxgqfvpydHFfNn99h0GghC0oQ0dP7iftMd9BwrVEHha?= =?us-ascii?Q?B77aS/joHvBRPMqYH7WRAky7K0EWlA0HKpaCAem0mzVeNa5Ic9HTP7BVMlFQ?= =?us-ascii?Q?Zcj4bKHzWHQhD/bEdd5dm3ZYe3HkISpRhFeCXDRVK+hZsfFEptj4GTjiBbvV?= =?us-ascii?Q?RahSsa2dZ7s2fqVxriUJqnb3zsfPCad1DsjQojYEXTABDRQGZdS+xnSdIcyS?= =?us-ascii?Q?OidXcjwlYsvgMSf3Gbhlo2l3xEJySvycD1nXMslo8q9k+NQizroUTrlyACgT?= =?us-ascii?Q?UfwzypXMydBq4SYic99+WFJt3gN7oWQqgztfbC8aPc6oZ3rl28+69wNTQ89+?= =?us-ascii?Q?mNum2CvkCFjfeQCEc6wFZNNWxQ0Rp8c4wj+lSrsiLpciVz7MCj3WJXqpvGgu?= =?us-ascii?Q?YdTKFyPjTCPz8xgnaf8/w9vsoXVhvGZ6HFuzWyXfz6f+c3kZ6pCHrijTpRK4?= =?us-ascii?Q?DwEpSPz09IYIyKbpr8hjVhdnd7+lCbcF8VrC2ZpnRA6oK2ajEzMDZ/T3Wvz1?= =?us-ascii?Q?3euf2H8tKcSvfQKBitjp+8N1mnOSb/UzljUEnX6elVcv7bufO1HHLsTz5rpB?= =?us-ascii?Q?wYYnaavNmCt3Mk3jj+wwpPzQzqQY55gSukRmnSTfDlCbZdj+0NNXAXdy4hRo?= =?us-ascii?Q?CtajBLFoVb9haHvhXpq2PN1HoTNgrSyG0kQ91bUZFOKc2bZPqfzAnRdmEAuC?= =?us-ascii?Q?yKa2wDfr9UOPPN2Wft5qTCT+NgeEUQ3KLvx3jFKcP3TEpGG+zMAltqHWnXTd?= =?us-ascii?Q?VmqDFAfe4j5d8/7DGEHJRkbkZsahfUmx01x4/gEefwJ4B4W7tLCYaQHilahB?= =?us-ascii?Q?D0LgLPkcdVotG1qQcDZswXXqIAKJleRlmz3wvPhgrSikjZN9t9Bh6JUzbwEQ?= =?us-ascii?Q?vPv4aRkvezixVWhboEGv+/N+Ygg7Kf4CvqfU4+uA1rPJQUko0DRWkL3OGX8D?= =?us-ascii?Q?8KSHpPdchbxkcqsn7uFut/aqvqAgN/GLDQRS33buBGbMIcOvjNbtceuXx6Lz?= =?us-ascii?Q?vcoaOxBzHL1N11pqAXcjQ8v9kATjMJ8wOHWTRqFy55odU4VoJTrhbUHqOg8D?= =?us-ascii?Q?RCMNw5XfutVO/viqUqPdZz0tXEhC6STwHBd8flPdPrSAQWDgoV/DetqG6gnC?= =?us-ascii?Q?OlPq5Ctu8+EsnXmauWm9pkc+kuJIpL1MnQsxCqJAHdY9Pb9ccO5Rw/Va36tm?= =?us-ascii?Q?pGDKhurmTc5TAXR+HwIf1prV?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: cdad91e3-ac0e-4a6f-4978-08d92f95f874 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8602.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 00:39:01.7526 (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: B6o3NFcPcWPpFZxDHi+MlV/uBZPXf/F1sQWha5ftENBKfXywUTegbC/4UjfMto2L X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB9013 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 15F0d8Yk001815 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.23 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 --- tools/virsh-completer-host.c | 20 ++++++++++++++++++++ tools/virsh-completer-host.h | 4 ++++ tools/virsh-host.c | 1 + 3 files changed, 25 insertions(+) diff --git a/tools/virsh-completer-host.c b/tools/virsh-completer-host.c index 213f029552..d17bc5f5ce 100644 --- a/tools/virsh-completer-host.c +++ b/tools/virsh-completer-host.c @@ -26,6 +26,7 @@ #include "virstring.h" #include "virxml.h" #include "virutil.h" +#include "virsh-host.h" =20 static char * virshPagesizeNodeToString(xmlNodePtr node) @@ -167,3 +168,22 @@ virshNodeCpuCompleter(vshControl *ctl, =20 return g_steal_pointer(&tmp); } + + +char ** +virshNodeSuspendTargetCompleter(vshControl *ctl G_GNUC_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, + unsigned int flags) +{ + char **ret =3D NULL; + size_t i; + + virCheckFlags(0, NULL); + + 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)); + + return ret; +} diff --git a/tools/virsh-completer-host.h b/tools/virsh-completer-host.h index a502216584..88106ec3db 100644 --- a/tools/virsh-completer-host.h +++ b/tools/virsh-completer-host.h @@ -33,3 +33,7 @@ char ** virshCellnoCompleter(vshControl *ctl, char ** virshNodeCpuCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); + +char ** virshNodeSuspendTargetCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 9d6d2b3645..f42e995122 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -972,6 +972,7 @@ static const vshCmdOptDef opts_node_suspend[] =3D { {.name =3D "target", .type =3D VSH_OT_DATA, .flags =3D VSH_OFLAG_REQ, + .completer =3D virshNodeSuspendTargetCompleter, .help =3D N_("mem(Suspend-to-RAM), disk(Suspend-to-Disk), " "hybrid(Hybrid-Suspend)") }, --=20 2.26.2 From nobody Thu May 2 16:31:46 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 1623717659230189.13235895771516; Mon, 14 Jun 2021 17:40:59 -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-300-DYJydUa9N_mAlu4pQ4VMvQ-1; Mon, 14 Jun 2021 20:40:54 -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 CF512100C671; Tue, 15 Jun 2021 00:40:49 +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 AC8567012B; Tue, 15 Jun 2021 00:40:49 +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 76F66180121E; Tue, 15 Jun 2021 00:40:49 +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 15F0dGDr001847 for ; Mon, 14 Jun 2021 20:39:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3BCC32077FA0; Tue, 15 Jun 2021 00:39: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 36C702077FA2 for ; Tue, 15 Jun 2021 00:39:13 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.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 B929F811E9C for ; Tue, 15 Jun 2021 00:39:13 +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-88-4O6l-6yWOziDdW8BYPTxkQ-1; Mon, 14 Jun 2021 20:39:11 -0400 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04lp2050.outbound.protection.outlook.com [104.47.12.50]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-10-pMzqUdZSN3ePvrVmnRmSaA-1; Tue, 15 Jun 2021 02:39:08 +0200 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) by AM9PR04MB9013.eurprd04.prod.outlook.com (2603:10a6:20b:409::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.24; Tue, 15 Jun 2021 00:39: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.4219.025; Tue, 15 Jun 2021 00:39:08 +0000 Received: from localhost (139.212.198.59) by HKAPR03CA0003.apcprd03.prod.outlook.com (2603:1096:203:c8::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.9 via Frontend Transport; Tue, 15 Jun 2021 00:39:07 +0000 X-MC-Unique: DYJydUa9N_mAlu4pQ4VMvQ-1 X-MC-Unique: 4O6l-6yWOziDdW8BYPTxkQ-1 X-MC-Unique: pMzqUdZSN3ePvrVmnRmSaA-1 From: Lin Ma To: libvir-list@redhat.com Subject: [libvirt] [PATCH 04/12] virsh: Use VIR_ENUM_* for --target argument in cmdDomPMSuspend Date: Tue, 15 Jun 2021 08:38:24 +0800 Message-ID: <20210615003832.5571-5-lma@suse.com> In-Reply-To: <20210615003832.5571-1-lma@suse.com> References: <20210615003832.5571-1-lma@suse.com> X-Originating-IP: [139.212.198.59] X-ClientProxiedBy: HKAPR03CA0003.apcprd03.prod.outlook.com (2603:1096:203:c8::8) 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: e6447839-5cf7-488b-a10f-08d92f95fc54 X-MS-TrafficTypeDiagnostic: AM9PR04MB9013: 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:346 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: LrtaQAOiEHawJSolUwPz76LtdlxzfN4GeN9Rft22QmTsJBbN280TzjCzkINhY59Yz+YhSmLU7VWh12tQrmegiWnNb9P0+pzTDURfyF0F8cPHm1ZUSz25U7UjkPvpwFThohaT4iuUjQBkoD3nF0HDofADMgxqoHLZ3NxfIUujjGqFCHKOtlwMluigqi0I5MomkAUKjFw6pITz+BErnz8keBSaR7H450nlhgwOKh0Swix5goa7x6cIfKxqPjYB9KhImTelwkOFG2knB23WBrg4hbo32A8rKnaSBRWRkmWTgr4v0UM3V+oQ95bIHxuMVRUTAGCcSHnRaX3VBXGpxZIZrjE6Dl4g5+UW/iQ1ukgpYQz8VSp3Dj2sTrKJA3QazxSjPtTTknk4HmScr1SkqYafNtBmomvyBtHImPzoQ1LvGamca8C18mQV5GP8R1ROnZgKfrvdb6nEuY1gRnHuoSKBclYCFWRTsxJMi+mU4F5NQrtl0/PGVitZkM1bNFEKuuaLsndzXKpwOiwYFZ9jqMitHkXkCFcTkhf8eiZ8A7kpdr8ajIQwlExFDlLpjuJTWfOOa6IyLqkuUn0WHPDIIH49vQW2accgPgzWshMMQ0x41Q4= 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:(39860400002)(346002)(366004)(376002)(136003)(396003)(107886003)(186003)(16526019)(36756003)(6486002)(4326008)(478600001)(316002)(5660300002)(83380400001)(66946007)(66476007)(66556008)(6916009)(86362001)(38100700002)(8936002)(26005)(450100002)(956004)(1076003)(6496006)(2616005)(6666004)(8676002)(2906002); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DEBqKciFI2G92BJIonBOEy6O0hcF5l7GZWcA85od9YTQfw9jQKnBBlWYUbML?= =?us-ascii?Q?mBkfQ/5IniZgwrqc+Spqwk/mKDaMcFiP19rwdB9nML+qOXfr5nyrlpQB17pm?= =?us-ascii?Q?q58V6h+37XTboMM922kqvW3ovgv18/s+ZOa59e/TWjbSxrWl+1V9YADg/o6r?= =?us-ascii?Q?sKmIa6b8sCgHg4QbpZe9zAMVWULGyvKtlhBUFyLwDPm2NdwP0loOaAva0N/2?= =?us-ascii?Q?aErddF8JQxA49OEKPVKpjzY4WlFsP2Y7Id6q1PKHvWPqF4SBZjCjtRx/i+G/?= =?us-ascii?Q?ktXpX7yiBy1PJxOCosXDp1Ztk3nj/LRXlq9aAYuwvZWQ9t92o+PinZLBhrfH?= =?us-ascii?Q?9t00Bs28QIcrIVL1ZrF2dJT024swLvVRQhqVClrE1Nc3E3O5F4E9Tsb65Gtq?= =?us-ascii?Q?w8LWBnPZXNzNDLaDEtMEExqBhi2MeO0BGpbL//78yN2NuAmcAb6ZMU3VpKT5?= =?us-ascii?Q?wW15KLUWy3ap1eo/laEKagEkBqNaRhm/5CkhGqBKZJiw1fOz++feIlvKdfCP?= =?us-ascii?Q?p/JyMMEanPVYTrHev/C5/iIM6OhSA3P6dQLYH81sta9SYPE7R/qnKgx12XWA?= =?us-ascii?Q?8WulmEpTGn++V9U2RkUXTmvxGwSh5fkDmWeuKrWcAs1bqMaqpxXidl+BUKge?= =?us-ascii?Q?XERkEfLtAPdEsUwn+IVXfgsX3vtrtdGcwSgFUCf0AHRyD7XmQP5yuqHImGOL?= =?us-ascii?Q?BGMzRkcKdishW6b18z/TE7cqJ+a5X7CGVI03jygNdlsPmXmtbyAZGuPWq7ew?= =?us-ascii?Q?8Xf1rPJAgMmH+7ovyagSwmZ9LlzGi4rPMFnUBBmrlEN0Mn3jK/yXlglyX7zW?= =?us-ascii?Q?SBZiBi3i/a8dBM6LgiDCVh334ANsl2FaSd0keqS8mMrD2tn3vE4QoRGhGldE?= =?us-ascii?Q?OKoIARdfMotJYX6sty/d+fn3VNlb4Un3H1R+X94mAS0yWzK47jc7+vSCwWvH?= =?us-ascii?Q?/06LFzeBSJSiAJdUkq4VCUCLVgXy32Xx1Fgy+E4LP6XiFKZd0zRFLRubvyDh?= =?us-ascii?Q?9Vgx6Yp7xZFkPUMN2dnLRWUpuG/7b+v8L/ZgEbp/WJERTGkUEgNgw2XBSQYY?= =?us-ascii?Q?YSV9WH0smfBPz6eg94vQgly+6zlsBVY2TthLbdeXLd0IihPHCKEWUmUB7FMY?= =?us-ascii?Q?OO+nltf037MxhARU29Xeyko1upiZijpFaGi90ZCWU1zTeJf1AsvQVppxyp/m?= =?us-ascii?Q?EgAxm+zgG9Lw5X140FAsLAKIuggK73TprlNEGrBHCbUGnZRuFsfNMR7QUxmY?= =?us-ascii?Q?aGZ0ePXjRkyiEQtmX6eK4va8IDUrau2oFsy3GfzWNsBrtuNcB6skWfggNXhb?= =?us-ascii?Q?cRSUJc3Grbl4hTtIXV/1rVp/?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6447839-5cf7-488b-a10f-08d92f95fc54 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8602.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 00:39:08.0688 (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: AORlSBKm5cm5u1z5ykbLINHIMiYlk2NDFqwg5WfEIcreZWGLaPi+ov9ptH4aN66d X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB9013 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 15F0dGDr001847 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 --- tools/virsh-domain.c | 10 ++-------- tools/virsh-domain.h | 1 + 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0100652e76..3fb37ea5e6 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3472,7 +3472,7 @@ cmdDomPMSuspend(vshControl *ctl, const vshCmd *cmd) const char *name; bool ret =3D false; const char *target =3D NULL; - unsigned int suspendTarget; + int suspendTarget; unsigned long long duration =3D 0; =20 if (!(dom =3D virshCommandOptDomain(ctl, cmd, &name))) @@ -3484,13 +3484,7 @@ cmdDomPMSuspend(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "target", &target) < 0) goto cleanup; =20 - if (STREQ(target, "mem")) { - suspendTarget =3D VIR_NODE_SUSPEND_TARGET_MEM; - } else if (STREQ(target, "disk")) { - suspendTarget =3D VIR_NODE_SUSPEND_TARGET_DISK; - } else if (STREQ(target, "hybrid")) { - suspendTarget =3D VIR_NODE_SUSPEND_TARGET_HYBRID; - } else { + if ((suspendTarget =3D virNodeSuspendTargetTypeFromString(target)) < 0= ) { vshError(ctl, "%s", _("Invalid target")); goto cleanup; } diff --git a/tools/virsh-domain.h b/tools/virsh-domain.h index 0c1cc7a630..b569dd8d91 100644 --- a/tools/virsh-domain.h +++ b/tools/virsh-domain.h @@ -44,3 +44,4 @@ VIR_ENUM_DECL(virDomainProcessSignal); VIR_ENUM_DECL(virDomainLifecycle); VIR_ENUM_DECL(virDomainLifecycleAction); VIR_ENUM_DECL(virDomainCoreDumpFormat); +VIR_ENUM_DECL(virNodeSuspendTarget); --=20 2.26.2 From nobody Thu May 2 16:31:46 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 1623717572874828.8896485229188; Mon, 14 Jun 2021 17:39:32 -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-448-x0ecPKsnP7qKWM619lz5yQ-1; Mon, 14 Jun 2021 20:39:29 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4D2F7803624; Tue, 15 Jun 2021 00:39:24 +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 20CF919C66; Tue, 15 Jun 2021 00:39:24 +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 DEE2C1809CBD; Tue, 15 Jun 2021 00:39:23 +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 15F0dMQx001857 for ; Mon, 14 Jun 2021 20:39:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7B993218B3FE; Tue, 15 Jun 2021 00:39:22 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7580E218ADFF for ; Tue, 15 Jun 2021 00:39:20 +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 039BB8007B1 for ; Tue, 15 Jun 2021 00:39:20 +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-471-xEhmAg_wMuGwugWJOOagEA-1; Mon, 14 Jun 2021 20:39:17 -0400 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03lp2051.outbound.protection.outlook.com [104.47.9.51]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-19-XvcurFPrOryr1s1_12KGug-1; Tue, 15 Jun 2021 02:39:15 +0200 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) by AM9PR04MB9013.eurprd04.prod.outlook.com (2603:10a6:20b:409::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.24; Tue, 15 Jun 2021 00:39:14 +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.4219.025; Tue, 15 Jun 2021 00:39:14 +0000 Received: from localhost (139.212.198.59) by HKAPR03CA0015.apcprd03.prod.outlook.com (2603:1096:203:c8::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.9 via Frontend Transport; Tue, 15 Jun 2021 00:39:13 +0000 X-MC-Unique: x0ecPKsnP7qKWM619lz5yQ-1 X-MC-Unique: xEhmAg_wMuGwugWJOOagEA-1 X-MC-Unique: XvcurFPrOryr1s1_12KGug-1 From: Lin Ma To: libvir-list@redhat.com Subject: [libvirt] [PATCH 05/12] virsh: Add target completion to dompmsuspend command Date: Tue, 15 Jun 2021 08:38:25 +0800 Message-ID: <20210615003832.5571-6-lma@suse.com> In-Reply-To: <20210615003832.5571-1-lma@suse.com> References: <20210615003832.5571-1-lma@suse.com> X-Originating-IP: [139.212.198.59] X-ClientProxiedBy: HKAPR03CA0015.apcprd03.prod.outlook.com (2603:1096:203:c8::20) 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: ec60ff16-7369-48d8-d006-08d92f960004 X-MS-TrafficTypeDiagnostic: AM9PR04MB9013: 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:418 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: kmdjKXp9ihpE5UOFg9PHPJj/79gYP2+RdJOoFKi0o/JTNhZCeInVIebYy1moE0anQIY/KSA+GuKBHKcgTYCvkMi34zdGStVTP7FhGGXeh6nCC1Qy82ScleBuTMH2OFeH3F6+3XKNbO2/UNgdmPLVujUZp9AO+GmO8d3BZX8QUXYLYJqj3Ono2g0YZ63wetDJNcP7V5H/PJDqpAe4IrBc2110fzM5Zqc59TcQlzMR6iZy2deYKQSHcDNMhdzJYuSP4SrCwbHl1VvOB733Gr/S8FzKLHgeqTFRnpXkTPEksfbUx3DXbdNvIZVT3WoEPRuXrpNrIdRr2Xw41zN3PTH/JOWTr8fGTVwi+3JTdjsbt8rihFj4ab5RbhdOCCc2iGVegqUn6jB+NC3x0igL1ZVZsWOyONaLbqWyzLTG0hIqjhp1zcoC9SadUIaP9yTBln5FePqXzfvtNEOxwcSbQXN/Hz6loKNF4NB5K+piYlOYa97SdS2gr/4GCGL+23qcw2+JGB3MBvXxtR8weWgHDeD7/IWwMrUe3jrye/MbZk5AeCILds5DSQFgFg9ykPMjR9j7upIrOmuMudKhRNhVXIsSxSKDpoijpGHWBR/vuzZeScA= 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:(39860400002)(346002)(366004)(376002)(136003)(396003)(107886003)(186003)(16526019)(36756003)(6486002)(4326008)(478600001)(4744005)(316002)(5660300002)(83380400001)(66946007)(66476007)(66556008)(6916009)(86362001)(38100700002)(8936002)(26005)(450100002)(956004)(1076003)(6496006)(2616005)(6666004)(8676002)(2906002); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LGCnenmXhqV88e7ZwzzPHI48P7Jbv2jRNgdEVWn8itZJAQJshMh3uAmcakTp?= =?us-ascii?Q?hc/DMvzQrUF1/4GNRs2y3kEnzHYN/09guTJeAIkBDt1VJjR78yWicyEePAFy?= =?us-ascii?Q?NIXLGsCeXwFmLj4XnvRcbUiAJFvZtmPLX7CgPwtX9uf1y501Ij6jXBMAk+De?= =?us-ascii?Q?xuxMDqxRIUYjMUFkmqQ1JHjtoMxh9zj5AhPrn+qgafQVjdplqRYkK6XDqN0g?= =?us-ascii?Q?C+uG9bGkJYIQ5mncJ8BYCKO0auO1Te4TuUiankwLNrXxZ3S48+utHOtFr+87?= =?us-ascii?Q?MTWiQyLskazNkmHZzMgVsdFEwxno73WCtEIPBarWifxGn+U/ReV4aj29gs0f?= =?us-ascii?Q?mPLm3oWQBrs9uUffIvPiPzhj1ssOdj7E2kJ7tNan3QFYq/tGIU4aD4S7/w8j?= =?us-ascii?Q?FP/aqFtoST+iBrsre+sodIJlwOXW8dP1pM1yTiFRrlYTHYiLmW7ChiO/NGFq?= =?us-ascii?Q?0RHEFWZm/eMhdyhWXcrELZLnLMPimLjFy6PFf1K4JA6XoKQjp6ml48OgezTp?= =?us-ascii?Q?OOEEvD6DVpLGoGYNjZ6aFDO8GViI+/w0YHWBvLNf5yZWPmxN630pG5nHb9sQ?= =?us-ascii?Q?4DUsD/JXY9IeXEhbS6rdMEHPHjBF6+P0g/t2YhFLMUp67qT9+GmXPfvNMztr?= =?us-ascii?Q?X6ZziqAoY6m79VRySU5QMwgdXRT17Su25VnYuCZa94MxAGWGi67X51f9jGkx?= =?us-ascii?Q?dzMIJVNfw8ZMQW/e8nZleFznJdqcxMMAigjFFZcou7d496HMm84T57Gcsdz8?= =?us-ascii?Q?vIntcz9KOiDpmsOk/JY97kSz7fu2JHuVwBLx8duZgQlE43ilL1Iyae1B3jIn?= =?us-ascii?Q?LB/FahISEV2EJ95sW1tZhr9aKH7kJKnuPZbGpuh6Rg82nVFvT5u3Pb4zd22R?= =?us-ascii?Q?piCZa5w37gLaZYE0UjEgvD3hHQNmkTUTt822ikT5ZZEvqtHNkqvwncPtZdbh?= =?us-ascii?Q?AdUHPDfTJmpvMKZQEcphAdi4Ptzvr4eiv69kQAHtaSPwVRYMHee1/GzzlK8i?= =?us-ascii?Q?1YGkGSHnUZfSWboiXcv/FcrnzQyc56Bh0TV1F8YGTEQ5+FpM4e9w0h2QS9Ar?= =?us-ascii?Q?AJg+wZBtt8nXMMcFCRkJzrPbItHPdvBBOol0PwtHsoQCbUg0DkotfjPZdbrq?= =?us-ascii?Q?3Z0gDG2sRtjvyFeDs+4kwyfHbePs7PlmTaXcJsZ0mle0a56XjwWL0oUmD8KD?= =?us-ascii?Q?eevfIpCIcY4V8TdUnHeJ26DTmqZJ/otQGvM+H8jQ5AF6wFxI1OC1b+BwINgL?= =?us-ascii?Q?VtLcyIV2DyGLvQShCapP72/jyFezDZAhsoosN/kudZhWVViIft8hKVRidAcZ?= =?us-ascii?Q?K802SYheGwykWsh3DavgzD/8?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec60ff16-7369-48d8-d006-08d92f960004 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8602.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 00:39:14.2576 (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: SomEtmHTJ6gE+//jDINichfhx31lgOV88nIogD6BF/bfU7fH3fMBCG4fqHJ+i5lE X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB9013 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 15F0dMQx001857 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.23 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 --- tools/virsh-domain.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 3fb37ea5e6..b3aa52b8a8 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3453,6 +3453,7 @@ static const vshCmdOptDef opts_dom_pm_suspend[] =3D { {.name =3D "target", .type =3D VSH_OT_DATA, .flags =3D VSH_OFLAG_REQ, + .completer =3D virshNodeSuspendTargetCompleter, .help =3D N_("mem(Suspend-to-RAM), " "disk(Suspend-to-Disk), " "hybrid(Hybrid-Suspend)") --=20 2.26.2 From nobody Thu May 2 16:31:46 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 1623717662405340.83602978493525; Mon, 14 Jun 2021 17:41:02 -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-397-BfiOHf_MPNOf84H2gXKQJw-1; Mon, 14 Jun 2021 20:40:59 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3CCE6100C666; Tue, 15 Jun 2021 00:40:53 +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 088AB9808; Tue, 15 Jun 2021 00:40:53 +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 C629746F58; Tue, 15 Jun 2021 00:40:52 +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 15F0dQbR001891 for ; Mon, 14 Jun 2021 20:39:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id C649A218B1FB; Tue, 15 Jun 2021 00:39:26 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C1A33218ADFF for ; Tue, 15 Jun 2021 00:39:26 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.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 87472802C15 for ; Tue, 15 Jun 2021 00:39:26 +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-73-NBMhat8mNyWtEDGESvlQ_A-1; Mon, 14 Jun 2021 20:39:24 -0400 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03lp2054.outbound.protection.outlook.com [104.47.9.54]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-18-drJsHlvqNwKd7VWXKl8apw-1; Tue, 15 Jun 2021 02:39:21 +0200 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) by AM9PR04MB9013.eurprd04.prod.outlook.com (2603:10a6:20b:409::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.24; Tue, 15 Jun 2021 00:39:20 +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.4219.025; Tue, 15 Jun 2021 00:39:20 +0000 Received: from localhost (139.212.198.59) by HKAPR03CA0017.apcprd03.prod.outlook.com (2603:1096:203:c8::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.9 via Frontend Transport; Tue, 15 Jun 2021 00:39:19 +0000 X-MC-Unique: BfiOHf_MPNOf84H2gXKQJw-1 X-MC-Unique: NBMhat8mNyWtEDGESvlQ_A-1 X-MC-Unique: drJsHlvqNwKd7VWXKl8apw-1 From: Lin Ma To: libvir-list@redhat.com Subject: [libvirt] [PATCH 06/12] virsh: Add format completion to blockcopy command Date: Tue, 15 Jun 2021 08:38:26 +0800 Message-ID: <20210615003832.5571-7-lma@suse.com> In-Reply-To: <20210615003832.5571-1-lma@suse.com> References: <20210615003832.5571-1-lma@suse.com> X-Originating-IP: [139.212.198.59] X-ClientProxiedBy: HKAPR03CA0017.apcprd03.prod.outlook.com (2603:1096:203:c8::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: 4e5b35b7-14da-4145-e557-08d92f9603bc X-MS-TrafficTypeDiagnostic: AM9PR04MB9013: 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:2089 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: GtYD+izXZOI5/aRbwU/CBvBifB/n3TFAQnKhOXKfCHaF5Ng9s51a5BvIVJ69OWjCn9g2R5ghaUXYgvB3jAcdkKdWfSeJfZwmD5sZksqJMMJIWPAjmZTiwRVDNvl3UTAfLgpINPe753EZOjRaLymFd2JUt1e2FMt+HX1+Lpb6A8xSv3VvsFi5b2x2lrlwDw3suvvYegmvMhZyWyRol5HBk80vlIUm3Bm/LlIX4BErl5FqDUyimToMNr2yNlh4KIAC4DdAfMHj1fuju+rHdsLnimO/F2J3ykX6BEylfmbudCaK17yxYtQESFAAfjxT7XgJUcSD/vDH64H3gve9ITcgeccBzN+4Ze5kITaCU4v9AO/i+sE9ngFjTuYvBhb3MT5J0iZjG+vj/VSAV6HaLqjcEnbAHlGQAWuwmCenAeaJPXVThNqaakfi3Xon6fMglFLxnIWUzHSNsNa/PXRYOz2Xlf1lVrPRWbapA6XhWpUFRwdcFhGwyTXSxsAExl+ovdrmKT5y9JCntDc+nklKfRtHYJU9YkwRov4rHNs9wfHoWSht7lrpzw9R6KSlRO21/nZYnjJoi58APFU6ck//5cVaqL4vjpLN1DQB0IE1uA9TU50= 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:(39860400002)(346002)(366004)(376002)(136003)(396003)(107886003)(186003)(16526019)(36756003)(6486002)(4326008)(478600001)(316002)(5660300002)(83380400001)(66946007)(66476007)(66556008)(6916009)(86362001)(38100700002)(8936002)(26005)(450100002)(956004)(1076003)(6496006)(2616005)(6666004)(8676002)(2906002); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?oA7qkkG1g6rRnU++BbNLQY2SilAE4Q0fT4bihKd4X33JFyx94XhE440NfSfe?= =?us-ascii?Q?/clq4YsfLIbeth3ENm6C5alreMdIktfZv5XaXMpqjT022Mc+2F4efn03oEDb?= =?us-ascii?Q?QeabtW/ifCnpOlIy5a1oAS6wFOrIId6nh2PDmSqYCXPM175Op/JpIEiB9reO?= =?us-ascii?Q?ggSM3ykno34r48PYD9FZFSG+GGFNLtuqve2L3hW2cO7rj5tfMeBUkxiNpb2A?= =?us-ascii?Q?6c0yI8PcksSqBEkAWch6N1uhTDtoHCXmomyRXNTrjIOZkdWg3txLRKsXPWKu?= =?us-ascii?Q?G3Ynwr78CT9SIliCiDd0dK6cbnp69Zv9OYVFApl7fuwEuGPpoMJwaGsJv3hY?= =?us-ascii?Q?0zr+tfj8DLnAmE0UwsbItbVup5rZJNtF5QQyacG9l1hHjY1f9XSnslXxbpF4?= =?us-ascii?Q?MKFlzppKEF5hXYfQgBa4XCVCYmWQJD3YKR5XSrhw7ZyqXS3aZpWGbz2sVsQg?= =?us-ascii?Q?hp5L8JeIpDo7JVgtWUhHcBJgWcMp8hBIo4ln0h9LHUDGGCtfhGxEBwChUif7?= =?us-ascii?Q?7DPAXEKSQT7g4kkHP6fR2HRBBklOwpOS6LQFO6Xsb2ECU3yimKu6MPQdadaU?= =?us-ascii?Q?DFv5hzXp2a3Y4BkAv+BiH319Ads7caWgMsOh0JPSrkIJ1RQjjCWPxn5MlbMU?= =?us-ascii?Q?YQQnne8GnydW8mVDE56Dsmj/KPFSTFDJKShkiSnBMie6plOK5ZCE2LYHtj7L?= =?us-ascii?Q?6LXdtta6FHwcQhTse6CDzJv8lbtQRgUx4ADQL84fupXnjmpH+mbjrYAPX/+S?= =?us-ascii?Q?HaMAuVa6ndXY2JIHv32tAMGmUKBubrrpJTmyWSj//tmhKsWIyqvlnOZvw4tj?= =?us-ascii?Q?/Ko5W9nLdMKP6WGfbFAes5kHQSFAEyHj1WXbAjNLShz2i2ZKWIfX74OrUDIe?= =?us-ascii?Q?tXg5UN8e64BATRfKtvMj219qPFfCwBphU4mthRjPXYCU4QOjfq8B9z3J8xDx?= =?us-ascii?Q?Dpsy1JwFTdBW1N1ri7+u5Zb/H9qHmnu03XsTC1VSqgk7V83i6GOlhFwWogym?= =?us-ascii?Q?LCewZpIj27pOvQLyUWz4gCnObJtYGYzGYcDvtIdm3wE4u7jYGi4GDLWUs8QF?= =?us-ascii?Q?J99UpLWx0bXtX9q2DwTp/IM4qvSa3VD93oES+/7TQAgpVM6qqYLfPFiFo1nS?= =?us-ascii?Q?A6smZN5GNVamjwrHzM/QU8+GVsnTLkvNv5gkNyVDJp2krfrK1nDfYNUgdlVf?= =?us-ascii?Q?OSCYR7nOWHJWkJJ3ljkHGV5XP4PQfgIO010KdsVz51JRdHDCSPTMG6b9Xdij?= =?us-ascii?Q?m27By99y/dp6SZMDlsw/7wTW+wudU+LEMR6vRxJsFlDfhvtS020CMbxUFwQS?= =?us-ascii?Q?A3evvNEH7a1vM5MzV0gd5OeP?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e5b35b7-14da-4145-e557-08d92f9603bc X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8602.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 00:39:20.7073 (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: AH2yN/vLPGnYE+c+YnAAP1cF3Mm5XXl/k3sv+q+K3tFSOMnt/S5mHIfDeJ97fsht X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB9013 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 15F0dQbR001891 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.23 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 --- tools/virsh-completer-domain.c | 20 ++++++++++++++++++++ tools/virsh-completer-domain.h | 6 ++++++ tools/virsh-domain.c | 2 ++ 3 files changed, 28 insertions(+) diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c index 256ac0b593..14e4d95ec3 100644 --- a/tools/virsh-completer-domain.c +++ b/tools/virsh-completer-domain.c @@ -35,6 +35,7 @@ #include "virkeynametable_linux.h" #include "virkeynametable_osx.h" #include "virkeynametable_win32.h" +#include "conf/storage_conf.h" =20 char ** virshDomainNameCompleter(vshControl *ctl, @@ -976,3 +977,22 @@ virshDomainMigrateCompMethodsCompleter(vshControl *ctl, =20 return virshCommaStringListComplete(method, methods); } + + +char ** +virshDomainStorageFileFormatCompleter(vshControl *ctl G_GNUC_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, + unsigned int flags) +{ + char **ret =3D NULL; + size_t i; + + virCheckFlags(0, NULL); + + ret =3D g_new0(char *, VIR_STORAGE_FILE_LAST + 1); + + for (i =3D 0; i < VIR_STORAGE_FILE_LAST; i++) + ret[i] =3D g_strdup(virStorageFileFormatTypeToString(i)); + + return ret; +} diff --git a/tools/virsh-completer-domain.h b/tools/virsh-completer-domain.h index 5d56090504..45380906f9 100644 --- a/tools/virsh-completer-domain.h +++ b/tools/virsh-completer-domain.h @@ -132,3 +132,9 @@ char ** virshDomainMigrateCompMethodsCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); + + +char ** +virshDomainStorageFileFormatCompleter(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index b3aa52b8a8..183f53f913 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2235,6 +2235,8 @@ static const vshCmdOptDef opts_blockcopy[] =3D { }, {.name =3D "format", .type =3D VSH_OT_STRING, + .flags =3D VSH_OFLAG_NONE, + .completer =3D virshDomainStorageFileFormatCompleter, .help =3D N_("format of the destination file") }, {.name =3D "granularity", --=20 2.26.2 From nobody Thu May 2 16:31:46 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 162371758580174.02007399840159; Mon, 14 Jun 2021 17:39: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-433-6b8dGGBdMnWaDHTvfIDtGg-1; Mon, 14 Jun 2021 20:39:43 -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 0C8B11850606; Tue, 15 Jun 2021 00:39:38 +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 D98EA60C0F; Tue, 15 Jun 2021 00:39:37 +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 A47451809CAC; Tue, 15 Jun 2021 00:39:37 +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 15F0daNZ001981 for ; Mon, 14 Jun 2021 20:39:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id E1C712077FA2; Tue, 15 Jun 2021 00:39:35 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DC4F72077FA0 for ; Tue, 15 Jun 2021 00:39:33 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.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 65335800B28 for ; Tue, 15 Jun 2021 00:39:33 +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-108-OJxUnnSNNfem3ZWHDmowmg-1; Mon, 14 Jun 2021 20:39:30 -0400 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03lp2058.outbound.protection.outlook.com [104.47.9.58]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-16-OYqPAOzvO1i3UT4SxVpvvQ-1; Tue, 15 Jun 2021 02:39:28 +0200 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) by AM9PR04MB9013.eurprd04.prod.outlook.com (2603:10a6:20b:409::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.24; Tue, 15 Jun 2021 00:39:27 +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.4219.025; Tue, 15 Jun 2021 00:39:27 +0000 Received: from localhost (139.212.198.135) by HK2P15301CA0022.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.0 via Frontend Transport; Tue, 15 Jun 2021 00:39:26 +0000 X-MC-Unique: 6b8dGGBdMnWaDHTvfIDtGg-1 X-MC-Unique: OJxUnnSNNfem3ZWHDmowmg-1 X-MC-Unique: OYqPAOzvO1i3UT4SxVpvvQ-1 From: Lin Ma To: libvir-list@redhat.com Subject: [libvirt] [PATCH 07/12] virsh-pool: Add virshPoolTypeCompleter in macro VIRSH_COMMON_OPT_POOL_X_AS Date: Tue, 15 Jun 2021 08:38:27 +0800 Message-ID: <20210615003832.5571-8-lma@suse.com> In-Reply-To: <20210615003832.5571-1-lma@suse.com> References: <20210615003832.5571-1-lma@suse.com> X-Originating-IP: [139.212.198.135] X-ClientProxiedBy: HK2P15301CA0022.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::32) 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: 8181a624-f566-4861-7ec3-08d92f9607b9 X-MS-TrafficTypeDiagnostic: AM9PR04MB9013: 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:669 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: 9M8PPnhjt3ktaBgIEj04mVMmeH9G1ItmOyvO9lKcnt1VWrbOrJ1vVpPnk5058nrziAMILM8k6o/RP6m8X20q/aTwtnPZGjXjPA/bGQTQjXLfpykVEgme9gVrRlUTUN5/NFIYYLJKquaPYNtUeAOC+suQH8x9BRefDXhOo3FHLrEnMXIBXfy0I7A23qHWliBo+ezW5M3fANAopd2I5cg1MEhfhLNgZJ26Vp5MWDfH9ranNNsnT1d6mk9UhQowEFhIZON/EmqxmWikWVMgyHN6ekkv0KMjLmQDIQOnJ3uILqRiJhFFn5sU0ufjkxiS4jNKw68yTi8ato+QfsnUNX/MnkXFy/J7PoK/MnIhM8Nnv8tHDrvlYtWPrNNjEIAKUbgikhHTQ/4ydcFxIAl34uZF0YlaHlSYs2X3pPDIB+fIQs9/5M6jZhA2v2VuryufpbBc887w1bvOGCHjyT5lJMTqIceZs80KkGtIOIdXsvRq9WxDI0O/WubIranjclXFLAYo9T79i48vd69mYPmP+Is62aACl/gfkUwF55T2BlI5sKjZ8HDePgxN5dnhVdBAMmw4BrgmxsP5ti8jurnaZT5Ifap4FxmSnJWZ6RuHHlCmuuJDTSMq6cLGlMtkIAWO9gHhb2spfRFCiIegyc+Cl9ZXzw== 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:(39860400002)(346002)(366004)(376002)(136003)(396003)(107886003)(186003)(16526019)(36756003)(6486002)(4326008)(478600001)(4744005)(316002)(5660300002)(66946007)(66476007)(66556008)(6916009)(86362001)(38100700002)(8936002)(26005)(450100002)(956004)(1076003)(6496006)(2616005)(8676002)(2906002)(145543001); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?EH5zpJqPl3wPqVrS2DMia6RgzK2PzCvcrIBEIHRTU5rW6ZG62SMQzHXBA3ZX?= =?us-ascii?Q?s1wyCYbIfGo//xUpA/Mi+vUAmBpNlT0YrENDCSzK8K8E3TT2ukIpUBruydW8?= =?us-ascii?Q?76WI/o7BY/L7WCin4gygoVJ1hQxhUTCwoNSCvFJVt38xLCRrVCTgQ/UFZVwD?= =?us-ascii?Q?KMkk4irGf/KLeqYMMoCYG+x9q2NZFD6fF+ckw95/WhQJemGBv9hWE3kYgJw2?= =?us-ascii?Q?VLlGng+NziGvnwYzo3wTsoxBi/DRoh4U9zZyyDDxMigHg0QELoM+C+8reUAn?= =?us-ascii?Q?eZ+UWp4L6/dJm1JJOq2XLNIMq0PTHtGxYHFrP5iSvzeTiwCv8QpKsgSQiyJ7?= =?us-ascii?Q?izi7i5gDkJHaR8pdphGbBKV+8bh6mLydZV9DFmeuTvY9094CGxyFKC9SJ5XB?= =?us-ascii?Q?4+dYfOvqgLVpGxS4UmNWhwUfKcLgeo2cew3C21ytqaeTKFxrKywwI7dRQSHa?= =?us-ascii?Q?e0dO0bUDUXfNuFdeqkVJXp53jPDChSoIvHdC+Ptsac0ofwNULnJAJs8ccp06?= =?us-ascii?Q?WpLjyKxFl9i9lqS6zkh9TrBhM/VveoBZVGtZtLDAzeOm4JRowgOfrYuGlakP?= =?us-ascii?Q?qetWaaa+p6kMatNSkWV7btvcJnaIi55JNFqii/hKTbIDTHbYvEyIxxPmsYUR?= =?us-ascii?Q?Ud/axAzYa9XXnSGc01X62bvqmXnWCRFIg8Mc4BFXv/fGGDRkwyu2yxHnMace?= =?us-ascii?Q?nbEgw2all9RRa+xb6W+AD462BPuH00NnlNgjw/KKTSz4YzlcC9ld3XpZMems?= =?us-ascii?Q?JVel+pGgXjaR6tBfrsznZY7c7PAWsAZKohMkj9cOp6nxEsWvHxuIPkL7qcEd?= =?us-ascii?Q?6NehPUTw8zVeWGvZH+bf1R9U1FHGq+JBkYqnjccqiXmMCDm7eM6juzr7ByKx?= =?us-ascii?Q?4NwMafHnsdHkcCDwMlHxsnG4eWN7Cs2aRsbDhyyS5YshDSR9wrPBTuQVh7TA?= =?us-ascii?Q?iGip8JWHvE2IY407uoAntXDQKxip0In4BH+9jyf5oTFe5HlK9cUCDcDtdmBL?= =?us-ascii?Q?OY5Mv0OG40Dnezo4Qq8AU6chVQT8cve4rh7ykn/IU555SlhvRDEAKPWropml?= =?us-ascii?Q?PwWwAmAHhTuWDDT+P93ZtYQlwzwBiiMxCg/3tT8hm+hmn648vKcZC+2heduf?= =?us-ascii?Q?JWzkNZClfrNDcz/ajgOn2fWt1hYGUbKXLQXMXxWOMJyLsH2YURW7AkliEacn?= =?us-ascii?Q?QND0dyOXRJJupSGaRaANAU7KIAz488qnwG19lloep0Egj+73PGcuiygqZQ0m?= =?us-ascii?Q?5MTWsZoizMUucaUOwdhJC0wUJhGTh6+zSuF3Oco72mHuVOueHMBvCAISf0FE?= =?us-ascii?Q?Jqsm2CyBuYZy4A16UbiY62XB?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8181a624-f566-4861-7ec3-08d92f9607b9 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8602.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 00:39:27.2226 (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: 2r6CvcrXN78FPMeWcCKLR1ILXk+1azQeW6k2/t0D1BbZn+FsB0MiNsi3QSK5ooNA X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB9013 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 15F0daNZ001981 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 --- tools/virsh-pool.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index e8d3c33506..34ed86152e 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -64,6 +64,7 @@ {.name =3D "type", \ .type =3D VSH_OT_DATA, \ .flags =3D VSH_OFLAG_REQ, \ + .completer =3D virshPoolTypeCompleter, \ .help =3D N_("type of the pool") \ }, \ {.name =3D "print-xml", \ --=20 2.26.2 From nobody Thu May 2 16:31:46 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 1623717663407140.59250500316784; Mon, 14 Jun 2021 17:41:03 -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-390-qOrSymosOYyq-QtfnjUMdw-1; Mon, 14 Jun 2021 20:41:00 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CC361EC1A3; Tue, 15 Jun 2021 00:40:55 +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 A050C5D703; Tue, 15 Jun 2021 00:40:55 +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 6D4C046F5D; Tue, 15 Jun 2021 00:40:55 +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 15F0dh3j002045 for ; Mon, 14 Jun 2021 20:39:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id D36F2200E4A7; Tue, 15 Jun 2021 00:39:43 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CE138218ADFD for ; Tue, 15 Jun 2021 00:39:41 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.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 40E22857AA4 for ; Tue, 15 Jun 2021 00:39:41 +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-562--IS7GA02OamTbUeJweh3jA-1; Mon, 14 Jun 2021 20:39:38 -0400 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03lp2057.outbound.protection.outlook.com [104.47.9.57]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-28-Qf-Hq4PSNwCWh_9-D6aMng-1; Tue, 15 Jun 2021 02:39:35 +0200 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) by AM9PR04MB9013.eurprd04.prod.outlook.com (2603:10a6:20b:409::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.24; Tue, 15 Jun 2021 00:39:34 +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.4219.025; Tue, 15 Jun 2021 00:39:34 +0000 Received: from localhost (139.212.193.237) by HK2P15301CA0011.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.1 via Frontend Transport; Tue, 15 Jun 2021 00:39:33 +0000 X-MC-Unique: qOrSymosOYyq-QtfnjUMdw-1 X-MC-Unique: -IS7GA02OamTbUeJweh3jA-1 X-MC-Unique: Qf-Hq4PSNwCWh_9-D6aMng-1 From: Lin Ma To: libvir-list@redhat.com Subject: [libvirt] [PATCH 08/12] virsh-pool: Remove static from virshStoragePoolList{Free, Collect} Date: Tue, 15 Jun 2021 08:38:28 +0800 Message-ID: <20210615003832.5571-9-lma@suse.com> In-Reply-To: <20210615003832.5571-1-lma@suse.com> References: <20210615003832.5571-1-lma@suse.com> X-Originating-IP: [139.212.193.237] X-ClientProxiedBy: HK2P15301CA0011.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::21) 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: aa6f945b-7e48-4b0b-b8a1-08d92f960c22 X-MS-TrafficTypeDiagnostic: AM9PR04MB9013: 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: zfK/Tt+XGg9WDHyOH4iiMm4vef68LNhrVRaf1EC97eIvanfHyXAKSzZgnQmeWxW50WeQwnzhNy8MtzOddmf+XoEuDRahWdylIZWyv6K/9JhqTP50psOLcP0uKACzQH8yhV5ZAN52H0YK0H9LFEnGno4TXkAubRkkIEidxFPQ+yP8MvpBBEqN/5KA+Cye92t72uy9WIngCZ8wXuSRNCjNXGBEmH06o8neHK0RVUNeIr6L7PnaC8FnzE2oTqa9IyZ0GKJzuvc1pJwTH6gZxi4kdr/qyguA3Pn8XixGDYVgLP/DjBXASPrQSPR7hvK9iGJS8N1mP/hb6pUsR3kX4PX0TcFNgMLBllsWI1AodevfXF40WyotEwAjeh1bfgl3UN38AJym4YHhgmnL3h4oBKGPPntfsk2lntemZ56EfEHTyb0BctkJYKxh8eRPmp4KujUHCGE6nLwcbi6cMiWTIeZhrP8ybnk74k0LZxc3pFEfkgyAhS+SsrqvlE8TcK2iDhZHQWMGe4+/Gpmo14cxaNAM7lZMwfnrTJdBAEZWSreEaTQDzkPsRQmoROkg5Br35WG5nrbI/ujnO79zQOm7mClhQw== 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:(39860400002)(346002)(366004)(376002)(136003)(396003)(107886003)(186003)(16526019)(36756003)(6486002)(4326008)(478600001)(316002)(5660300002)(83380400001)(66946007)(66476007)(66556008)(6916009)(86362001)(38100700002)(8936002)(26005)(450100002)(956004)(1076003)(6496006)(2616005)(6666004)(8676002)(2906002); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Gw0sbwUk1/JvMyOqbduT5SKrAKjdf3AZCpI5W6lNYAmZafoVxKa210hu9UHU?= =?us-ascii?Q?ZIUERBIL/r/cdbqNw2GEwiEFJC0L87Hhf7LYZdxj4xnHNJo4jRkajlt1SHDZ?= =?us-ascii?Q?FnqydoD0ZrIYHgptERMxFz5stNu+bsFr0/1RQGhmuCO9AREuM5f1yYUAXbM2?= =?us-ascii?Q?IXGHkp15ZtZE/BZivuNMYr4nL2zNU2OVmdgTwBiZBLVppT7JbKAAToTw6Xcv?= =?us-ascii?Q?OeHeLgbH0n1VY9LiN8A3qI76TsbhUPE6vkcE6ChwHbYcFYtPWQOvHCuxIO30?= =?us-ascii?Q?ZLJlyb8rzqaEGJOH5NvKKm9UmlyLTJuB/3JCt1MtNwgNj3tOOr0NcI8TbppP?= =?us-ascii?Q?7P7VjZQuR4DPep3HmpFphYmrNPM5FFAOhcEG9DIXrMRuSEN9EWwAvu6jS46A?= =?us-ascii?Q?nIrABtBFSwWGGLVo3zkj0PEtLzZJXb0uroCEGUUhSYnjnbUKIICwGONVDWqd?= =?us-ascii?Q?okVL/bV7H6bgoGr07GubMVgDGlFAOjCoLkPDcHcTbXqyQg9VH/ji3JegApyq?= =?us-ascii?Q?ejN/nHm/2tuRonpeo98QbfKUQ0fA2/UShu/fbByj5jnJyotS8mS3UfzMN6dg?= =?us-ascii?Q?pPcxysETy2oqKUd54Se7nH5lxF3EAs+6WRuKFK32EbeLGvtHQb+S/gQkO3V2?= =?us-ascii?Q?i9ijE9/YTHr7uvHDbXB5+Gyz6wf4xuiUdh+QpADc3b0CjarBVnhnmovbZdjX?= =?us-ascii?Q?UQ7GUdzCdoUlzEOzliOipGn+WOFYSn0/XF+qbklKHypArL3MQfxgGEKADIwf?= =?us-ascii?Q?zwMXwmuElegGZsH7mZM+0q4pTUOqtDeHk23o23XM+0rBtANdhgnihQ35l7J6?= =?us-ascii?Q?9PGEqCsCM5VrPHbB59RVnjJhMyHR5niA/Q12ClQWC8NiW5mDNZA/iQ58KEdS?= =?us-ascii?Q?xy5ywJlFg1ZTZ2cpaPUnuDmkm2lVqFttRemskDObQWGFeWIYqt71Q15GYV5E?= =?us-ascii?Q?VxwsVo9eO/xqUxakyZdZtxgxIsiyO4TDSZpLCcs4pKK3nahndgp4XiktkAec?= =?us-ascii?Q?YH+82aFvKbSZesQSuY8pCHmCHh0ytvbQHR+LggmzErJTeKjVsx0oIFF3y8St?= =?us-ascii?Q?Mak4OBqAb+yjysOUP47uwbZsvzz6IYJDaYSpWuzpZgGw6s1SfNcxHwDM2iSa?= =?us-ascii?Q?7iCKLE8rGRnrvV9HTGRur313IkKUrmsxGLwvn0clXeOO74d7Em9loMxmBmJs?= =?us-ascii?Q?LG800miuU+KM8R7A+8vDiaB9rypSx6Qy8Ig6MgEQCF3Hfg5OzyeqTnYuBz2O?= =?us-ascii?Q?30hdkMJFkcb9LKvHKOjB9j5xgbVy4LGyK9yE6Ge6XCDIxqXAWPx5K6pZBT6m?= =?us-ascii?Q?G6nwqAssfYbHegA0xIBSYibx?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa6f945b-7e48-4b0b-b8a1-08d92f960c22 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8602.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 00:39:34.7008 (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: rPy7DiLc/VA7XRQFbe6XATObWyK5Ve2nG4zb72zD7GiPCQLaMmMWkFtguScMXtz+ X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB9013 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 15F0dh3j002045 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.15 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 --- 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 Thu May 2 16:31:46 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 16237175992101005.5314604056645; Mon, 14 Jun 2021 17:39:59 -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-157-sdLqENbMMc-PlsRUeYO8kw-1; Mon, 14 Jun 2021 20:39:56 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D7626803621; Tue, 15 Jun 2021 00:39:51 +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 AC51634B4C; Tue, 15 Jun 2021 00:39:51 +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 72A834A717; Tue, 15 Jun 2021 00:39:51 +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 15F0doXm002069 for ; Mon, 14 Jun 2021 20:39:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6A82D112D431; Tue, 15 Jun 2021 00:39:50 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 64C39112D42D for ; Tue, 15 Jun 2021 00:39:47 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.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 08DC2800B28 for ; Tue, 15 Jun 2021 00:39:47 +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-562-JpCxT-CzOA6xczd3k2feLw-1; Mon, 14 Jun 2021 20:39:44 -0400 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03lp2057.outbound.protection.outlook.com [104.47.9.57]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-32-Jtu3drU4O6WmkPpExTIu8g-1; Tue, 15 Jun 2021 02:39:42 +0200 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) by AM9PR04MB9013.eurprd04.prod.outlook.com (2603:10a6:20b:409::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.24; Tue, 15 Jun 2021 00:39:41 +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.4219.025; Tue, 15 Jun 2021 00:39:41 +0000 Received: from localhost (139.212.199.250) by HKAPR04CA0009.apcprd04.prod.outlook.com (2603:1096:203:d0::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Tue, 15 Jun 2021 00:39:40 +0000 X-MC-Unique: sdLqENbMMc-PlsRUeYO8kw-1 X-MC-Unique: JpCxT-CzOA6xczd3k2feLw-1 X-MC-Unique: Jtu3drU4O6WmkPpExTIu8g-1 From: Lin Ma To: libvir-list@redhat.com Subject: [libvirt] [PATCH 09/12] virsh-volume: Introduce virshStorageVolKeyCompleter Date: Tue, 15 Jun 2021 08:38:29 +0800 Message-ID: <20210615003832.5571-10-lma@suse.com> In-Reply-To: <20210615003832.5571-1-lma@suse.com> References: <20210615003832.5571-1-lma@suse.com> X-Originating-IP: [139.212.199.250] X-ClientProxiedBy: HKAPR04CA0009.apcprd04.prod.outlook.com (2603:1096:203:d0::19) 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: 53edf4ad-2dd4-4a2f-2372-08d92f960ffd X-MS-TrafficTypeDiagnostic: AM9PR04MB9013: 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: B/elP1WoDV7YMxzYv76BcU5z9AQMSSbzVS36ABEv/fDIh2taluNx6Xs57MkWjeHbKXqFfiqKknuKN5EUyU30HL6ex8YPWgnpgnsKj2O90IWSeIdCfzNuohZGe3BvldE1Br31GkopPFtPQRV+7Mx1gijNrk1vANAhdkx99ht/vafOTmegsTvB4Q7ZatavuFwB3GXdsz91E/hV/NEm1UpCreDSA186+ksN3vntSKRCaUu01IEMTJMwLsioYHUDeoMtbqBdItZFKLMprcC0QeV6wjY1quqLE3Sy3zfPbxlIuvtA74fx8JRDaIEO8JBquhGnQ3DQB+V596aLRWY5pImA6zBn9N197eZtqCV21A6UHubbQ6Cj/zluImDRhUTMb8ZEBfZWFUu0gp8tYHDMmrAyZ4SkhuXa2nGl4mbDyq2E2AkmzRhLF6HrqBPZJI1FRooFq96I5AjgTL24V4ln1DudA3eXTD9r6JNlCV/9uEq9itQtSY70VyY8Uwgk7KMcBLLryKowGVZrQSAbxB/PYah5D/JABeX7y0PQezDcH59t6DEYNeFoVhll4rtnovrlYZv+jsU1vxw2iteGn9VQiqvH/vKRGL7mJixEM4bj5IBVT6+XgNlJgnyJZeJGm6gnIzXJOJQ0vjx+E5qILmRFIrowuh6LmiYRH4nvyhohTUd6HHQ= 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:(39860400002)(346002)(366004)(376002)(136003)(396003)(107886003)(186003)(16526019)(36756003)(6486002)(4326008)(478600001)(316002)(5660300002)(66946007)(66476007)(66556008)(6916009)(86362001)(38100700002)(8936002)(26005)(450100002)(956004)(1076003)(6496006)(2616005)(6666004)(8676002)(2906002)(145543001)(145603002); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bQMZvgK7dhzwEvTDgve/t+Qb1NYQjAlj72L8be2a/MYSlvLZl31YADZtRvlQ?= =?us-ascii?Q?lxfciDgEJA7IP2YlIAX8Utr1LawjANnKWvQ82vzudIDLhlJr369dWoyuTkgy?= =?us-ascii?Q?cWZT+7nbPLDxalLo0qPKtz2gBtvoMkPaOmSiqoKm/6hLEGGdhdWc23FffJN4?= =?us-ascii?Q?9bEtYp+9M7Q8eXY9sAurS4oZ+tTFc8sw0ss+02zt8iZsCOKTHjrIzvNrnvDG?= =?us-ascii?Q?ylZEOKce3arTS00ZnZslLFK9XlZANwZGlYF4n2s2gnouL4Rgapi3x4gKEYSg?= =?us-ascii?Q?txdj8e0WH+rHNeKwZeomLUOlWpZVMhnfXZ8xwVOuNYwYTGxzO+9kv1tjwFe8?= =?us-ascii?Q?0OHz7ZCfWhpZrMRDKtDYGxR1L18zrWd2f4af3zF6eocUA7K/inaopiN9/b2w?= =?us-ascii?Q?Dh2Buf86jpRQ4N88RB+zrBV0/TUf3EciicPwKRyj06NDDIxwXiO350wUbe6G?= =?us-ascii?Q?JTYGStTQOxOE6wz4Rxbf+3A21UJvbde4mHUYUJRQ0Oq3DJpeb7tub1Bo2dGw?= =?us-ascii?Q?nFDz6+HrYB5iZDYhbLHecD+BWfUO/oIlyVPtOrfBzO5cN23p5WXUXxiXsRyE?= =?us-ascii?Q?dRWlyTTW7WlU7eEVV/0G7khgtXVOhhS34pLGFCX5z/b6WypKw91VouqN0GO/?= =?us-ascii?Q?V5cPqXHo6U/YUUcApff5tqz5vGSzSwpkII8EV9DtWS1GZuWbFSpV1ts7+gX1?= =?us-ascii?Q?hoLEYXsB90ryxmLTpu7l3eVliLBJ2M/VVQNtDVjwDUF/C1l28cuPyFHc7As8?= =?us-ascii?Q?RljgPtxY6fP9e8KX9KAvEg7DOdi9p6GnUeQZ0zvZrUYN0eYmx4BKIXnu6HIW?= =?us-ascii?Q?NzfY8VLEkFpzppHRMs1gTuY92Fb79ktKVK8RWpK363OBCg8k4YFld/q2OfaL?= =?us-ascii?Q?U7XmcEi9zOm5canAopQTPZecTPTaWJ5nlHUlxk7WcW9XWtbn3FaqcxF+wHVV?= =?us-ascii?Q?gOLiMXos2eUwF12pBUASsfDFuOkaRS6YYE0vZ6lxy+WsfyAGdpWCoqxtEyFt?= =?us-ascii?Q?oPYFK6YkoHllPH4PkfcYGyfUXnFGDAyjAv8jZlCElNjG90lOzfjXOwX2r6kW?= =?us-ascii?Q?iWxo7OJgryMOcGNRfPkuAd3kUUSHMnh3PAZwFD4Ci+egM/l947K5nLQBvHG7?= =?us-ascii?Q?e3w5IPMcA06F9WnnOqnu230s7rKDosetr2vk2RqwLELq+Yurc75odswD2EIF?= =?us-ascii?Q?U1HUw6HFy4O0yusp8FALlwKivhpVni2rnVBFgp4CKtC/T7FWTGyfMinFNsyI?= =?us-ascii?Q?4KXkbfX2UQc4xUIUBcMsJvhfgL1KlcT6oErDh/Ok15pC8k9Kt4/a99xRfPXf?= =?us-ascii?Q?FHAA0kFHMSQ8CQjLLcnZk//0?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53edf4ad-2dd4-4a2f-2372-08d92f960ffd X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8602.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 00:39:41.0927 (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: vmqy6Ak+az6Cp1FF/3qmJfkOPxGcy/C5bgciqnY6VMcC2TphFBsB9b9FbDRoQzww X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB9013 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 15F0doXm002069 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.23 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 --- tools/virsh-completer-volume.c | 53 ++++++++++++++++++++++++++++++++++ tools/virsh-completer-volume.h | 5 ++++ 2 files changed, 58 insertions(+) diff --git a/tools/virsh-completer-volume.c b/tools/virsh-completer-volume.c index 301ee982a5..14e9069c5a 100644 --- a/tools/virsh-completer-volume.c +++ b/tools/virsh-completer-volume.c @@ -69,3 +69,56 @@ 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, idx =3D 0; + char **ret =3D NULL; + g_auto(GStrv) tmp =3D NULL; + + virCheckFlags(0, NULL); + + flags =3D VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE; + + if (!priv->conn || virConnectIsAlive(priv->conn) <=3D 0) + return NULL; + + if (!(list =3D virshStoragePoolListCollect(ctl, flags))) + goto cleanup; + + for (i =3D 0; i < list->npools; i++) { + if ((rc =3D virStoragePoolNumOfVolumes(list->pools[i])) < 0) + goto cleanup; + nvols +=3D rc; + } + + tmp =3D g_new0(char *, nvols + 1); + + for (i =3D 0; i < list->npools; i++) { + if ((rc =3D virStoragePoolListAllVolumes(list->pools[i], &vols, 0)= ) < 0) + goto cleanup; + for (j =3D 0; j < rc; j++) { + const char *key =3D virStorageVolGetKey(vols[j]); + tmp[idx++] =3D g_strdup(key); + } + } + + ret =3D g_steal_pointer(&tmp); + + cleanup: + for (i =3D 0; i < list->npools; i++) + if ((rc =3D virStoragePoolListAllVolumes(list->pools[i], &vols, 0)= ) > 0) + for (j =3D 0; j < rc; j++) + virStorageVolFree(vols[j]); + g_free(vols); + 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 Thu May 2 16:31:46 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 1623717665898575.5533103328016; Mon, 14 Jun 2021 17:41:05 -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-556-BwHhXc0CPsmdfnIc39NwAQ-1; Mon, 14 Jun 2021 20:41:03 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 83920107ACF6; Tue, 15 Jun 2021 00:40:58 +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 5F6935D9D5; Tue, 15 Jun 2021 00:40:58 +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 269AC1800BAE; Tue, 15 Jun 2021 00:40:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15F0du1O002140 for ; Mon, 14 Jun 2021 20:39:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id CCC0E51EF; Tue, 15 Jun 2021 00:39:56 +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 C71BA63ABC for ; Tue, 15 Jun 2021 00:39:54 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.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 2DA8A185A79C for ; Tue, 15 Jun 2021 00:39:54 +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-441-tvZvqCJMN5mCLm_TIuX0kg-1; Mon, 14 Jun 2021 20:39:51 -0400 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2106.outbound.protection.outlook.com [104.47.17.106]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-36-_SORRijlPXGaTKaRfEXo5A-1; Tue, 15 Jun 2021 02:39:48 +0200 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) by AM9PR04MB8779.eurprd04.prod.outlook.com (2603:10a6:20b:40a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Tue, 15 Jun 2021 00:39:47 +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.4219.025; Tue, 15 Jun 2021 00:39:47 +0000 Received: from localhost (139.212.198.161) by HKAPR04CA0003.apcprd04.prod.outlook.com (2603:1096:203:d0::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Tue, 15 Jun 2021 00:39:46 +0000 X-MC-Unique: BwHhXc0CPsmdfnIc39NwAQ-1 X-MC-Unique: tvZvqCJMN5mCLm_TIuX0kg-1 X-MC-Unique: _SORRijlPXGaTKaRfEXo5A-1 From: Lin Ma To: libvir-list@redhat.com Subject: [libvirt] [PATCH 10/12] virsh-volume: Add macros VIRSH_COMMON_OPT_VOL_* Date: Tue, 15 Jun 2021 08:38:30 +0800 Message-ID: <20210615003832.5571-11-lma@suse.com> In-Reply-To: <20210615003832.5571-1-lma@suse.com> References: <20210615003832.5571-1-lma@suse.com> X-Originating-IP: [139.212.198.161] X-ClientProxiedBy: HKAPR04CA0003.apcprd04.prod.outlook.com (2603:1096:203:d0::13) 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: 4cab66b5-f0d0-4a39-73c9-08d92f9613c7 X-MS-TrafficTypeDiagnostic: AM9PR04MB8779: 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: vxEvd9AFoH1tqxumSTEZYWKVcGZftzVbzusHnonlGlxH3uVG+ulbvfGV3ySzgyKva4baJuFsJxhhhOtZA9X2zzx/wM+56Qg+X52MMTMklZjIDtOTRUheKDXwCmVf5MmYwG2yeq1l2DbW5GnJuA/EYfQyhSwTasWek3QE8N2xPJyIhPBjDKH4qaOcQ4wgYk+UxsAymopnU1iH33pYzUTfiwVNEkArj22M7aVuRnzqsqhDCG63+rTQt59CIJ57bUOv1Tl4SbL+BnwZ5cpfbx6MVU9MM1pGcVvA/fhPswPace//bBMRF2QGUuC9/WySjNI/FDeFtDuYdMgbGlMnw870Gfli67ubLiYOfI3e0qajgenK7nRU6F5q/fF2mw890ts6mKaW/QyMOfRrRvcxfWFSPKrVkkCpz7ej/f9CeH7iBf3tqkTNlJ+OtX3b5hbJ4e/8Bn9IWv3L37qGk5nyk31zG+M8pjSTtPpykGcHX0JeS9GLljRulnkcNmywtxfWOMJ28zDzFPjstjXr+dr9fmcq6ujTi4m8bA6YU/2JzsKJyu9Pn3OLOPH0NOXe0SsNryqyxKJ/1ph/9vsKVtcMP8e01laEZ3kH7UcF3fD3FiP4n0c= 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)(39860400002)(396003)(346002)(376002)(136003)(186003)(86362001)(16526019)(26005)(450100002)(6916009)(478600001)(8676002)(5660300002)(8936002)(4326008)(66946007)(66556008)(66476007)(83380400001)(2616005)(956004)(1076003)(107886003)(316002)(6496006)(6666004)(2906002)(36756003)(38100700002)(6486002); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?yl6+VkN0C/rVl1AsxfTaM6OcTHndi0MdnvsK/ugBLStQe8QZScPiPvJ1lov2?= =?us-ascii?Q?F473sWXFroftoF2hymTe4h3p0hT9szU7AL9UqSUvh6Rjkbnbraimk9taGsDZ?= =?us-ascii?Q?SKCAZm0v5/DsXFXqsbdlXfFbotwB/a74syuaoatCLHp4LN0zMPhP1uG85fhz?= =?us-ascii?Q?UXUya0lROOI7Lh5a/m8zvoHK9ryfIAB2O8nLhP7hF/2oV9wuhmdkbEuCs17y?= =?us-ascii?Q?7kDxVgsv8tGKYVksNkTjZNRv8EfPbvyguh2zut2zAmDiRdwkkhB8qRPilY/F?= =?us-ascii?Q?BDAu641BBu+n3zvrVfNTa7CAcM8c3exz5KWt2PNi/d8vHiGjjBgJgLumg1Xc?= =?us-ascii?Q?S2D7dm7SSXbnOszfGM1UTFIyH2f1bdNcEt+vS2uAJEJoyJUO11dawN9j9/o4?= =?us-ascii?Q?xZvxQD7VbiTj4V5t7wLHMw65tcCNTqi0BTI561jUKVTMxR7T9gYKzDEwyeGk?= =?us-ascii?Q?rxC7MRCOijmH/ev6zo9SbaGKnVevca28jWTQM+LI4utQbX/ywvAsdlTKJWXZ?= =?us-ascii?Q?P/gp2yI4vgez7qwLeKA2CX6ggMT9D7cMXDgCBpAXfD9ggus2jEXJOTZncKCT?= =?us-ascii?Q?4V2NZztVvgCR+asdPCCL3Al1YrQxLVYMMxFjV/GLa1OiUaFsX/26b73hrLPr?= =?us-ascii?Q?7oNByqKJuKk3wh/ncve0okEYhfsM8Y/wRY+yknPJZUgTbYblZFnT81Dao3EV?= =?us-ascii?Q?4DYZnxnu8RDXhU959CpQ9CRvbie6zWFA7XUBFyvOm8Q2nhClgUu6iY1SKW1m?= =?us-ascii?Q?kssOiJllFyfTJEvSBjRqTgPnlvOjlG0K51vO22jYd9SZtRM2HhuUsiSS4u8t?= =?us-ascii?Q?4laivkPuDp4iXyq7wAsXAQaIsx5GaudRq2aEmDQRDXSY32k3qTcCHEIc9wnr?= =?us-ascii?Q?MjLuiZF5qwcLaqcvoiLyxZW4AESZtYj7i3RvAuUQUv2q0/YPFefodFSf62FP?= =?us-ascii?Q?ZmVHCC8m1Tcp+nbxUL1+hWK7cc5uIi2dgo1mhxhT4gRAM+Ry6jMa8H44mbER?= =?us-ascii?Q?q3N7grxAgfK9z4RZ4reeBg9WQqc9JV4oSGrmrN0xZoQ9KoD8SpZzmrRaV3BV?= =?us-ascii?Q?GP3E4cpKkkEyW0pQs1zf786akEl10hn88mnyFFyTpAG8ygGIHcmHEK0D+arU?= =?us-ascii?Q?QDUH82acmMB1LgJlwxcDnQQeOTemHfK4kjHEfeDTgX7AlkFatQrpUdf3rsYa?= =?us-ascii?Q?wvZ9+L+ltJWeJdNX2ae9MVVCIa9DIwuwbrIMw1ODr4ma1vJWSk8ij4TPUonw?= =?us-ascii?Q?0mhkakphWWO9vzIab/QoEGkdjX0rdVorbs17ZUpCoZRytk7UNJMGOQCWXAo7?= =?us-ascii?Q?NDqOlbu9r6ysdNyH1w77td+N?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4cab66b5-f0d0-4a39-73c9-08d92f9613c7 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8602.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 00:39:47.7544 (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: IiVb2mF5N/Pkeyfu5C4JIa92oHQDeWV3TTl+W5UaDmNLJQn/e7KzL/dKDcwNk2M8 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8779 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.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 15F0du1O002140 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.14 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 --- 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 Thu May 2 16:31:46 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 1623717612294974.3389566996076; Mon, 14 Jun 2021 17:40:12 -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-394-7xTl4VWgMbe8Urcb_x1l1A-1; Mon, 14 Jun 2021 20:40:09 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 03BEF107ACF6; Tue, 15 Jun 2021 00:40:05 +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 CBFB95D703; Tue, 15 Jun 2021 00:40:04 +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 946F11806D0C; Tue, 15 Jun 2021 00:40:04 +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 15F0e3jV002194 for ; Mon, 14 Jun 2021 20:40:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3AECD218ADFF; Tue, 15 Jun 2021 00:40:03 +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 34F1C200E4A7 for ; Tue, 15 Jun 2021 00:40:00 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.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 7E3351825065 for ; Tue, 15 Jun 2021 00:40:00 +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-60-fHMYmwn0PfGVmdgZHA7cJw-1; Mon, 14 Jun 2021 20:39:57 -0400 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2112.outbound.protection.outlook.com [104.47.17.112]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-40-UGXr1rPcMYa-DAVNKZSmHQ-1; Tue, 15 Jun 2021 02:39:55 +0200 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) by AM9PR04MB8779.eurprd04.prod.outlook.com (2603:10a6:20b:40a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Tue, 15 Jun 2021 00:39:54 +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.4219.025; Tue, 15 Jun 2021 00:39:54 +0000 Received: from localhost (139.212.192.217) by HK2PR06CA0020.apcprd06.prod.outlook.com (2603:1096:202:2e::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Tue, 15 Jun 2021 00:39:53 +0000 X-MC-Unique: 7xTl4VWgMbe8Urcb_x1l1A-1 X-MC-Unique: fHMYmwn0PfGVmdgZHA7cJw-1 X-MC-Unique: UGXr1rPcMYa-DAVNKZSmHQ-1 From: Lin Ma To: libvir-list@redhat.com Subject: [libvirt] [PATCH 11/12] virsh-volume: Apply virshStorageVolKeyCompleter to vol-{name, pool} commands Date: Tue, 15 Jun 2021 08:38:31 +0800 Message-ID: <20210615003832.5571-12-lma@suse.com> In-Reply-To: <20210615003832.5571-1-lma@suse.com> References: <20210615003832.5571-1-lma@suse.com> X-Originating-IP: [139.212.192.217] X-ClientProxiedBy: HK2PR06CA0020.apcprd06.prod.outlook.com (2603:1096:202:2e::32) 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: 438698f1-e7a6-46c4-07a8-08d92f9617de X-MS-TrafficTypeDiagnostic: AM9PR04MB8779: 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: 49Wjr1s1Q7TZ1kOkrR+JZp/fZstqjU1o1CwexpEdeiPCV7wW5VoL1uhZW33dhOQT0jtSQAqJJBTyEQAWv2+kzS3mxysmjlcFmcaRA8yBql3+GS1gN0RPhFHnFobVxAH/g55dOmz5ywtnFcdmGQNJ37WjZgcu1Zxj3T/9ELpHKimEY0fTxKYYG80FJJUcB6qbxhRsPpPIzKGFrAbYYjNV1W7ZRhOp4bcFXPibMwJ+76VBTSHpw+udic9pu2x/0jxKgN6QcZXScAD9YfEMEt0TsEQDQ+XBrTNwJ/xQqyZdv2fD0i8JXn9bYIzB5XkBBeUiiWJJa+pvKIhA+EMgnPiopagTlKf5Y91kM+bxnwgM9z5hhi4Dkq5xgmKFVZH8yh9dRigfrA8Za1+zmnwNkH1S0ZojyJYO32sNNmCBrpFz2jpUiJiEoWeBL6JhWdr4jLZa83UvVmxgcA5l6xkp3XkFPijSYfSGKB/kogsE+UK1eJ7rSC/jyVaNp+UGYDN44SoG844vIkd3D4Lyx7L/88+MUcN8Y8bSBWjRgyKJ8535AqKZXkmi0FFxuXRoBmYZA8PcugeEqrbmVmbLU6MHDe2w3zQGieHMr2jhMwbpanJvujcZoxruhzISF/CjMfBvZK21Juy2KrzTUWO9HgYFr8nUKQ== 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)(39860400002)(396003)(346002)(376002)(136003)(186003)(86362001)(16526019)(26005)(450100002)(6916009)(478600001)(8676002)(4744005)(5660300002)(8936002)(4326008)(66946007)(66556008)(66476007)(83380400001)(2616005)(956004)(1076003)(107886003)(316002)(6496006)(6666004)(2906002)(36756003)(38100700002)(6486002)(145543001); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ipHhCwz4mJFhuY+dyKl4o233RQV5MQAqNEBDxRVi+dwdIlVBk5gWbQ6Qhin1?= =?us-ascii?Q?5VU3sYyMwySCVxpqBMNVe/UM+y7ZrYjcPALMzJLHnjJr86nJ8vhT123xSMcU?= =?us-ascii?Q?dELAGc7WX0B4PpNVKJvPv97/HJJc0zB9V+xz9wGQ/UgDPZNtL/ftbZmfqcsq?= =?us-ascii?Q?41SX0NC0jsEHwFTXmvUvFOKil4bNn0FBUeCPenUbY6Pq2e5CsIjpb6t21Rgp?= =?us-ascii?Q?IcSy+Vf5vPE7DI2583mWwcswMN1HvPDqinbU8q/Gso21R98fGlyYLHzptEOU?= =?us-ascii?Q?xhBGJGmaw4zYzBz+XCEAvXzPujLacYa4IPgoIbd/9bWJXLFIzobmcG3+uNkq?= =?us-ascii?Q?eKiwz+ZMV6emNzgiLPlRbtsxaeg2f66C/pMI/GnUdYIlBLWTueI4/zoG2vuF?= =?us-ascii?Q?pIl543RI09bQdT2otG/YMtpIqujLTquiGNsa8bDfHCuELl9CaKNGpAK+kBQ2?= =?us-ascii?Q?I5WriyMTQUZmYUS1tS2Hd2rGZ0CVJvS0Q62NjtSnHArJ49gx7HBfcym4MUPp?= =?us-ascii?Q?d8vOgwVaeaaLjfM1/lrL+UDDczIv+9CkGOBXgwzAyK1r8oDk6coEmQ4lrPhI?= =?us-ascii?Q?ijjiTId9w+wcW/YLPkvt+WgAWUWCsw3UIlRYSUimMTlmDgTe9kEpijSZtzrc?= =?us-ascii?Q?CcEPwyrh9P8GR8y+WDVg6Tiqp2BDQvVebG+wjPpefzp07wCkjEwR/KEQWNOc?= =?us-ascii?Q?wtN+02kGsPdx5XHLGYhmvSQGQpP7jUN7jrLM7dxIv6CI6itVCQ4yNGw/IiuL?= =?us-ascii?Q?6+JY7E6wc5400W9jXqNccQfiReqEaoBD5VJ3oaM4i4zI3sFHpqVlYowXsQev?= =?us-ascii?Q?aKgPtU1PTcjxLyiRb6fGukbwEE4d4bKOcCSL6aKjc6llJtCjBpQbEu+tN8HY?= =?us-ascii?Q?Tw+RXqSiGDj2hEMgjrb3tsehladMEiSL2KRPScjIskxi5V8kFolgwYD8wr8p?= =?us-ascii?Q?FIo+5poKbb+u0PvpD3tFHNeXsLzIEVyG8W0wRk/zXDS/DWMTIR8grsFbnpJu?= =?us-ascii?Q?j9+ZVmtyZUdCVq1Ksz7LVXN1lOwX4unzzt/xF6PHsmwG9hVUHTbOkQ9VKHuV?= =?us-ascii?Q?nWlzI2L9KzFHGJo1a7FxjCROCKLPc4ZrYK5doqSTHfu5pL6G3GeVIqARiIH2?= =?us-ascii?Q?TSQLPdjAGcqCNWyV112ODpmkqy8uQFcpy5tCkdIAtIxnvTJPaCZkBxDsj3au?= =?us-ascii?Q?pwdXP1oNG8lByTOvjt9jxIBWw+Q2ctYPTTwSmBqvduUgfH7S3wohV+C1fUC8?= =?us-ascii?Q?8OTyZZ9iygemye6+FLwPQ99brJvnDT6IeBgNO7+iuGN5X0q+51IKO66PH4dZ?= =?us-ascii?Q?Pd8XgOReCpM8ZIyuZibes6xA?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 438698f1-e7a6-46c4-07a8-08d92f9617de X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8602.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 00:39:54.5017 (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: nhFPuVSZXN2NnpgFJtYURpPi+KN2lcS5Wk3zTI5IVh5aYr4HIO/8J6OWTm7esPG8 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8779 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 15F0e3jV002194 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.15 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 --- 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 Thu May 2 16:31:46 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 1623717669469665.2396436448546; Mon, 14 Jun 2021 17:41:09 -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-580-egHFX6JnNqmZ2P9ksgUwWw-1; Mon, 14 Jun 2021 20:41:06 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CCBA9185060E; Tue, 15 Jun 2021 00:41:01 +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 A422917A8B; Tue, 15 Jun 2021 00:41:01 +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 6B60046F60; Tue, 15 Jun 2021 00:41:01 +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 15F0eBqe002300 for ; Mon, 14 Jun 2021 20:40:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 90687112D432; Tue, 15 Jun 2021 00:40:11 +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 8BB71112D42D for ; Tue, 15 Jun 2021 00:40:09 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.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 B128F80D0E0 for ; Tue, 15 Jun 2021 00:40:08 +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-86-b9x9zEk5N0GU9bvu8Ujigw-1; Mon, 14 Jun 2021 20:40:06 -0400 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2106.outbound.protection.outlook.com [104.47.17.106]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-6-5eRmkPSgOPiUxuU6RY_tSw-1; Tue, 15 Jun 2021 02:40:03 +0200 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) by AM9PR04MB8779.eurprd04.prod.outlook.com (2603:10a6:20b:40a::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Tue, 15 Jun 2021 00:40:02 +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.4219.025; Tue, 15 Jun 2021 00:40:02 +0000 Received: from localhost (139.212.192.133) by HK2PR06CA0021.apcprd06.prod.outlook.com (2603:1096:202:2e::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Tue, 15 Jun 2021 00:40:01 +0000 X-MC-Unique: egHFX6JnNqmZ2P9ksgUwWw-1 X-MC-Unique: b9x9zEk5N0GU9bvu8Ujigw-1 X-MC-Unique: 5eRmkPSgOPiUxuU6RY_tSw-1 From: Lin Ma To: libvir-list@redhat.com Subject: [libvirt] [PATCH 12/12] virsh-volume: Apply virshStorageVolNameCompleter to vol-{key, path} commands Date: Tue, 15 Jun 2021 08:38:32 +0800 Message-ID: <20210615003832.5571-13-lma@suse.com> In-Reply-To: <20210615003832.5571-1-lma@suse.com> References: <20210615003832.5571-1-lma@suse.com> X-Originating-IP: [139.212.192.133] X-ClientProxiedBy: HK2PR06CA0021.apcprd06.prod.outlook.com (2603:1096:202:2e::33) 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: 87c4b8fa-93fa-4d70-cd33-08d92f961cc5 X-MS-TrafficTypeDiagnostic: AM9PR04MB8779: 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: /SrKBarz+8hRqEZnlYGeWtahTXa2zBB/dVxkwePz3jzbrWCk24fMSt94DovdreMeU3K+URdE1/NCdi69IbJaz7ncdItRl1WOjRAERqexadmZT5zDhbzsdZw1g2RPP72Fm5ujSWJkEJMciaFeIf+mbtxoN0HxDlhUfGjygC+N2IF/jL1vyndoL4KLfzgbOSV5BQsCNCAZZhb9MUdySAhKp+rJPbFX2Njk8JrkskxKQf3rcQpRtrhKn6H0yIN7JmjJDkJ5Ihq4tGaog2r4LUBbozepmdRCgh+ntQWTG+oboKOr1ZoG7AtpykqDcEPXQDLsUKdsDw4B7WAmCk8szyMre//1ncYnzDxjsCbZwyeiKToREoncOD8DqjAOnbuNAKw5UB1lE0x8QYkcct++Ko5BwVq3dkp3Xd1Th656rYvxc6eLKJ8YSrtrz/xsHsmWA1Xb+7WaQ3AMvJbOfa67Md7N8sQ8jihl4HQ5vmJz0j/K1vjryEqKE8kkjym9OjfyzjOzlrqldD3la0X79r0SQu/+TgxcmpzYCY7jQHLb7HQTqMvikqj2qVfIFRO+OOQGM1m6K3SwBn1UdVtFy0XG3LDt8jKB0REmJlZ/ltZh9LVgHk2tWSfGU3C850hbXNbpyntRUUs1HtfiR2ZoHCNV9HJuAg== 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)(39860400002)(396003)(346002)(376002)(136003)(186003)(86362001)(16526019)(26005)(450100002)(6916009)(478600001)(8676002)(4744005)(5660300002)(8936002)(4326008)(66946007)(66556008)(66476007)(83380400001)(2616005)(956004)(1076003)(107886003)(316002)(6496006)(6666004)(2906002)(36756003)(38100700002)(6486002)(145543001); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+dZPGpt8s2VtpzZV13+q5wE4kHIo7SIpjKLe4asm6Io5t6vacKpPWMg0dOPg?= =?us-ascii?Q?dvNHwVMHLw3j8Yixhh8ezbEkoEugHN9EPUROe8ctyAHhkB+JpWwP6UfxDzLe?= =?us-ascii?Q?1bSBz7Nk1VHGEJcvUo4l361i3H1rKv3a7tP0dnjs9l7uJ62fZAUZe+Ume7qq?= =?us-ascii?Q?ga0KGWsuUdULdlqWjnZ8HZIWHV5iB/eya+ub2/w/cyOlkuPGX7+k0uiyJO6R?= =?us-ascii?Q?1REBCZCSQGvu0YtL0R/j986nBucGs14ptFLU4Ktfgq1mdrfDXo461jQFud7s?= =?us-ascii?Q?0Wwt/Zmuz5/I3OAFH8VXk3UP6p7GTP/TmSuAE3W6269kHwN5Gz+u5xtC/AIn?= =?us-ascii?Q?87e6+nEndUVDNfkGfawepVow0pBxhmgrFPPGyN3yrA2d2mnpnKY8gpHHHhsa?= =?us-ascii?Q?oYgbnAPcRqBn0qzQKzZ349F7pd4mBV5b3F9KjJaf1Xj5Hs0zrcZT94TJcwEW?= =?us-ascii?Q?B3TEE3EJj/XxE0XTtU/ut+2/g94O2TANi8a8Q0P3vSBSljm28+LaFCHQaBtB?= =?us-ascii?Q?ZrIT6zZiwL8WQSb33ml8AeR9YKehxxS8844zdJ0IE9zkiMIUM0ufV9M0G06I?= =?us-ascii?Q?RORYt70wHqYanLGHcKHJ77sOgAEmHUw9TIh37WcNgreHNHTPSM3CkH+AlEox?= =?us-ascii?Q?XuGn7QstOGWGolZvrA2PAHYO3eEtSQ+qjjvSyXDiZnp7OiEuvM1KYF8aNeH4?= =?us-ascii?Q?cZ1wV6ffUZG0ANNPQCbcw07QIlYaP9IStGgolslBkeVv09tNJ2GRnBMY17vY?= =?us-ascii?Q?vd4LqwESHrZP/m9cu5snZj3wgfViB+aJIx/lF6fb36pMmKj0ylaRcVwfF7mp?= =?us-ascii?Q?ZcYWK1gfmSAILLaGCDAxp5EhzwGjuTufTXzid3Y8BlZ0E1YE8bdoTUryAKsT?= =?us-ascii?Q?6STQZZqSOrY6SeleT9h0RPEVFPv139MNwFroeaYDs8x15Zn0dIubQSwYIZHF?= =?us-ascii?Q?m/7ENwd+DBYnjltOTR6x4E2XDpV5ZLsd+cXIaGIIIMy46geQ/mWvmqj7Z/dO?= =?us-ascii?Q?/Sc6bJ/o4hgx7DooxPQwZ44AvmkMrif/K5+khBhLGXug8AXjpRjUusP48js1?= =?us-ascii?Q?89acBRrAeLSpk+CqfMft5j8G3qMPbKIZgx/llUr7sNgpgRk2rVq/jlRu9YQf?= =?us-ascii?Q?2PIQ4qsSS2OmM7WRvTj3qkdNVxACig/MAE4l7uPsYn1XS67JDwuRbwSuyNa5?= =?us-ascii?Q?NQLEfdMZ1kxnkxsOXF+ALdrPSjyjDNwUZcrZBVEoA/hL+GZljONQgbKHFmdk?= =?us-ascii?Q?xv4zF8n3Da2yB0+TY9LHnnodYXSlDkjOItbLBGswdnFyR9KDoicJ+3KuPMPx?= =?us-ascii?Q?SQbN2QbT/vXntpilHSVSzHlg?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 87c4b8fa-93fa-4d70-cd33-08d92f961cc5 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8602.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2021 00:40:02.8779 (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: F/hn1vxSaHHiD0RsEdIy7YX5uZcUiW+G2owJXtVtL3hhWICuKWS2es9bXbGSZqDr X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8779 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 15F0eBqe002300 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.23 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 --- 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