ba5dde9750
53a199d7-x86-EFI-allow-FPU-XMM-use-in-runtime-service-functions.patch - Upstream patches from Jan 538c338f-x86-amd_ucode-flip-revision-numbers-in-printk.patch 538ee637-ACPI-Prevent-acpi_table_entries-from-falling-into-a-infinite-loop.patch 5390917a-VT-d-honor-APEI-firmware-first-mode-in-XSA-59-workaround-code.patch 53909259-x86-domctl-two-functional-fixes-to-XEN_DOMCTL_-gs-etvcpuextstate.patch 5390927f-x86-fix-reboot-shutdown-with-running-HVM-guests.patch 5396d818-avoid-crash-on-HVM-domain-destroy-with-PCI-passthrough.patch 5396e805-x86-HVM-refine-SMEP-test-in-HVM_CR4_GUEST_RESERVED_BITS.patch 539ebe62-x86-EFI-improve-boot-time-diagnostics.patch 539ec004-x86-mce-don-t-spam-the-console-with-CPUx-Temperature-z.patch 53a040c6-page-alloc-scrub-pages-used-by-hypervisor-upon-freeing.patch (replaces xsa100.patch) 53a1990a-IOMMU-prevent-VT-d-device-IOTLB-operations-on-wrong-IOMMU.patch - Replace 'domUloader' with 'pygrub' when converting or importing Xen domains into libvirt with xen2libvirt. domUloader is no longer provided in xen-tools. Modified: xen2libvirt.py Thu Jun 13 15:50:19 MDT 2014 - cyliu@suse.com - fate#310956: Support Direct Kernel Boot for FV guests patches would go to upstream: qemu side: qemu-support-xen-hvm-direct-kernel-boot.patch xen side: xen-pass-kernel-initrd-to-qemu.patch - bnc#880751 - VUL-0: xen: Hypervisor heap contents leaked to guests xsa100.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=320
62 lines
2.7 KiB
Diff
62 lines
2.7 KiB
Diff
# Commit ebbb51dc8c1790e5187442a808003298b6796762
|
|
# Date 2014-06-16 11:52:34 +0200
|
|
# Author Jan Beulich <jbeulich@suse.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
x86/EFI: improve boot time diagnostics
|
|
|
|
To aid analysis of eventual errors, print EFI status codes with error
|
|
messages where available. Also remove a case where the status gets
|
|
stored into a local variable without being used examined (which mis-
|
|
guided me to add an error check there in try 1 of this patch).
|
|
|
|
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
|
|
|
--- a/xen/arch/x86/efi/boot.c
|
|
+++ b/xen/arch/x86/efi/boot.c
|
|
@@ -344,11 +344,12 @@ static EFI_FILE_HANDLE __init get_parent
|
|
ret = efi_bs->HandleProtocol(loaded_image->DeviceHandle,
|
|
&fs_protocol, (void **)&fio);
|
|
if ( EFI_ERROR(ret) )
|
|
- blexit(L"Couldn't obtain the File System Protocol Interface");
|
|
+ PrintErrMesg(L"Couldn't obtain the File System Protocol Interface",
|
|
+ ret);
|
|
ret = fio->OpenVolume(fio, &dir_handle);
|
|
} while ( ret == EFI_MEDIA_CHANGED );
|
|
if ( ret != EFI_SUCCESS )
|
|
- blexit(L"OpenVolume failure");
|
|
+ PrintErrMesg(L"OpenVolume failure", ret);
|
|
|
|
#define buffer ((CHAR16 *)keyhandler_scratch)
|
|
#define BUFFERSIZE sizeof(keyhandler_scratch)
|
|
@@ -967,8 +968,8 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SY
|
|
|
|
if ( !EFI_ERROR(efi_bs->LocateProtocol(&shim_lock_guid, NULL,
|
|
(void **)&shim_lock)) &&
|
|
- shim_lock->Verify(kernel.ptr, kernel.size) != EFI_SUCCESS )
|
|
- blexit(L"Dom0 kernel image could not be verified.");
|
|
+ (status = shim_lock->Verify(kernel.ptr, kernel.size)) != EFI_SUCCESS )
|
|
+ PrintErrMesg(L"Dom0 kernel image could not be verified", status);
|
|
|
|
name.s = get_value(&cfg, section.s, "ramdisk");
|
|
if ( name.s )
|
|
@@ -1379,8 +1380,8 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SY
|
|
}
|
|
}
|
|
|
|
- status = efi_bs->GetMemoryMap(&efi_memmap_size, NULL, &map_key,
|
|
- &efi_mdesc_size, &mdesc_ver);
|
|
+ efi_bs->GetMemoryMap(&efi_memmap_size, NULL, &map_key,
|
|
+ &efi_mdesc_size, &mdesc_ver);
|
|
mbi.mem_upper -= efi_memmap_size;
|
|
mbi.mem_upper &= -__alignof__(EFI_MEMORY_DESCRIPTOR);
|
|
if ( mbi.mem_upper < xen_phys_start )
|
|
@@ -1389,7 +1390,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SY
|
|
status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key,
|
|
&efi_mdesc_size, &mdesc_ver);
|
|
if ( EFI_ERROR(status) )
|
|
- blexit(L"Cannot obtain memory map");
|
|
+ PrintErrMesg(L"Cannot obtain memory map", status);
|
|
|
|
/* Populate E820 table and check trampoline area availability. */
|
|
e = e820map - 1;
|