From patchwork Sun Dec 20 07:43:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elliott Mitchell X-Patchwork-Id: 11997689 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.3 required=3.0 tests=BAYES_00,DATE_IN_PAST_96_XX, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A102C433E9 for ; Mon, 4 Jan 2021 22:59:24 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EF6D620784 for ; Mon, 4 Jan 2021 22:59:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EF6D620784 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=m5p.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.61608.108481 (Exim 4.92) (envelope-from ) id 1kwYoh-00020p-SI; Mon, 04 Jan 2021 22:59:11 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 61608.108481; Mon, 04 Jan 2021 22:59:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwYoh-00020i-Ni; Mon, 04 Jan 2021 22:59:11 +0000 Received: by outflank-mailman (input) for mailman id 61608; Mon, 04 Jan 2021 22:59:10 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kwYjH-0000oY-Vq for xen-devel@lists.xenproject.org; Mon, 04 Jan 2021 22:53:36 +0000 Received: from mailhost.m5p.com (unknown [74.104.188.4]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 21118051-e2b3-41c1-a8c5-e610e60ebd68; Mon, 04 Jan 2021 22:53:05 +0000 (UTC) Received: from m5p.com (mailhost.m5p.com [IPv6:2001:470:1f07:15ff:0:0:0:f7]) by mailhost.m5p.com (8.15.2/8.15.2) with ESMTPS id 104MqumN071518 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 4 Jan 2021 17:53:02 -0500 (EST) (envelope-from ehem@m5p.com) Received: (from ehem@localhost) by m5p.com (8.15.2/8.15.2/Submit) id 104MqulQ071517; Mon, 4 Jan 2021 14:52:56 -0800 (PST) (envelope-from ehem) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 21118051-e2b3-41c1-a8c5-e610e60ebd68 Message-Id: <7335199fc01d8dc6bf524cd764ed8e9107066380.1608663694.git.ehem+xen@m5p.com> In-Reply-To: References: From: Elliott Mitchell To: xen-devel@lists.xenproject.org Cc: Ian Jackson Cc: Wei Liu Cc: Anthony PERARD Date: Sat, 19 Dec 2020 23:43:08 -0800 Subject: [WIP PATCH 16/16] WIP: tools/xl: Enhance "vm-list" command Add several features to specify output. Allow omitting potentially unneeded lines and add argument for exact line format. Signed-off-by: Elliott Mitchell --- tools/xl/xl_list.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/xl/xl_list.c b/tools/xl/xl_list.c index 58809aa10b..ef44466017 100644 --- a/tools/xl/xl_list.c +++ b/tools/xl/xl_list.c @@ -500,18 +500,28 @@ int main_list(int argc, char **argv) int main_vm_list(int argc, char **argv) { const char *formatstr = "%u %5i %n\n"; + bool dom0 = true; + bool header = true; int opt; static const struct option opts[] = { {"format", 0, 0, 'F'}, + {"no-domain0", 0, 0, '0'}, + {"no-header", 0, 0, 'H'}, }; libxl_vminfo *info; int nb_vm, i; - SWITCH_FOREACH_OPT(opt, "F:", opts, "vm-list", 0) { + SWITCH_FOREACH_OPT(opt, "0F:H", opts, "vm-list", 0) { + case '0': + dom0 = false; + break; case 'F': formatstr = optarg; break; + case 'H': + header = false; + break; } info = libxl_list_vm(ctx, &nb_vm); @@ -521,10 +531,10 @@ int main_vm_list(int argc, char **argv) exit(EXIT_FAILURE); } - format(formats_vm, formatstr, NULL); + if (header) format(formats_vm, formatstr, NULL); for (i = 0; i < nb_vm; i++) - format(formats_vm, formatstr, info + i); + if (info[i].domid || dom0) format(formats_vm, formatstr, info + i); libxl_vminfo_list_free(info, nb_vm);