From nobody Sat May 18 23:55:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1650423203259463.7704419137889; Tue, 19 Apr 2022 19:53:23 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.308718.524521 (Exim 4.92) (envelope-from ) id 1nh0Sh-00012h-TK; Wed, 20 Apr 2022 02:52:59 +0000 Received: by outflank-mailman (output) from mailman id 308718.524521; Wed, 20 Apr 2022 02:52:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nh0Sh-00012a-QL; Wed, 20 Apr 2022 02:52:59 +0000 Received: by outflank-mailman (input) for mailman id 308718; Wed, 20 Apr 2022 02:52:58 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nh0Sg-00012Q-EA for xen-devel@lists.xenproject.org; Wed, 20 Apr 2022 02:52:58 +0000 Received: from mailhost.m5p.com (mailhost.m5p.com [74.104.188.4]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id fb0a3102-c054-11ec-a405-831a346695d4; Wed, 20 Apr 2022 04:52:57 +0200 (CEST) Received: from m5p.com (mailhost.m5p.com [IPv6:2001:470:1f07:15ff:0:0:0:f7]) by mailhost.m5p.com (8.16.1/8.15.2) with ESMTPS id 23K2qlpN093140 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Tue, 19 Apr 2022 22:52:53 -0400 (EDT) (envelope-from ehem@m5p.com) Received: (from ehem@localhost) by m5p.com (8.16.1/8.15.2/Submit) id 23K2ql8U093139; Tue, 19 Apr 2022 19:52:47 -0700 (PDT) (envelope-from ehem) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: fb0a3102-c054-11ec-a405-831a346695d4 Message-Id: In-Reply-To: References: From: Elliott Mitchell Cc: Wei Liu Cc: Anthony PERARD Date: Tue, 19 Apr 2022 18:56:03 -0700 Subject: [PATCH 1/2] tools/xl: Sort create command options To: xen-devel@lists.xenproject.org X-Spam-Status: No, score=0.4 required=10.0 tests=KHOP_HELO_FCRDNS autolearn=no autolearn_force=no version=3.4.5 X-Spam-Checker-Version: SpamAssassin 3.4.5 (2021-03-20) on mattapan.m5p.com X-ZM-MESSAGEID: 1650423203701100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hopefully simplify future changes by sorting options lists for `xl create`. Signed-off-by: Elliott Mitchell --- tools/xl/xl_cmdtable.c | 10 +++++----- tools/xl/xl_vmcontrol.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c index 661323d488..f546beaceb 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -24,16 +24,16 @@ const struct cmd_spec cmd_table[] =3D { &main_create, 1, 1, "Create a domain from config file ", " [options] [vars]", + "-c Connect to the console after the domain is = created.\n" + "-d Enable debug messages.\n" + "-e Do not wait in the background for the death= of the domain.\n" + "-F Run in foreground until death of the domain= .\n" "-h Print this help.\n" "-p Leave the domain paused after it is created= .\n" - "-c Connect to the console after the domain is = created.\n" "-f FILE, --defconfig=3DFILE\n Use the given con= figuration file.\n" - "-q, --quiet Quiet.\n" "-n, --dryrun Dry run - prints the resulting configuratio= n\n" " (deprecated in favour of global -N option)= .\n" - "-d Enable debug messages.\n" - "-F Run in foreground until death of the domain= .\n" - "-e Do not wait in the background for the death= of the domain.\n" + "-q, --quiet Quiet.\n" "-V, --vncviewer Connect to the VNC display after the domain= is created.\n" "-A, --vncviewer-autopass\n" " Pass VNC password to viewer via stdin.\n" diff --git a/tools/xl/xl_vmcontrol.c b/tools/xl/xl_vmcontrol.c index 435155a033..2ec4140258 100644 --- a/tools/xl/xl_vmcontrol.c +++ b/tools/xl/xl_vmcontrol.c @@ -1169,13 +1169,13 @@ int main_create(int argc, char **argv) int paused =3D 0, debug =3D 0, daemonize =3D 1, console_autoconnect = =3D 0, quiet =3D 0, monitor =3D 1, vnc =3D 0, vncautopass =3D 0, ignore_m= asks =3D 0; int opt, rc; - static struct option opts[] =3D { + static const struct option opts[] =3D { + {"defconfig", 1, 0, 'f'}, {"dryrun", 0, 0, 'n'}, + {"ignore-global-affinity-masks", 0, 0, 'i'}, {"quiet", 0, 0, 'q'}, - {"defconfig", 1, 0, 'f'}, {"vncviewer", 0, 0, 'V'}, {"vncviewer-autopass", 0, 0, 'A'}, - {"ignore-global-affinity-masks", 0, 0, 'i'}, COMMON_LONG_OPTS }; =20 @@ -1186,12 +1186,15 @@ int main_create(int argc, char **argv) argc--; argv++; } =20 - SWITCH_FOREACH_OPT(opt, "Fnqf:pcdeVAi", opts, "create", 0) { - case 'f': - filename =3D optarg; + SWITCH_FOREACH_OPT(opt, "Ffnq:AVcdeip", opts, "create", 0) { + case 'A': + vnc =3D vncautopass =3D 1; break; - case 'p': - paused =3D 1; + case 'F': + daemonize =3D 0; + break; + case 'V': + vnc =3D 1; break; case 'c': console_autoconnect =3D 1; @@ -1199,28 +1202,25 @@ int main_create(int argc, char **argv) case 'd': debug =3D 1; break; - case 'F': - daemonize =3D 0; - break; case 'e': daemonize =3D 0; monitor =3D 0; break; + case 'f': + filename =3D optarg; + break; + case 'i': + ignore_masks =3D 1; + break; case 'n': dryrun_only =3D 1; break; + case 'p': + paused =3D 1; + break; case 'q': quiet =3D 1; break; - case 'V': - vnc =3D 1; - break; - case 'A': - vnc =3D vncautopass =3D 1; - break; - case 'i': - ignore_masks =3D 1; - break; } =20 memset(&dom_info, 0, sizeof(dom_info)); --=20 2.30.2 From nobody Sat May 18 23:55:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1650423270430935.1129736923875; Tue, 19 Apr 2022 19:54:30 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.308731.524532 (Exim 4.92) (envelope-from ) id 1nh0Ts-0001eq-6l; Wed, 20 Apr 2022 02:54:12 +0000 Received: by outflank-mailman (output) from mailman id 308731.524532; Wed, 20 Apr 2022 02:54:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nh0Ts-0001eh-3v; Wed, 20 Apr 2022 02:54:12 +0000 Received: by outflank-mailman (input) for mailman id 308731; Wed, 20 Apr 2022 02:54:10 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nh0Tq-000126-NK for xen-devel@lists.xenproject.org; Wed, 20 Apr 2022 02:54:10 +0000 Received: from mailhost.m5p.com (mailhost.m5p.com [74.104.188.4]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 264b3875-c055-11ec-8fbf-03012f2f19d4; Wed, 20 Apr 2022 04:54:09 +0200 (CEST) Received: from m5p.com (mailhost.m5p.com [IPv6:2001:470:1f07:15ff:0:0:0:f7]) by mailhost.m5p.com (8.16.1/8.15.2) with ESMTPS id 23K2s0Uu093150 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Tue, 19 Apr 2022 22:54:06 -0400 (EDT) (envelope-from ehem@m5p.com) Received: (from ehem@localhost) by m5p.com (8.16.1/8.15.2/Submit) id 23K2s0EU093149; Tue, 19 Apr 2022 19:54:00 -0700 (PDT) (envelope-from ehem) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 264b3875-c055-11ec-8fbf-03012f2f19d4 Message-Id: <09213ac26738ee51401b454534c6b437766481b7.1650422518.git.ehem+xen@m5p.com> In-Reply-To: References: From: Elliott Mitchell Cc: Wei Liu Cc: Anthony PERARD Date: Tue, 19 Apr 2022 18:23:41 -0700 Subject: [PATCH 2/2] tools/xl: Allow specifying JSON for domain configuration file format To: xen-devel@lists.xenproject.org X-Spam-Status: No, score=0.4 required=10.0 tests=KHOP_HELO_FCRDNS autolearn=no autolearn_force=no version=3.4.5 X-Spam-Checker-Version: SpamAssassin 3.4.5 (2021-03-20) on mattapan.m5p.com X-ZM-MESSAGEID: 1650423272206100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" JSON is currently used when saving domains to mass storage. Being able to use JSON as the normal input to `xl create` has potential to be valuable. Add the functionality. Signed-off-by: Elliott Mitchell --- tools/xl/xl.h | 5 +++++ tools/xl/xl_cmdtable.c | 2 ++ tools/xl/xl_vmcontrol.c | 13 +++++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/tools/xl/xl.h b/tools/xl/xl.h index c5c4bedbdd..a0c03f96df 100644 --- a/tools/xl/xl.h +++ b/tools/xl/xl.h @@ -49,6 +49,11 @@ struct domain_create { int migrate_fd; /* -1 means none */ int send_back_fd; /* -1 means none */ char **migration_domname_r; /* from malloc */ + enum { + FORMAT_DEFAULT, + FORMAT_JSON, + FORMAT_LEGACY, + } format; }; =20 int create_domain(struct domain_create *dom_info); diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c index f546beaceb..04d579a596 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -31,6 +31,8 @@ const struct cmd_spec cmd_table[] =3D { "-h Print this help.\n" "-p Leave the domain paused after it is created= .\n" "-f FILE, --defconfig=3DFILE\n Use the given con= figuration file.\n" + "-j, --json Interpret configuration file as JSON format= \n" + "-J Use traditional configuration file format (= current default)\n" "-n, --dryrun Dry run - prints the resulting configuratio= n\n" " (deprecated in favour of global -N option)= .\n" "-q, --quiet Quiet.\n" diff --git a/tools/xl/xl_vmcontrol.c b/tools/xl/xl_vmcontrol.c index 2ec4140258..41bd919d1d 100644 --- a/tools/xl/xl_vmcontrol.c +++ b/tools/xl/xl_vmcontrol.c @@ -789,7 +789,7 @@ int create_domain(struct domain_create *dom_info) extra_config); } config_source=3Dconfig_file; - config_in_json =3D false; + config_in_json =3D dom_info.format =3D=3D FORMAT_JSON ? true : fal= se; } else { if (!config_data) { fprintf(stderr, "Config file not specified and" @@ -1173,6 +1173,7 @@ int main_create(int argc, char **argv) {"defconfig", 1, 0, 'f'}, {"dryrun", 0, 0, 'n'}, {"ignore-global-affinity-masks", 0, 0, 'i'}, + {"json", 0, 0, 'j'}, {"quiet", 0, 0, 'q'}, {"vncviewer", 0, 0, 'V'}, {"vncviewer-autopass", 0, 0, 'A'}, @@ -1181,18 +1182,23 @@ int main_create(int argc, char **argv) =20 dom_info.extra_config =3D NULL; =20 + dom_info.format =3D FORMAT_DEFAULT; + if (argv[1] && argv[1][0] !=3D '-' && !strchr(argv[1], '=3D')) { filename =3D argv[1]; argc--; argv++; } =20 - SWITCH_FOREACH_OPT(opt, "Ffnq:AVcdeip", opts, "create", 0) { + SWITCH_FOREACH_OPT(opt, "FJfjnq:AVcdeip", opts, "create", 0) { case 'A': vnc =3D vncautopass =3D 1; break; case 'F': daemonize =3D 0; break; + case 'J': + dom_info.format =3D FORMAT_LEGACY; + break; case 'V': vnc =3D 1; break; @@ -1212,6 +1218,9 @@ int main_create(int argc, char **argv) case 'i': ignore_masks =3D 1; break; + case 'j': + dom_info.format =3D FORMAT_JSON; + break; case 'n': dryrun_only =3D 1; break; --=20 2.30.2