From e0b3073f53dd9c0a2206932c58b5f83a87f7525b Mon Sep 17 00:00:00 2001
From: bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Thu, 9 Feb 2006 21:51:02 +0000
Subject: [PATCH] BIOS workarounds for kqemu

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1758 c046a42c-6fe2-441c-8c8c-71466251a162
---
 pc-bios/bios.bin  | Bin 65536 -> 65536 bytes
 pc-bios/bios.diff |  32 ++++++++++++++++++++++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin
index f3e40c240ad1dccbd5f04a1b28f703bec923868a..710885076f1fe650f423f06ff6734cfdf7f2a61c 100644
GIT binary patch
delta 233
zcmZo@U}<Pz*>G(RTXTvE%b(Me@63^vc*(%PV8c{udGMh?TIa>I-3$zA`xzKs+@CBs
zS6F5rP%_Og%{i^{Hv?nooh@xI7lM>?luEzYFxg?QC|56t%ULS*V&dfZx#H6KHe96w
zFN%SJL20}G@Vt%cJoq}=hPzbaMf~K6b4A(hZFqocohPrIE3T(#!wXca3RBy8;(gR>
z-Yt#sacOgZLfmKY1jP9P=4^g7*N<_t!+g#_maA&-&rdE~D6u*913w?*tjVSS9<yvv
O2a8Ra{NX=8qYePN1Yp1b

delta 231
zcmZo@U}<Pz*>G(R+i3<6n0#lBti)3w!-lEU^58>(w9boZyBQeL_A@ZNxIS5MuCUB5
zpk$g~nsZv?ZwAKFJ6qabE(9s(D3yM(VzR?rQLau9m$OvrMd#%Bx#H5<He96wFS3Dx
zL20}G@Vt%cJoq}?hPzbaMfl{2b4A&$ZFqocttYRYE3PJM!wXa^3sc*9;(gR>&Ml4c
zalg~%{yc5)1kCuc`O{oKMpmFA28PYH^LYYUuBg2~Ke=$B#OBlw{Ctd)CYSzu%(7k`
NEH-8GhyVPHI|2FKT*UwY

diff --git a/pc-bios/bios.diff b/pc-bios/bios.diff
index 7ba84d7..4f33a0a 100644
--- a/pc-bios/bios.diff
+++ b/pc-bios/bios.diff
@@ -4,7 +4,7 @@ RCS file: /cvsroot/bochs/bochs/bios/rombios.c,v
 retrieving revision 1.130
 diff -u -w -r1.130 rombios.c
 --- rombios.c	13 Feb 2005 08:47:30 -0000	1.130
-+++ rombios.c	6 Apr 2005 22:38:16 -0000
++++ rombios.c	9 Feb 2006 21:49:38 -0000
 @@ -8570,7 +8570,10 @@
  use32 386
  #define APM_PROT32
@@ -16,13 +16,41 @@ diff -u -w -r1.130 rombios.c
  
  #define APM_REAL
  #include "apmbios.S"
+@@ -8611,6 +8614,7 @@
+   mov al, #0x80
+ bios32_end:
+   popf
++  and dword ptr[esp+4],0xfffffffc ;; reset CS.RPL for kqemu
+   retf
+ 
+ .align 16
+@@ -8721,17 +8725,17 @@
+ pci_pro_fail:
+   pop edi
+   pop esi
+-  sti
+   popf
+   stc
++  and dword ptr[esp+4],0xfffffffc ;; reset CS.RPL for kqemu
+   retf
+ pci_pro_ok:
+   xor ah, ah
+   pop edi
+   pop esi
+-  sti
+   popf
+   clc
++  and dword ptr[esp+4],0xfffffffc ;; reset CS.RPL for kqemu
+   retf
+ 
+ pci_pro_select_reg:
 Index: apmbios.S
 ===================================================================
 RCS file: /cvsroot/bochs/bochs/bios/apmbios.S,v
 retrieving revision 1.1
 diff -u -w -r1.1 apmbios.S
 --- apmbios.S	20 Jun 2004 18:27:09 -0000	1.1
-+++ apmbios.S	6 Apr 2005 22:38:16 -0000
++++ apmbios.S	9 Feb 2006 21:49:38 -0000
 @@ -1,6 +1,9 @@
  //  APM BIOS support for the Bochs BIOS
  //  Copyright (C) 2004 Fabrice Bellard
-- 
2.7.4