From nobody Mon Apr 29 17:19:21 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 ARC-Seal: i=1; a=rsa-sha256; t=1623035694; cv=none; d=zohomail.com; s=zohoarc; b=ZTOW4O1xdnW5dcVhHdu4pgdfiC4WTweeEY4+dz9pctDLGRPIRHtxSSnJ71pvKhHuRMJ4h/ZTNCEoBqc9hzvR0nAiQdULuTowwKgDh3BX5LB1EPjRX3/rfaSgR9EM+scO36jNdVkn/6krJcj8w0+83I4BSK3OHlKWAGaNTNcipVY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623035694; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lNS7D/MxR59pIksZr3Ba+BCVAy56pf37JCGd0D9SY1g=; b=RSJPI471wYnRFH6y60WiixT/yfFfXW+3J8D7Q5of9k6qjaYeU3N3ayOujxQMNzsaI13mDdDrQjDZOn9qqBzhxvmrmlPcbXXrtf+UNDYPimQj3lYgs+RtkUi3s0JyLJYNxoHgSmXBx7jAXhWpUtHVMLk8qK6H0OfwN4w9T8NwXGg= ARC-Authentication-Results: i=1; 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 header.from= (p=quarantine dis=quarantine) header.from= 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 1623035694079374.5405225584086; Sun, 6 Jun 2021 20:14: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-21-FxskyQPVNa-OxqH3sLkZpQ-1; Sun, 06 Jun 2021 23:14:50 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ADF885122; Mon, 7 Jun 2021 03:14:44 +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 8AF0F19CB2; Mon, 7 Jun 2021 03:14:44 +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 EE9E61801267; Mon, 7 Jun 2021 03:14:43 +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 1573Egvt003924 for ; Sun, 6 Jun 2021 23:14:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id E2ED5111285E; Mon, 7 Jun 2021 03:14:41 +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 DC080111285B for ; Mon, 7 Jun 2021 03:14:41 +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 C0BC780D0E0 for ; Mon, 7 Jun 2021 03:14:41 +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-344-sXIsNu77P925a2QgJdCqPg-1; Sun, 06 Jun 2021 23:14:39 -0400 Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01lp2056.outbound.protection.outlook.com [104.47.0.56]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-23-1HJ3MJ9KPIWDo4sYOa9RbA-2; Mon, 07 Jun 2021 05:14:37 +0200 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) by AM9PR04MB8763.eurprd04.prod.outlook.com (2603:10a6:20b:40a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.20; Mon, 7 Jun 2021 03:14:36 +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.4195.030; Mon, 7 Jun 2021 03:14:36 +0000 Received: from localhost (139.212.192.17) by HK0PR01CA0071.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.22 via Frontend Transport; Mon, 7 Jun 2021 03:14:35 +0000 X-MC-Unique: FxskyQPVNa-OxqH3sLkZpQ-1 X-MC-Unique: sXIsNu77P925a2QgJdCqPg-1 X-MC-Unique: 1HJ3MJ9KPIWDo4sYOa9RbA-2 From: Lin Ma To: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/2] virsh: Use VIR_ENUM_* for --format argument in doDump Date: Mon, 7 Jun 2021 11:14:17 +0800 Message-ID: <20210607031418.3545-2-lma@suse.com> In-Reply-To: <20210607031418.3545-1-lma@suse.com> References: <20210607031418.3545-1-lma@suse.com> X-Originating-IP: [139.212.192.17] X-ClientProxiedBy: HK0PR01CA0071.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::35) 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: a1e3a792-a07d-4ea5-019a-08d929626127 X-MS-TrafficTypeDiagnostic: AM9PR04MB8763: 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:873 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: ZpJEF75ttVbnw4A1r8w1Mb7BuEezaTQbKuRQvev9Im5vuFSDar38lMH1yAub0OLGd5nmz2k6RmnDiWAaNPp5rJ8kQfkx2/tF+XBlx4fYRdRX+HGRvmmGjY73NL01vK0r/8kvxcu0Uwj6WlIPzT32SpwMVGbhnUmIjB+td7yCaCL7m1ygFbOFIJKyFEJf7aqM5dCwJ/dAscJTYJV05yLSrn7zfuJeW6EJ9vXhBLZ9ebjIgoB+ZpySDVRB0v7Z1vdPZBID3UU3oy8h2ZqXlxufFuqGKxtshspsT26HyhdRK+a/bfProeyWM1CCeMvQCz0/iOQ8QtVZmLzTrznW4fft9GT4F1CYah6N1Yj3a+zFswwOV9nVKhMT2CCSArGID8eLPpBD4M3WkrtQbCZ07DSb2Z022vw3MS9b4fqDoOONt18nY9ro432grEOquyfdWPOrr+JqYaA1wml7jge/o1CR8hoqdsXjEAOvIe8aCTOHNGmO6PV9QizO8EQp3zW2lBwRHFB+fDxyPhsNcrFTn7+6m/Ve50Rq+UnGuKQ8PFRZaIEFuPacRJhT0S0ariT7uaPT1cYFQ3UTFbRUDgvH2cXEk0TBENKtKweJ1Vb5+2XRq+4= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9PR04MB8602.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(396003)(366004)(376002)(39860400002)(346002)(136003)(6496006)(6916009)(8676002)(8936002)(478600001)(107886003)(2906002)(26005)(450100002)(38100700002)(5660300002)(186003)(16526019)(4326008)(1076003)(83380400001)(316002)(6666004)(956004)(2616005)(36756003)(86362001)(66556008)(6486002)(66946007)(66476007); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?2+kwdglBv/rGItkt2cr9/hbSR0HSmW3Yi0NW5GhJ8Fsq/ywy/xR3Mmt7ExNt?= =?us-ascii?Q?yfSjucARk9H46tlmEoRou5lmAMWAsngg2Isw4ICUh8gZDLZ86bWp7cPcwl0T?= =?us-ascii?Q?vFzFFFNVpODr3qhtV3Vn6RCNDmpcF3kz7dwVWsk53dt40IRyEyWfHVDeBjRU?= =?us-ascii?Q?U55JjOccAbJWlxZ3y7hzHdiRwEjfKcWT2RjjWe7KCXum51kZCE6QPnnloHkB?= =?us-ascii?Q?Y+dw2uBM6uAN9SyDZoCnTRCuC232cYpIZ8zd/mbrKJSUm7qIml6hooNteaKO?= =?us-ascii?Q?bzkSSqy6C/W/XzNF7kGgjlpaVZF1T2yuFhWx12o9IuvLITR+cgsrPl694VBo?= =?us-ascii?Q?HCiBi3okq8+zLmw5FSQyviKPMxzHaIHJMckmcshR58r7Pey0c87//647smF8?= =?us-ascii?Q?nC+leIQ07wCm3ZMa1wW/XwqmOYCrQ2EOiiP8Lg9u/fw2Ovfx5X7/HK7X16fT?= =?us-ascii?Q?7gKyWVCVF5ltA13Cre/aVGtxS0qmDiAx/nvDavBasLalOYX68FSdxMDGzhnL?= =?us-ascii?Q?0vghAJkUEyze2fS75PGC6pXdypKNfiopZhn46HEVpMDQt3jlTp+XqezgbMf9?= =?us-ascii?Q?esCpHt8WHRoFHDBwWC4gtclnP0DTIn6w1UmK+ayQVEJhgEt86+K+p0f732qi?= =?us-ascii?Q?e8CCM0S0WcTBXzEEnYB4aLYF3710B0ldo80h7Nxe3mt5Xmh2noe99VO4Jf9j?= =?us-ascii?Q?vOwBAHwqGkkTB4LG87CuISzsB+SEN18ytr4CtSNLYhtvop4yvU9wZ0lf1YmQ?= =?us-ascii?Q?3BnLcVPbpCcFkGQwYQYK/QeXCo09XIUptjAbXhKCa5ETxSXABkhC5dVmQTGB?= =?us-ascii?Q?Tuw1JRNuuxnaDJpXTE0NdnwyStaQ9+GGctGzEQqB2DBlGX1qLFWr9fuDxsNR?= =?us-ascii?Q?2J0V9G046yO24kt0kxXoWQoTtq2xT+UNkrA55OZQN2kg1pzzmEEiTjlBYeDH?= =?us-ascii?Q?rGvmJ55qi/gAiKNbWH14Eq4vTEaqRvrjAxKBBBic9bzgTdJK7leiv1mOaPvB?= =?us-ascii?Q?euMMy6JKB10Z6NwLBF2VKJ7p2tgd0AD6pECdjVGlp1CI6sd69EcCo43V8/uJ?= =?us-ascii?Q?2RSxAQxdE+kuvax7mtjNKXaVeM5+lpzp7R6pcYLC3+yLtCoHne821s/8WXML?= =?us-ascii?Q?/HHMN5hMWrGlw/LREst/JsfWPDm5ZNT5XEH5QMN2RSKwqGkqkHhpYbGlTDOo?= =?us-ascii?Q?3IhVsXYy1Xoew2JZ67TBnyzFU3lATxaylR9F1lQIQJpZM2bo46bVfYE2LXrp?= =?us-ascii?Q?42nGkk8F8WIEKDK7ZQ0saEuFVeSPyZaReaOXFkiCdSwq3fmoIOQEq31gzMM+?= =?us-ascii?Q?zTd5+QHh9ur/O2LHY43dD4VW?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a1e3a792-a07d-4ea5-019a-08d929626127 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8602.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jun 2021 03:14:36.4111 (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: rRCYwu82Fp/q9IjEVXeyxoDgxxglirJ3JfL9sWBvS3M1Ir3FTgZnWheiyNtC91sr X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8763 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 1573Egvt003924 X-loop: libvir-list@redhat.com Cc: mprivozn@redhat.com, Lin Ma X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Signed-off-by: Lin Ma Reviewed-by: Michal Privoznik --- tools/virsh-domain.c | 26 ++++++++++++-------------- tools/virsh-domain.h | 1 + 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e42c4d612d..78276dd847 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5410,6 +5410,14 @@ static const vshCmdOptDef opts_dump[] =3D { {.name =3D NULL} }; =20 +VIR_ENUM_IMPL(virDomainCoreDumpFormat, + VIR_DOMAIN_CORE_DUMP_FORMAT_LAST, + "kdump-zlib", + "kdump-lzo", + "kdump-snappy", + "elf", + "win-dmp"); + static void doDump(void *opaque) { @@ -5421,7 +5429,7 @@ doDump(void *opaque) const char *to =3D NULL; unsigned int flags =3D 0; const char *format =3D NULL; - unsigned int dumpformat =3D VIR_DOMAIN_CORE_DUMP_FORMAT_RAW; + int dumpformat =3D VIR_DOMAIN_CORE_DUMP_FORMAT_RAW; #ifndef WIN32 sigset_t sigmask, oldsigmask; =20 @@ -5455,20 +5463,10 @@ doDump(void *opaque) } =20 if (vshCommandOptStringQuiet(ctl, cmd, "format", &format) > 0) { - if (STREQ(format, "kdump-zlib")) { - dumpformat =3D VIR_DOMAIN_CORE_DUMP_FORMAT_KDUMP_ZLIB; - } else if (STREQ(format, "kdump-lzo")) { - dumpformat =3D VIR_DOMAIN_CORE_DUMP_FORMAT_KDUMP_LZO; - } else if (STREQ(format, "kdump-snappy")) { - dumpformat =3D VIR_DOMAIN_CORE_DUMP_FORMAT_KDUMP_SNAPPY; - } else if (STREQ(format, "elf")) { - dumpformat =3D VIR_DOMAIN_CORE_DUMP_FORMAT_RAW; - } else if (STREQ(format, "win-dmp")) { - dumpformat =3D VIR_DOMAIN_CORE_DUMP_FORMAT_WIN_DMP; - } else { + if ((dumpformat =3D virDomainCoreDumpFormatTypeFromString(form= at)) < 0) { vshError(ctl, _("format '%s' is not supported, expecting " - "'kdump-zlib', 'kdump-lzo', 'kdump-snappy'= " - "or 'elf'"), format); + "'kdump-zlib', 'kdump-lzo', 'kdump-snappy'= , " + "'win-dmp' or 'elf'"), format); goto out; } } diff --git a/tools/virsh-domain.h b/tools/virsh-domain.h index 70e2aba1b1..0c1cc7a630 100644 --- a/tools/virsh-domain.h +++ b/tools/virsh-domain.h @@ -43,3 +43,4 @@ extern const vshCmdDef domManagementCmds[]; VIR_ENUM_DECL(virDomainProcessSignal); VIR_ENUM_DECL(virDomainLifecycle); VIR_ENUM_DECL(virDomainLifecycleAction); +VIR_ENUM_DECL(virDomainCoreDumpFormat); --=20 2.26.2 From nobody Mon Apr 29 17:19:22 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 ARC-Seal: i=1; a=rsa-sha256; t=1623035703; cv=none; d=zohomail.com; s=zohoarc; b=bnTzMsMeT6bvf9vDwO0DvIUaSQw1PqBPbKXpf9PiO0jGW0DDz14cyuEcDStmwHBZwsGnwwru5A943zDfMJfirpEvRaoYYuhF3/4EYTpOcD/WBQBOEr0Sko2E2/PqJasV1sV3etw8cgltyzcKbwPUm+rcOocrDmOTyNlgisFVJD0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623035703; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9cOZtOXoq38LsrrgzU+gTAPORPR8PHislSLxqo2UBZs=; b=HplJ3tEuZVQUujk3flr1ENHRXKia4CSJ/z1QwtblgFBfoUgeou81GH38c7SDE1+dfbbTDSVocMNokeY422Dg23CDVAuZ10Fs6eNUZHkPGg0PDOoBpT9n3tIAJrCiKo0Jz2isIWE++yQGhp98W7yjyHfnJf0Vbw5nNyN8WBnYWJc= ARC-Authentication-Results: i=1; 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 header.from= (p=quarantine dis=quarantine) header.from= 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 1623035703021512.2902192346613; Sun, 6 Jun 2021 20:15: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-404-MrcGcMHBMJSwIYZB1msJlg-1; Sun, 06 Jun 2021 23:15:00 -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 2B6735122; Mon, 7 Jun 2021 03:14:55 +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 0141AE705; Mon, 7 Jun 2021 03:14: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 C08AE1801268; Mon, 7 Jun 2021 03:14:54 +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 1573Erop003937 for ; Sun, 6 Jun 2021 23:14:53 -0400 Received: by smtp.corp.redhat.com (Postfix) id 16B75201EAD2; Mon, 7 Jun 2021 03:14:53 +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 114F7201EE2E for ; Mon, 7 Jun 2021 03:14:49 +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 CDA77101A531 for ; Mon, 7 Jun 2021 03:14:49 +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-538-V4yyKs7mPsuFSpdqhktj9g-1; Sun, 06 Jun 2021 23:14:47 -0400 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2111.outbound.protection.outlook.com [104.47.18.111]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-26-FyizGJMGMqOm6bXDDh7BQA-1; Mon, 07 Jun 2021 05:14:45 +0200 Received: from AM9PR04MB8602.eurprd04.prod.outlook.com (2603:10a6:20b:439::12) by AM9PR04MB8986.eurprd04.prod.outlook.com (2603:10a6:20b:409::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.20; Mon, 7 Jun 2021 03:14:43 +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.4195.030; Mon, 7 Jun 2021 03:14:43 +0000 Received: from localhost (139.212.192.109) by HK2PR0302CA0009.apcprd03.prod.outlook.com (2603:1096:202::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.9 via Frontend Transport; Mon, 7 Jun 2021 03:14:42 +0000 X-MC-Unique: MrcGcMHBMJSwIYZB1msJlg-1 X-MC-Unique: V4yyKs7mPsuFSpdqhktj9g-1 X-MC-Unique: FyizGJMGMqOm6bXDDh7BQA-1 From: Lin Ma To: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/2] virsh: Add coredump format completion to dump command Date: Mon, 7 Jun 2021 11:14:18 +0800 Message-ID: <20210607031418.3545-3-lma@suse.com> In-Reply-To: <20210607031418.3545-1-lma@suse.com> References: <20210607031418.3545-1-lma@suse.com> X-Originating-IP: [139.212.192.109] X-ClientProxiedBy: HK2PR0302CA0009.apcprd03.prod.outlook.com (2603:1096:202::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: f8ddea54-be6c-4989-af23-08d929626535 X-MS-TrafficTypeDiagnostic: AM9PR04MB8986: 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: tPIkn97HHYProTngdfx+ehzkJgZ00XGE8QAZhc6WQ3s3LV8gj1XZBzY1Pwl+RE+9zH8ZPj/KdpxSe5FvwPFdt4W87ym0puRZ1MT/yKmUh6ybUB8SgLiwHFk3xjZiYnksT6G1bayfsJxpJY7KKLGveunTuAyMQz3qx21GwwPhk8Xul8fkJdYzEU/+90JppsW6KA2Pm5bRKcIpDSZyjgPEB+jppVVJCestJgIGHFY+7qoqIrOXP/vrexzJn0wH+eZYJPHBmlhDcVWiWTKlG2nyq+nz8DBYalTGNFE+NWoc6U7dO8HYyqPsK3Xo2Poi0FAeWzm38vGfAGuJL7ln9uDZVi/+ZFtAgl6twmofJgRVUNoW8t3sWWhySjCxY8ouEHVq3IGmxhNzPhT9XPBwp89u3KvcdApsAVnE5Ni/b06jJWLexh0DiHeSw71/cOfpyC2mfxN3SmPFw/d0K24k8hVBJtx8TkJkzDTGfVZFWtZDZhYf30/XxOhYHsxgTO9paXSLkfEVRoi+mCCLEq43xeRPrU/lCeagwnthrKMmj+BM4bHZ5auy5vVS15NaPKcPVv5y6NiE79u1zGSSnwPeiE69BLQFN1wRbKMom7uR/6wmy0Q= 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)(396003)(346002)(136003)(376002)(366004)(38100700002)(478600001)(2906002)(5660300002)(1076003)(6916009)(2616005)(107886003)(8936002)(8676002)(4326008)(450100002)(66556008)(66946007)(6486002)(66476007)(956004)(16526019)(26005)(186003)(36756003)(86362001)(6496006)(6666004)(316002); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?xgsApZmMhodmwOe9sj9rvksYe+8migzfi2xTFtxB84Ywb4citQdwZX2mexuV?= =?us-ascii?Q?+HmnZYpD9adTTUPyQdadrRYTA+qmmRrtx15n6sVZAy4OkZEiTav66nPSW//y?= =?us-ascii?Q?dWXZeLVonLCg65i4jBAmPFGbNQMySDBxmp0kgho49bnYEC0YtfCfP3nQMHbB?= =?us-ascii?Q?L8lSiFucNix9s/hoSkKvSZ9markIbOAFc2a3R3rCJfM3+4ctkevAdF20Yx04?= =?us-ascii?Q?K5nizPEAfcNGwdE1n+/YgH1UEwata9j77YrzMR1n1UP3zWsa/i2N0EiYfSGf?= =?us-ascii?Q?109uQt7lgx8SdDaSZBohS4Ey+6/v9lYIS3lhnYS8bCqriWEOcfkwKwVli2v2?= =?us-ascii?Q?0UCkKufaK/PEH4905i6MAmwOEULFCGWXN33ltxbrTYsNVOO4DG4xJNvZXviH?= =?us-ascii?Q?i1ZZZQv5nfgmvj9jaAnWP4fspuQLw8sE9JQyqA9QfivV0utVx6OqFX8Rjl8X?= =?us-ascii?Q?iYth4jDcXEpwcEVqq06vvCmdOxjLaJgcS1bNjA3S3ozdVXDED+8IM74gs7m9?= =?us-ascii?Q?qRABg10aAbpIdKIRueiPfWSpfxBJjPxrWsC/cKDBBDTRnT2jctrC7e2O2Obh?= =?us-ascii?Q?IqFQJ6yjrsHY/qHCDgZlV2oM99vAXq6o2jeQx9Zg9kn/obqu3px/Lb1Yyy7I?= =?us-ascii?Q?HyfFXQL1VrvQxuhf4yP+7UtP0H4DMB2TvxeGZ4iQZ4PuLnYPOtcLc7laWGpK?= =?us-ascii?Q?8+zuOmEDL5UOdJ7mrfzdQAfeJ/fStWjw0qv86MBQVhaJ9HWZ50nvE9rNJj0K?= =?us-ascii?Q?zobAs56W2M205MMhX6qYQ+P96xxYdOABoHGdH/0uKUfDaA6oAFGKeqP9nVQx?= =?us-ascii?Q?sk6Rn7KvY1QFPjxGUwHDY8SNOqWjLb9SeMBE5hsx4noyX5+n257i98UHl87f?= =?us-ascii?Q?oGgiJc1J6AlTp/rjDP+K2lfmpCNzdaY72ZrOeqHyVD1BwmrkuHeE+N3r0Ua0?= =?us-ascii?Q?JyjZJZ58C8uyxCAsDz/qRy96c5TfFoHveXMtGkdWUFfoiV/QMAwB73iRQiFx?= =?us-ascii?Q?r4d7Q5ZJ2MWaczjqZddCeP0+DjzXcGnqqtvVg+QgoBAiCaYB8WUb2pqOzAdM?= =?us-ascii?Q?3TrXtYKw4nAHBLS98b3a3TSUVgXx6K4xP97TyC0/NNyC8fBC0M5rvL/emvc7?= =?us-ascii?Q?7k6vTGCRkR1VHTFAa/1zn+hdjeihmgBIQxlaBjcfGz5JkgFvbDVfzj0RzNDc?= =?us-ascii?Q?I1vonaQ9fiN6Oy2s7wn51IJZNjTMTZZOSYjtltAZJnpegRnCVRJ9GrlEgXhx?= =?us-ascii?Q?E0aWCaIiwj3flZ2qhP2KwAh/qo8egRDOlXoj7OLNXfPRjSh6LN0u7PXcVjkU?= =?us-ascii?Q?d7ielaMd8GtVZ5DC8L8PEXC7?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f8ddea54-be6c-4989-af23-08d929626535 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8602.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jun 2021 03:14:43.3795 (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: 6roZadYBwsISsdLNjHPnIoENbHrHY2a//GgZLoebTYu5LwJhOqpbdjtYMV+XS71c X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8986 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 1573Erop003937 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 Reviewed-by: Michal Privoznik --- tools/virsh-completer-domain.c | 19 +++++++++++++++++++ tools/virsh-completer-domain.h | 5 +++++ tools/virsh-domain.c | 2 ++ 3 files changed, 26 insertions(+) diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c index 1f72b856b4..20d503ff09 100644 --- a/tools/virsh-completer-domain.c +++ b/tools/virsh-completer-domain.c @@ -940,3 +940,22 @@ virshDomainFSMountpointsCompleter(vshControl *ctl, virshDomainFree(dom); return ret; } + + +char ** +virshDomainCoreDumpFormatCompleter(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_DOMAIN_CORE_DUMP_FORMAT_LAST + 1); + + for (i =3D 0; i < VIR_DOMAIN_CORE_DUMP_FORMAT_LAST; i++) + ret[i] =3D g_strdup(virDomainCoreDumpFormatTypeToString(i)); + + return ret; +} diff --git a/tools/virsh-completer-domain.h b/tools/virsh-completer-domain.h index ef242d0c68..f548f7ba9e 100644 --- a/tools/virsh-completer-domain.h +++ b/tools/virsh-completer-domain.h @@ -122,3 +122,8 @@ char ** virshKeycodeNameCompleter(vshControl *ctl, char ** virshDomainFSMountpointsCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); + +char ** +virshDomainCoreDumpFormatCompleter(vshControl *ctl G_GNUC_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, + unsigned int flags); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 78276dd847..ecad3a5e5d 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5405,6 +5405,8 @@ static const vshCmdOptDef opts_dump[] =3D { }, {.name =3D "format", .type =3D VSH_OT_STRING, + .flags =3D VSH_OFLAG_NONE, + .completer =3D virshDomainCoreDumpFormatCompleter, .help =3D N_("specify the format of memory-only dump") }, {.name =3D NULL} --=20 2.26.2