diff --git a/seabios.spec b/seabios.spec index 4cc9dc6..2780c37 100644 --- a/seabios.spec +++ b/seabios.spec @@ -1,6 +1,6 @@ Name: seabios Version: 1.7.4 -Release: 3%{?dist} +Release: 5%{?dist} Summary: Open-source legacy BIOS implementation Group: Applications/Emulators @@ -22,6 +22,9 @@ Source18: config.seabios-256k # Fix kvm migration with empty virtio-scsi controller (bz #1032208) Patch0001: 0001-init_virtio_scsi-reset-the-HBA-before-freeing-its-vi.patch +# Fix freebsd problem +Patch0002: vgabios-attempt-to-detect-old-x86emu-and-force-a-fault.diff + BuildRequires: python iasl BuildRequires: binutils-x86_64-linux-gnu gcc-x86_64-linux-gnu @@ -76,6 +79,8 @@ SeaVGABIOS is an open-source VGABIOS implementation. # Fix kvm migration with empty virtio-scsi controller (bz #1032208) %patch0001 -p1 +# Fix running freebsd (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=737142) +%patch0002 -p1 # Makefile changes version to include date and buildhost sed -i 's,VERSION=%{version}.*,VERSION=%{version},g' Makefile @@ -143,6 +148,9 @@ install -m 0644 binaries/vgabios*.bin $RPM_BUILD_ROOT%{_datadir}/seavgabios %changelog +* Wed Mar 26 2014 Matthias Clasen 1.7.4-5 +- Fix booting FreeBSD VMs in virt-manager + * Mon Mar 17 2014 Cole Robinson 1.7.4-3 - Build 256k bios images for qemu 2.0 diff --git a/vgabios-attempt-to-detect-old-x86emu-and-force-a-fault.diff b/vgabios-attempt-to-detect-old-x86emu-and-force-a-fault.diff new file mode 100644 index 0000000..246f7f6 --- /dev/null +++ b/vgabios-attempt-to-detect-old-x86emu-and-force-a-fault.diff @@ -0,0 +1,66 @@ +From: Kevin O'Connor +Date: Wed Feb 5 22:47:29 2014 -0500 +Subject: vgabios: Attempt to detect old x86emu and force a fault. +Upstream-Commit: 8032b8a0fec550de5cb2f7d37aa031cebc2200c3 +Bug-Debian: http://bugs.debian.org/737142 + +Check for cases where the leal instruction does not work. This +instruction is known to not be emulated properly on old versions of +x86emu. If a broken version of x86emu is found, force a fault that +x86emu will easily detect. This should help prevent soft failures +when running old software. + +Signed-off-by: Kevin O'Connor + +diff --git a/vgasrc/vgaentry.S b/vgasrc/vgaentry.S +index 9854448..6e31c4e 100644 +--- a/vgasrc/vgaentry.S ++++ b/vgasrc/vgaentry.S +@@ -45,9 +45,26 @@ _rom_header_signature: + * Entry points + ****************************************************************/ + +- // This macro is the same as ENTRY_ARG except the "calll" +- // instruction is avoided to work around known issues in the +- // emulation of some versions of x86emu. ++ // Force a fault if found to be running on broken x86emu versions. ++ DECLFUNC x86emu_fault ++x86emu_fault: ++1: hlt ++ jmp 1b ++ ++ // This macro implements a call while avoiding instructions ++ // that old versions of x86emu have problems with. ++ .macro VGA_CALLL cfunc ++ // Make sure leal instruction works. ++ movl $0x8000, %ecx ++ leal (%ecx, %ecx, 1), %ecx ++ cmpl $0x10000, %ecx ++ jne x86emu_fault ++ // Use callw instead of calll ++ push %ax ++ callw \cfunc ++ .endm ++ ++ // This macro is the same as ENTRY_ARG except VGA_CALLL is used. + .macro ENTRY_ARG_VGA cfunc + cli + cld +@@ -57,7 +74,7 @@ _rom_header_signature: + movl %esp, %ebx // Backup %esp, then zero high bits + movzwl %sp, %esp + movl %esp, %eax // First arg is pointer to struct bregs +- pushw %ax ; callw \cfunc ++ VGA_CALLL \cfunc + movl %ebx, %esp // Restore %esp (including high bits) + POPBREGS + .endm +@@ -103,7 +120,7 @@ entry_10_extrastack: + movw %ds, %dx // Setup %ss/%esp and call function + movw %dx, %ss + movl %eax, %esp +- pushw %ax ; callw handle_10 ++ VGA_CALLL handle_10 + + movl %esp, %eax // Restore registers and return + movw BREGS_size+4(%eax), %ss