[Xen-changelog] [xen-unstable] rombios: wait 30s after a failed boot

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1278578769 -3600
# Node ID 3073d3d61a6b688caed5aca41b2346180a4271ce
# Parent  806d2952be087bb0b9394d4f85960a15ffb5c09b
rombios: wait 30s after a failed boot

Prevents waiting forever for a keypress that may never come if boot is
unattended.

Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>
---
 tools/firmware/rombios/rombios.c |   21 ++++++---------------
 1 files changed, 6 insertions(+), 15 deletions(-)

diff -r 806d2952be08 -r 3073d3d61a6b tools/firmware/rombios/rombios.c
--- a/tools/firmware/rombios/rombios.c  Thu Jul 08 09:45:11 2010 +0100
+++ b/tools/firmware/rombios/rombios.c  Thu Jul 08 09:46:09 2010 +0100
@@ -8243,24 +8243,15 @@ Bit16u seq_nr;
     write_word(ebda_seg, IPL_SEQUENCE_OFFSET, 0xFFFF);
   } else if (bootdev == 0) {
     printf("\nNo bootable device.\n");
-    printf("Reboot or press any key to retry.");
-    write_word(ebda_seg, IPL_SEQUENCE_OFFSET, 0xFFFF);
+    printf("Powering off in 30 seconds.\n");
 ASM_START
     sti
+    mov cx, #0x01c9
+    mov dx, #0xc380
+    mov ah, #0x86   ;; INT 15/86: wait CX:DX usec.
+    int #0x15
 ASM_END
-    {
-      Bit8u sc, ac;
-      while(!dequeue_key(&sc, &ac, 1)) {
-ASM_START
-        hlt
-ASM_END
-      }
-    }
-ASM_START
-    cli
-ASM_END
-    printf("\n\n");
-    return;
+    bios_printf(BIOS_PRINTF_HALT, "");
   }
 
   /* Translate from CMOS runes to an IPL table offset by subtracting 1 */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog