From mboxrd@z Thu Jan  1 00:00:00 1970
From: Akio Takebe <takebe_akio@jp.fujitsu.com>
Subject: [Patch][BIOS] fix trying to boot from next device
Date: Tue, 26 May 2009 22:55:36 +0900
Message-ID: <4A1BF4D8.6010505@jp.fujitsu.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-2022-JP
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

Hi,

If boot="ndc", rombios cannot try to boot next device.
Because rombios jump to the boot vector without pushing return address,
gPXE code and so on cannot return if it fail to boot.

This patch fixes this issue.

Signed-off-by: Akio Takebe <takebe_akio@jp.fujitsu.com>

Best Regards,

Akio　Takebe

---
diff -r 145e49b8574c tools/firmware/rombios/rombios.c
--- a/tools/firmware/rombios/rombios.c  Tue May 19 23:44:28 2009 +0100
+++ b/tools/firmware/rombios/rombios.c  Tue May 26 22:50:33 2009 +0900
@@ -8362,8 +8362,8 @@ ASM_END
   /* Jump to the boot vector */
 ASM_START
     mov  bp, sp
-//    push cs
-//    push #int18_handler
+    push cs
+    push #int18_handler
     ;; Build an iret stack frame that will take us to the boot vector.
     ;; iret pops ip, then cs, then flags, so push them in the opposite order.
     pushf