Changeset 84752 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 10, 2020 10:58:33 AM (5 years ago)

Author:

vboxsync

Message:

BIOS: On boot failure, call into INT 18h and report that to the host through the shutdown interface (see bugref:6549).

Location:

trunk/src/VBox/Devices/PC

Files:

• BIOS/apm.c (modified) (2 diffs)
• BIOS/bios.c (modified) (2 diffs)
• BIOS/biosint.h (modified) (1 diff)
• BIOS/boot.c (modified) (1 diff)
• BIOS/inlines.h (modified) (1 diff)
• BIOS/orgs.asm (modified) (1 diff)
• DevPcBios.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/PC/BIOS/apm.c

@@ -129 +129 @@
  */
 
-/* Output a null-terminated string to a specified port, without the
- * terminating null character.
- */
-static void apm_out_str_asm(uint16_t port, const char *s);
-#pragma aux apm_out_str_asm =   \
-    "mov    al, [bx]"       \
-    "next:"                 \
-    "out    dx, al"         \
-    "inc    bx"             \
-    "mov    al, [bx]"       \
-    "or     al, al"         \
-    "jnz    next"           \
-    parm [dx] [bx] modify exact [ax bx] nomemory;
-
 /* Wrapper to avoid unnecessary inlining. */
-void apm_out_str(const char *s, uint16_t port)
+void apm_out_str(const char *s)
 {
     if (*s)
-        apm_out_str_asm(port, s);
+        out_ctrl_str_asm(VBOX_BIOS_SHUTDOWN_PORT, s);
 }
 
@@ -200 +186 @@
         switch (CX) {
         case APM_PS_STANDBY:
-            apm_out_str("Standby", VBOX_BIOS_SHUTDOWN_PORT);
+            apm_out_str("Standby");
             break;
         case APM_PS_SUSPEND:
-            apm_out_str("Suspend", VBOX_BIOS_SHUTDOWN_PORT);
+            apm_out_str("Suspend");
             break;
         case APM_PS_OFF:
-            apm_out_str("Shutdown", VBOX_BIOS_SHUTDOWN_PORT);  /* Should not return. */
+            apm_out_str("Shutdown");    /* Should not return. */
             break;
         default:

trunk/src/VBox/Devices/PC/BIOS/bios.c

@@ -57 +57 @@
 #include "inlines.h"
 #include "biosint.h"
+#include "VBox/bios.h"
 #ifndef VBOX_VERSION_STRING
 #include <VBox/version.h>
@@ -121 +122 @@
 void BIOSCALL int18_panic_msg(void)
 {
-    BX_PANIC("INT18: BOOT FAILURE\n");
+    BX_INFO("INT18: BOOT FAILURE\n");
+    out_ctrl_str_asm(VBOX_BIOS_SHUTDOWN_PORT, "Bootfail");
 }
 

trunk/src/VBox/Devices/PC/BIOS/biosint.h

@@ -286 +286 @@
 #ifdef VBOX
 #define BX_INFO(...)    do { put_str(BIOS_PRINTF_INFO, bios_prefix_string); bios_printf(BIOS_PRINTF_INFO, __VA_ARGS__); } while (0)
+#define BX_INFO_CON(...)do { put_str(BIOS_PRINTF_INFO, bios_prefix_string); bios_printf(BIOS_PRINTF_ALL, __VA_ARGS__); } while (0)
 #else /* !VBOX */
 #define BX_INFO(...)    bios_printf(BIOS_PRINTF_INFO, __VA_ARGS__)

trunk/src/VBox/Devices/PC/BIOS/boot.c

@@ -151 +151 @@
     if (lastdrive==1) {
         if (reason==0)
-            BX_PANIC("No bootable medium found! System halted.\n");
+            BX_INFO_CON("No bootable medium found! Please insert a bootable medium and reboot.\n");
         else
             BX_PANIC("Could not read from the boot medium! System halted.\n");

trunk/src/VBox/Devices/PC/BIOS/inlines.h

@@ -99 +99 @@
     "jmp forever"           \
     modify exact [] nomemory aborts;
+
+/* Output a null-terminated string to a specified port, without the
+ * terminating null character.
+ */
+static void out_ctrl_str_asm(uint16_t port, const char *s);
+#pragma aux out_ctrl_str_asm =   \
+    "mov    al, [bx]"       \
+    "next:"                 \
+    "out    dx, al"         \
+    "inc    bx"             \
+    "mov    al, [bx]"       \
+    "or     al, al"         \
+    "jnz    next"           \
+    parm [dx] [bx] modify exact [ax bx] nomemory;
 
 #ifdef __386__

trunk/src/VBox/Devices/PC/BIOS/orgs.asm

@@ -1580 +1580 @@
                 call    _int18_panic_msg
                 ;; TODO: handle failure better?
+                sti
+stay_here:
                 hlt
-                iret
+                jmp     stay_here
 
 ;;

trunk/src/VBox/Devices/PC/DevPcBios.cpp

@@ -155 +155 @@
     /** Boot devices (ordered). */
     DEVPCBIOSBOOT   aenmBootDevice[4];
-    /** Bochs shutdown index. */
-    uint32_t        iShutdown;
+    /** Bochs control string index. */
+    uint32_t        iControl;
     /** Floppy device. */
     char           *pszFDDevice;
@@ -338 +338 @@
     {
         static const unsigned char s_szShutdown[] = "Shutdown";
-        if (   pThis->iShutdown < sizeof(s_szShutdown) /* paranoia */
-            && u32 == s_szShutdown[pThis->iShutdown])
-        {
-            pThis->iShutdown++;
-            if (pThis->iShutdown >= 8)
+        static const unsigned char s_szBootfail[] = "Bootfail";
+        AssertCompile(sizeof(s_szShutdown) == sizeof(s_szBootfail));
+
+        if (pThis->iControl < sizeof(s_szShutdown)) /* paranoia */
+        {
+            if (u32 == s_szShutdown[pThis->iControl])
             {
-                pThis->iShutdown = 0;
-                LogRel(("PcBios: APM shutdown request\n"));
-                return PDMDevHlpVMPowerOff(pDevIns);
+
+                pThis->iControl++;
+                if (pThis->iControl >= 8)
+                {
+                    pThis->iControl = 0;
+                    LogRel(("PcBios: APM shutdown request\n"));
+                    return PDMDevHlpVMPowerOff(pDevIns);
+                }
             }
+            else if (u32 == s_szBootfail[pThis->iControl])
+            {
+                pThis->iControl++;
+                if (pThis->iControl >= 8)
+                {
+                    pThis->iControl = 0;
+                    LogRel(("PcBios: Boot failure\n"));
+                }
+            }
+            else
+                pThis->iControl = 0;
         }
         else
-            pThis->iShutdown = 0;
+            pThis->iControl = 0;
     }
     /* else: not in use. */