From patchwork Tue Jul 12 14:42:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 9225543 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AA44D6086B for ; Tue, 12 Jul 2016 14:49:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9AB6A27D29 for ; Tue, 12 Jul 2016 14:49:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F94327D85; Tue, 12 Jul 2016 14:49:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EB76A27DCD for ; Tue, 12 Jul 2016 14:49:03 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bMyxK-00047F-Qk; Tue, 12 Jul 2016 14:46:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bMyxJ-00044b-HL for xen-devel@lists.xen.org; Tue, 12 Jul 2016 14:46:37 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id FA/C7-14454-CC205875; Tue, 12 Jul 2016 14:46:36 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuplkeJIrShJLcpLzFFi42JxWrohUvc0U2u 4weTXmhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8bpeXoFz5wrzjV+Y2lg3GPUxcjJISHgL/F5 w1R2EJtNwEBixfSrjCC2iICsxOquOUBxDg5mgXKJo8d0QcLCAlYSvW+mMoGEWQRUJfbPlwQJ8 wrYSPSvaGSHmCgn0XD+PjOIzSlgK9HW+hTMFgKqWbt0FiuErSZxY+EyFoheQYmTM5+A2cwCEh IHX7xgBhkvIcAt8bfbfgIj3ywkVbOQVC1gZFrFqFGcWlSWWqRrZKyXVJSZnlGSm5iZo2toaKK Xm1pcnJiempOYVKyXnJ+7iREYTPUMDIw7GGcd9zvEKMnBpCTK28zcEi7El5SfUpmRWJwRX1Sa k1p8iFGGg0NJgvckY2u4kGBRanpqRVpmDjCsYdISHDxKIrxfQNK8xQWJucWZ6RCpU4yKUuK83 sBoEBIASWSU5sG1wWLpEqOslDAvIwMDgxBPQWpRbmYJqvwrRnEORiVhXjaQKTyZeSVw018BLW YCWlzr0AyyuCQRISXVwDg//t+9PDmRNqNZT87M72crSHfP9qqQ4neY68U2uybP5PLaGvNQnUf fb5ZUbNh05My2x1Fz/u+ekFTnz9KllLy2M/qGgMH79xLW60ufO04SMVRcX8iyk0XPxDWy7NDK A4sCKl/fq+e3ePxMwZbt+DydvPw3llIvwh+GSD7WFu+ZcV7FbtFuRSWW4oxEQy3mouJEALl45 mqgAgAA X-Env-Sender: prvs=994f31c19=anthony.perard@citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1468334793!52459056!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28769 invoked from network); 12 Jul 2016 14:46:35 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-4.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 12 Jul 2016 14:46:35 -0000 X-IronPort-AV: E=Sophos;i="5.28,352,1464652800"; d="scan'208";a="365726523" From: Anthony PERARD To: Date: Tue, 12 Jul 2016 15:42:42 +0100 Message-ID: <20160712144251.558-6-anthony.perard@citrix.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160712144251.558-1-anthony.perard@citrix.com> References: <20160712144251.558-1-anthony.perard@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Anthony PERARD , Wei Liu , Ian Jackson Subject: [Xen-devel] [PATCH v6 05/14] libxl: Load guest BIOS from file X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP The path to the BIOS blob can be overriden by the xl's bios_path_override option, or provided by u.hvm.bios_firmware in the domain_build_info struct by other libxl user. Signed-off-by: Anthony PERARD Acked-by: Wei Liu --- Changes in V6: - use goto for error handling of libxl__load_hvm_firmware_module() Changes in V5: - man page, use B<> to highlight config option in description. - rename config option from `bios_override` to `bios_path_override` - store libxl_read_file_contents() return value into r instead of e (just renamed the variable) - rename domain_build_info.u.hvm.bios_firmware to system_firmware Changes in V4: - updating man page to have bios_override described. - return ERROR_INVAL in libxl__load_hvm_firmware_module when the file is empty. Changes in V3: - move seabios_path and ovmf_path to libxl_path.c (with renaming) - fix some coding style - warn for empty file - remove rombios stuff (will still be built-in hvmloader) - rename field bios_filename in domain_build_info to bios_firmware to follow naming of acpi and smbios. - log an error after libxl_read_file_contents() only when it return ENOENT - return an error on empty file. - added #define LIBXL_HAVE_BUILDINFO_HVM_BIOS_FIRMWARE --- docs/man/xl.cfg.pod.5.in | 9 +++++++ tools/libxl/libxl.h | 8 ++++++ tools/libxl/libxl_dom.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_internal.h | 2 ++ tools/libxl/libxl_paths.c | 10 ++++++++ tools/libxl/libxl_types.idl | 1 + tools/libxl/xl_cmdimpl.c | 11 +++++--- 7 files changed, 99 insertions(+), 3 deletions(-) diff --git a/docs/man/xl.cfg.pod.5.in b/docs/man/xl.cfg.pod.5.in index 3bb27d0..a685b83 100644 --- a/docs/man/xl.cfg.pod.5.in +++ b/docs/man/xl.cfg.pod.5.in @@ -1212,6 +1212,15 @@ Requires device_model_version=qemu-xen. =back +=item B + +Override the path to the blob to be used as BIOS. The blob provided here MUST +be consistent with the B which you have specified. You should not +normally need to specify this option. + +This options does not have any effect if using B or +B. + =item B Hide or expose the IA32 Physical Address Extensions. These extensions diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 2c0f868..2b1f678 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -928,6 +928,14 @@ void libxl_mac_copy(libxl_ctx *ctx, libxl_mac *dst, libxl_mac *src); #define LIBXL_HAVE_CHECKPOINTED_STREAM 1 /* + * LIBXL_HAVE_BUILDINFO_HVM_SYSTEM_FIRMWARE + * + * libxl_domain_build_info has u.hvm.system_firmware field which can be use + * to provide a different firmware blob (like SeaBIOS or OVMF). + */ +#define LIBXL_HAVE_BUILDINFO_HVM_SYSTEM_FIRMWARE + +/* * ERROR_REMUS_XXX error code only exists from Xen 4.5, Xen 4.6 and it * is changed to ERROR_CHECKPOINT_XXX in Xen 4.7 */ diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index ec29060..2a1793d 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -862,6 +862,42 @@ err: return ret; } +static int libxl__load_hvm_firmware_module(libxl__gc *gc, + const char *filename, + const char *what, + struct xc_hvm_firmware_module *m) +{ + int datalen = 0; + void *data = NULL; + int r, rc; + + LOG(DEBUG, "Loading %s: %s", what, filename); + r = libxl_read_file_contents(CTX, filename, &data, &datalen); + if (r) { + /* + * Print a message only on ENOENT, other errors are logged by the + * function libxl_read_file_contents(). + */ + if (r == ENOENT) + LOGEV(ERROR, r, "failed to read %s file", what); + rc = ERROR_FAIL; + goto out; + } + libxl__ptr_add(gc, data); + if (datalen) { + /* Only accept non-empty files */ + m->data = data; + m->length = datalen; + } else { + LOG(ERROR, "file %s for %s is empty", filename, what); + rc = ERROR_INVAL; + goto out; + } + rc = 0; +out: + return rc; +} + static int libxl__domain_firmware(libxl__gc *gc, libxl_domain_build_info *info, struct xc_dom_image *dom) @@ -871,6 +907,7 @@ static int libxl__domain_firmware(libxl__gc *gc, int e, rc; int datalen = 0; void *data; + const char *bios_filename = NULL; if (info->u.hvm.firmware) firmware = info->u.hvm.firmware; @@ -914,6 +951,30 @@ static int libxl__domain_firmware(libxl__gc *gc, goto out; } + if (info->device_model_version == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { + if (info->u.hvm.system_firmware) { + bios_filename = info->u.hvm.system_firmware; + } else { + switch (info->u.hvm.bios) { + case LIBXL_BIOS_TYPE_SEABIOS: + bios_filename = libxl__seabios_path(); + break; + case LIBXL_BIOS_TYPE_OVMF: + bios_filename = libxl__ovmf_path(); + break; + case LIBXL_BIOS_TYPE_ROMBIOS: + default: + abort(); + } + } + } + + if (bios_filename) { + rc = libxl__load_hvm_firmware_module(gc, bios_filename, "BIOS", + &dom->system_firmware_module); + if (rc) goto out; + } + if (info->u.hvm.smbios_firmware) { data = NULL; e = libxl_read_file_contents(ctx, info->u.hvm.smbios_firmware, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index e7ab85d..e6a199b 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2317,6 +2317,8 @@ _hidden const char *libxl__xen_config_dir_path(void); _hidden const char *libxl__xen_script_dir_path(void); _hidden const char *libxl__lock_dir_path(void); _hidden const char *libxl__run_dir_path(void); +_hidden const char *libxl__seabios_path(void); +_hidden const char *libxl__ovmf_path(void); /*----- subprocess execution with timeout -----*/ diff --git a/tools/libxl/libxl_paths.c b/tools/libxl/libxl_paths.c index 9b7b0d5..6972b90 100644 --- a/tools/libxl/libxl_paths.c +++ b/tools/libxl/libxl_paths.c @@ -35,6 +35,16 @@ const char *libxl__run_dir_path(void) return XEN_RUN_DIR; } +const char *libxl__seabios_path(void) +{ + return SEABIOS_PATH; +} + +const char *libxl__ovmf_path(void) +{ + return OVMF_PATH; +} + /* * Local variables: * mode: C diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index ef614be..98bfc3a 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -513,6 +513,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("timer_mode", libxl_timer_mode), ("nested_hvm", libxl_defbool), ("altp2m", libxl_defbool), + ("system_firmware", string), ("smbios_firmware", string), ("acpi_firmware", string), ("hdtype", libxl_hdtype), diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index d1fcfa4..1d06598 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1562,12 +1562,17 @@ static void parse_config_data(const char *config_source, xlu_cfg_replace_string (config, "firmware_override", &b_info->u.hvm.firmware, 0); - if (!xlu_cfg_get_string(config, "bios", &buf, 0) && - libxl_bios_type_from_string(buf, &b_info->u.hvm.bios)) { + xlu_cfg_replace_string (config, "bios_path_override", + &b_info->u.hvm.system_firmware, 0); + if (!xlu_cfg_get_string(config, "bios", &buf, 0)) { + if (libxl_bios_type_from_string(buf, &b_info->u.hvm.bios)) { fprintf(stderr, "ERROR: invalid value \"%s\" for \"bios\"\n", buf); exit (1); - } + } + } else if (b_info->u.hvm.system_firmware) + fprintf(stderr, "WARNING: " + "bios_path_override given without specific bios name\n"); xlu_cfg_get_defbool(config, "pae", &b_info->u.hvm.pae, 0); xlu_cfg_get_defbool(config, "apic", &b_info->u.hvm.apic, 0);