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
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From c3f4c5bcf0d8d93b5116f3e368c4739abe2dc06d Mon Sep 17 00:00:00 2001
|
|
From: Anthony PERARD <anthony.perard@citrix.com>
|
|
Date: Mon, 14 Mar 2016 17:55:44 +0000
|
|
Subject: [PATCH 09/15] hvmloader: Check modules whereabouts in perform_tests
|
|
|
|
As perform_tests() is going to clear memory past 4MB, we check that the
|
|
memory can be use or we skip the tests.
|
|
|
|
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
|
|
---
|
|
tools/firmware/hvmloader/tests.c | 20 ++++++++++++++++++++
|
|
1 file changed, 20 insertions(+)
|
|
|
|
Index: xen-4.7.0-testing/tools/firmware/hvmloader/tests.c
|
|
===================================================================
|
|
--- xen-4.7.0-testing.orig/tools/firmware/hvmloader/tests.c
|
|
+++ xen-4.7.0-testing/tools/firmware/hvmloader/tests.c
|
|
@@ -210,6 +210,26 @@ void perform_tests(void)
|
|
return;
|
|
}
|
|
|
|
+ /* Check that tests does not use memory where modules are stored */
|
|
+ if ( ((uint32_t)hvm_start_info + sizeof(struct hvm_start_info)) > 4 << 20
|
|
+ && (uint32_t)hvm_start_info < 8 << 20 )
|
|
+ {
|
|
+ printf("Skipping tests due to memory used by hvm_start_info\n");
|
|
+ return;
|
|
+ }
|
|
+ for ( unsigned i = 0; i < hvm_start_info->nr_modules; i++ )
|
|
+ {
|
|
+ const struct hvm_modlist_entry *modlist =
|
|
+ (struct hvm_modlist_entry *)hvm_start_info->modlist_paddr;
|
|
+ if ( modlist[i].paddr
|
|
+ && modlist[i].paddr + modlist[i].size > 4ul << 20
|
|
+ && modlist[i].paddr < 8ul << 20 )
|
|
+ {
|
|
+ printf("Skipping tests due to memory used by a module\n");
|
|
+ return;
|
|
+ }
|
|
+ }
|
|
+
|
|
passed = skipped = 0;
|
|
for ( i = 0; tests[i].test; i++ )
|
|
{
|