From c7dfe4ac58dd9c8678126b78da961b233a49f3f9 Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Fri, 22 Sep 2017 16:25:06 +0100 Subject: [PATCH] xl: introduce a domain type option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Introduce a new type option to xl configuration files in order to specify the domain type. This supersedes the current builder option. The new option is documented in the xl.cfg man page, and the previous builder option is marked as deprecated. Signed-off-by: Roger Pau Monné Acked-by: Ian Jackson --- docs/man/xl.cfg.pod.5.in | 23 +++++++++++++++++++-- tools/xl/xl_parse.c | 43 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 60 insertions(+), 6 deletions(-) diff --git a/docs/man/xl.cfg.pod.5.in b/docs/man/xl.cfg.pod.5.in index e7ab67395b85..b4bbc8f9a742 100644 --- a/docs/man/xl.cfg.pod.5.in +++ b/docs/man/xl.cfg.pod.5.in @@ -54,9 +54,9 @@ Pairs may be separated either by a newline or a semicolon. Both of the following are valid: name="h0" - builder="hvm" + type="hvm" - name="h0"; builder="hvm" + name="h0"; type="hvm" =head1 OPTIONS @@ -77,6 +77,25 @@ single host must be unique. =over 4 +=item B + +Specifies that this is to be a PV domain, suitable for hosting Xen-aware +guest operating systems. This is the default. + +=item B + +Specifies that this is to be an HVM domain. That is, a fully virtualised +computer with emulated BIOS, disk and network peripherals, etc. + +=back + +=head3 Deprecated guest type selection + +Note that the builder option is being deprecated in favor of the type +option. + +=over 4 + =item B Specifies that this is to be a PV domain, suitable for hosting Xen-aware guest diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 8812898c368d..f9cc56471df0 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -900,10 +900,45 @@ void parse_config_data(const char *config_source, } libxl_defbool_set(&c_info->run_hotplug_scripts, run_hotplug_scripts); - c_info->type = LIBXL_DOMAIN_TYPE_PV; - if (!xlu_cfg_get_string (config, "builder", &buf, 0) && - !strncmp(buf, "hvm", strlen(buf))) - c_info->type = LIBXL_DOMAIN_TYPE_HVM; + + if (!xlu_cfg_get_string(config, "type", &buf, 0)) { + if (!strncmp(buf, "hvm", strlen(buf))) + c_info->type = LIBXL_DOMAIN_TYPE_HVM; + else if (!strncmp(buf, "pv", strlen(buf))) + c_info->type = LIBXL_DOMAIN_TYPE_PV; + else { + fprintf(stderr, "Invalid domain type %s.\n", buf); + exit(1); + } + } + + /* Deprecated since Xen 4.10. */ + if (!xlu_cfg_get_string(config, "builder", &buf, 0)) { + libxl_domain_type builder_type; + + if (c_info->type == LIBXL_DOMAIN_TYPE_INVALID) + fprintf(stderr, +"The \"builder\" option is being deprecated, please use \"type\" instead.\n"); + if (!strncmp(buf, "hvm", strlen(buf))) + builder_type = LIBXL_DOMAIN_TYPE_HVM; + else if (!strncmp(buf, "generic", strlen(buf))) + builder_type = LIBXL_DOMAIN_TYPE_PV; + else { + fprintf(stderr, "Invalid domain type %s.\n", buf); + exit(1); + } + + if (c_info->type != LIBXL_DOMAIN_TYPE_INVALID && + c_info->type != builder_type) { + fprintf(stderr, + "Contradicting \"builder\" and \"type\" options specified.\n"); + exit(1); + } + c_info->type = builder_type; + } + + if (c_info->type == LIBXL_DOMAIN_TYPE_INVALID) + c_info->type = LIBXL_DOMAIN_TYPE_PV; xlu_cfg_get_defbool(config, "hap", &c_info->hap, 0);