92ed83b0e8
the toolstack instead of embedding in hvmloader http://lists.xenproject.org/archives/html/xen-devel/2016-03/msg01626.html 0001-libxc-Rework-extra-module-initialisation.patch, 0002-libxc-Prepare-a-start-info-structure-for-hvmloader.patch, 0003-configure-define-SEABIOS_PATH-and-OVMF_PATH.patch, 0004-firmware-makefile-install-BIOS-blob.patch, 0005-libxl-Load-guest-BIOS-from-file.patch, 0006-xen-Move-the-hvm_start_info-C-representation-from-li.patch, 0007-hvmloader-Grab-the-hvm_start_info-pointer.patch, 0008-hvmloader-Locate-the-BIOS-blob.patch, 0009-hvmloader-Check-modules-whereabouts-in-perform_tests.patch, 0010-hvmloader-Load-SeaBIOS-from-hvm_start_info-modules.patch, 0011-hvmloader-Load-OVMF-from-modules.patch, 0012-hvmloader-Specific-bios_load-function-required.patch, 0013-hvmloader-Always-build-in-SeaBIOS-and-OVMF-loader.patch, 0014-configure-do-not-depend-on-SEABIOS_PATH-or-OVMF_PATH.patch - Enable support for UEFI on x86_64 using the ovmf-x86_64-ms.bin firmware from qemu-ovmf-x86_64. The firmware is preloaded with Microsoft keys to more closely resemble firmware on real hardware FATE#320490 OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=416
132 lines
4.1 KiB
Diff
132 lines
4.1 KiB
Diff
From 009fef2fc4bdffd1c9e5caf557157b4949d3842b Mon Sep 17 00:00:00 2001
|
|
From: Anthony PERARD <anthony.perard@citrix.com>
|
|
Date: Mon, 14 Mar 2016 17:55:46 +0000
|
|
Subject: [PATCH 11/15] hvmloader: Load OVMF from modules
|
|
|
|
... and do not include the OVMF ROM into hvmloader anymore.
|
|
|
|
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
|
|
---
|
|
tools/firmware/hvmloader/Makefile | 15 +--------------
|
|
tools/firmware/hvmloader/ovmf.c | 30 +++++++++++++-----------------
|
|
2 files changed, 14 insertions(+), 31 deletions(-)
|
|
|
|
Index: xen-4.7.0-testing/tools/firmware/hvmloader/Makefile
|
|
===================================================================
|
|
--- xen-4.7.0-testing.orig/tools/firmware/hvmloader/Makefile
|
|
+++ xen-4.7.0-testing/tools/firmware/hvmloader/Makefile
|
|
@@ -43,7 +43,6 @@ endif
|
|
|
|
CIRRUSVGA_DEBUG ?= n
|
|
|
|
-OVMF_DIR := ../ovmf-dir
|
|
ROMBIOS_DIR := ../rombios
|
|
|
|
ifeq ($(CONFIG_ROMBIOS),y)
|
|
@@ -61,12 +60,6 @@ ROMS :=
|
|
ifeq ($(CONFIG_OVMF),y)
|
|
OBJS += ovmf.o
|
|
CFLAGS += -DENABLE_OVMF
|
|
-ifeq ($(OVMF_PATH),)
|
|
- OVMF_ROM := $(OVMF_DIR)/ovmf.bin
|
|
-else
|
|
- OVMF_ROM := $(OVMF_PATH)
|
|
-endif
|
|
-ROMS += $(OVMF_ROM)
|
|
endif
|
|
|
|
ifeq ($(CONFIG_ROMBIOS),y)
|
|
@@ -85,7 +78,7 @@ endif
|
|
all: subdirs-all
|
|
$(MAKE) hvmloader
|
|
|
|
-ovmf.o rombios.o: roms.inc
|
|
+rombios.o: roms.inc
|
|
smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(SMBIOS_REL_DATE)\""
|
|
|
|
hvmloader: $(OBJS) acpi/acpi.a
|
|
@@ -102,12 +95,6 @@ ifneq ($(ROMBIOS_ROM),)
|
|
echo "#endif" >> $@.new
|
|
endif
|
|
|
|
-ifneq ($(OVMF_ROM),)
|
|
- echo "#ifdef ROM_INCLUDE_OVMF" >> $@.new
|
|
- sh ./mkhex ovmf $(OVMF_ROM) >> $@.new
|
|
- echo "#endif" >> $@.new
|
|
-endif
|
|
-
|
|
ifneq ($(STDVGA_ROM),)
|
|
echo "#ifdef ROM_INCLUDE_VGABIOS" >> $@.new
|
|
sh ./mkhex vgabios_stdvga $(STDVGA_ROM) >> $@.new
|
|
Index: xen-4.7.0-testing/tools/firmware/hvmloader/ovmf.c
|
|
===================================================================
|
|
--- xen-4.7.0-testing.orig/tools/firmware/hvmloader/ovmf.c
|
|
+++ xen-4.7.0-testing/tools/firmware/hvmloader/ovmf.c
|
|
@@ -34,17 +34,10 @@
|
|
#include <xen/hvm/ioreq.h>
|
|
#include <xen/memory.h>
|
|
|
|
-#define ROM_INCLUDE_OVMF
|
|
-#include "roms.inc"
|
|
-
|
|
-#define OVMF_SIZE (sizeof(ovmf))
|
|
#define OVMF_MAXOFFSET 0x000FFFFFULL
|
|
-#define OVMF_BEGIN (0x100000000ULL - ((OVMF_SIZE + OVMF_MAXOFFSET) & ~OVMF_MAXOFFSET))
|
|
-#define OVMF_END (OVMF_BEGIN + OVMF_SIZE)
|
|
#define LOWCHUNK_BEGIN 0x000F0000
|
|
#define LOWCHUNK_SIZE 0x00010000
|
|
#define LOWCHUNK_MAXOFFSET 0x0000FFFF
|
|
-#define LOWCHUNK_END (OVMF_BEGIN + OVMF_SIZE)
|
|
#define OVMF_INFO_PHYSICAL_ADDRESS 0x00001000
|
|
|
|
extern unsigned char dsdt_anycpu_qemu_xen[];
|
|
@@ -97,24 +90,31 @@ static void ovmf_load(const struct bios_
|
|
void *bios_addr, uint32_t bios_length)
|
|
{
|
|
xen_pfn_t mfn;
|
|
- uint64_t addr = OVMF_BEGIN;
|
|
+ uint64_t addr = 0x100000000ULL
|
|
+ - ((bios_length + OVMF_MAXOFFSET) & ~OVMF_MAXOFFSET);
|
|
+ uint64_t ovmf_end = addr + bios_length;
|
|
+
|
|
+ ovmf_config.bios_address = addr;
|
|
+ ovmf_config.image_size = bios_length;
|
|
|
|
/* Copy low-reset vector portion. */
|
|
- memcpy((void *) LOWCHUNK_BEGIN, (uint8_t *) config->image
|
|
- + OVMF_SIZE
|
|
- - LOWCHUNK_SIZE,
|
|
+ memcpy((void *) LOWCHUNK_BEGIN,
|
|
+ (uint8_t *) bios_addr + bios_length - LOWCHUNK_SIZE,
|
|
LOWCHUNK_SIZE);
|
|
|
|
/* Ensure we have backing page prior to moving FD. */
|
|
- while ( (addr >> PAGE_SHIFT) != (OVMF_END >> PAGE_SHIFT) )
|
|
+ while ( (addr >> PAGE_SHIFT) != (ovmf_end >> PAGE_SHIFT) )
|
|
{
|
|
mfn = (uint32_t) (addr >> PAGE_SHIFT);
|
|
addr += PAGE_SIZE;
|
|
mem_hole_populate_ram(mfn, 1);
|
|
}
|
|
|
|
+ /* Check that source and destination does not overlaps. */
|
|
+ BUG_ON(addr + bios_length > (unsigned)bios_addr
|
|
+ && addr < (unsigned)bios_addr + bios_length);
|
|
/* Copy FD. */
|
|
- memcpy((void *) OVMF_BEGIN, config->image, OVMF_SIZE);
|
|
+ memcpy((void *) ovmf_config.bios_address, bios_addr, bios_length);
|
|
}
|
|
|
|
static void ovmf_acpi_build_tables(void)
|
|
@@ -151,10 +151,6 @@ static void ovmf_setup_e820(void)
|
|
struct bios_config ovmf_config = {
|
|
.name = "OVMF",
|
|
|
|
- .image = ovmf,
|
|
- .image_size = sizeof(ovmf),
|
|
-
|
|
- .bios_address = OVMF_BEGIN,
|
|
.bios_load = ovmf_load,
|
|
|
|
.load_roms = 0,
|