Changeset 1362 in vbox for trunk

Timestamp:

Mar 9, 2007 10:54:02 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

19353

Message:

Enable BIOS backdoor logging for info messages. Can be useful to debug
guest problems.

Location:

trunk/src/VBox/Devices/PC/BIOS

Files:

• Makefile (modified) (1 diff)
• rombios.c (modified) (8 diffs)

trunk/src/VBox/Devices/PC/BIOS/Makefile

@@ -75 +75 @@
 $(PATH_TARGET)/_rombios_.c: rombios.c logo.c apmbios.S
         $(call MSG_L1,Precompiling $<,=> $@)
-        $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -I$(PATH_TARGET) -I$(PATH_CURRENT)/.. -DBX_SMP_PROCESSORS=1 -DVBOX $(addprefix -D,$(DEFS) $(DEFS.$(BUILD_TYPE))) -P $< > $@
+        $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -I$(PATH_TARGET) -I$(PATH_CURRENT)/.. -I$(PATH_ROOT)/include -I$(PATH_OUT) -DBX_SMP_PROCESSORS=1 -DVBOX $(addprefix -D,$(DEFS) $(DEFS.$(BUILD_TYPE))) -P $< > $@
 
 # 2. compile to intermediate asm file.

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

@@ -125 +125 @@
 #ifdef VBOX
 #include "DevPcBios.h"
+#include <VBox/version.h>
 #endif
 
@@ -212 +213 @@
 #endif /* VBOX_SMP */
 
+#ifndef VBOX
 #define PANIC_PORT  0x400
 #define PANIC_PORT2 0x401
 #define INFO_PORT   0x402
 #define DEBUG_PORT  0x403
+#else /* VBOX */
+/* Redirect INFO output to backdoor logging port. */
+#define PANIC_PORT  0x400
+#define PANIC_PORT2 0x401
+#define INFO_PORT   0x504
+#define DEBUG_PORT  0x403
+#endif /* VBOX */
 
 // define this if you want to make PCIBIOS working on a specific bridge only
@@ -954 +963 @@
 #endif // BX_ELTORITO_BOOT
 
+#ifdef VBOX
+static char bios_cvs_version_string[] = "VirtualBox " VBOX_VERSION_STRING " built " __DATE__ " " __TIME__;
+#define BIOS_COPYRIGHT_STRING "InnoTek VirtualBox BIOS"
+#else /* !VBOX */
 static char bios_cvs_version_string[] = "$Revision: 1.176 $ $Date: 2006/12/30 17:13:17 $";
 
-#ifdef VBOX
-#define BIOS_COPYRIGHT_STRING "InnoTek VirtualBox BIOS"
-#else
 #define BIOS_COPYRIGHT_STRING "(c) 2002 MandrakeSoft S.A. Written by Kevin Lawton & the Bochs team."
-#endif
+#endif /* !VBOX */
 
 #define BIOS_PRINTF_HALT     1
@@ -979 +989 @@
 #  define BX_DEBUG(format, p...)
 #endif
+#ifdef VBOX
+#define BX_INFO(format, p...)   bios_printf(BIOS_PRINTF_INFO, "BIOS: " format, ##p)
+#else /* !VBOX */
 #define BX_INFO(format, p...)   bios_printf(BIOS_PRINTF_INFO, format, ##p)
+#endif /* !VBOX */
 #define BX_PANIC(format, p...)  bios_printf(BIOS_PRINTF_DEBHALT, format, ##p)
 
@@ -1949 +1963 @@
   // lastdrive: 1 boot drive is the last one in boot sequence
 
-#ifdef VBOX
-  if (lastdrive == 1)
-  {
-    if (reason == 0)
-    {
-      BX_PANIC("No bootable medium found! System halted.\n");
-    }
-    else
-    {
-      BX_PANIC("Could not read from the boot medium! System halted.\n");
-    }
-  }
-#else /* !VBOX */
   if (cdboot)
+#ifndef VBOX
     bios_printf(BIOS_PRINTF_INFO | BIOS_PRINTF_SCREEN, "Boot from %s failed\n",drivetypes[2]);
-#ifdef VBOX
+#else /* VBOX */
+    BX_INFO("Boot from %s failed\n",drivetypes[2]);
   else if (lanboot)
-    bios_printf(BIOS_PRINTF_INFO | BIOS_PRINTF_SCREEN, "Boot from %s failed\n",drivetypes[3]);
+    BX_INFO("Boot from %s failed\n",drivetypes[3]);
 #endif /* VBOX */
   else if (drive & 0x80)
+#ifndef VBOX
     bios_printf(BIOS_PRINTF_INFO | BIOS_PRINTF_SCREEN, "Boot from %s %d failed\n", drivetypes[1],drivenum);
+#else /* VBOX */
+    BX_INFO("Boot from %s %d failed\n", drivetypes[1],drivenum);
+#endif /* VBOX */
   else
+#ifndef VBOX
     bios_printf(BIOS_PRINTF_INFO | BIOS_PRINTF_SCREEN, "Boot from %s %d failed\n", drivetypes[0],drivenum);
+#else /* VBOX */
+    BX_INFO("Boot from %s %d failed\n", drivetypes[0],drivenum);
+#endif /* VBOX */
 
   if (lastdrive==1) {
     if (reason==0)
+#ifndef VBOX
       BX_PANIC("Not a bootable disk\n");
+#else /* VBOX */
+      BX_PANIC("No bootable medium found! System halted.\n");
+#endif /* VBOX */
     else
+#ifndef VBOX
       BX_PANIC("Could not read the boot disk\n");
+#else /* VBOX */
+      BX_PANIC("Could not read from the boot medium! System halted.\n");
+#endif /* VBOX */
   }
-#endif /* !VBOX */
 }
 
@@ -1992 +2010 @@
 #ifndef VBOX
   bios_printf(BIOS_PRINTF_SCREEN | BIOS_PRINTF_INFO, "CDROM boot failure code : %04x\n",code);
-#endif /* !VBOX */
+#else /* VBOX */
+  BX_INFO("CDROM boot failure code : %04x\n",code);
+#endif /* VBOX */
 
   return;
@@ -2392 +2412 @@
       switch (translation) {
         case ATA_TRANSLATION_NONE:
+#ifndef VBOX
           BX_INFO("none");
+#else /* VBOX */
+          bios_printf(BIOS_PRINTF_INFO, "none");
+#endif /* VBOX */
           break;
         case ATA_TRANSLATION_LBA:
+#ifndef VBOX
           BX_INFO("lba");
+#else /* VBOX */
+          bios_printf(BIOS_PRINTF_INFO, "lba");
+#endif /* VBOX */
           break;
         case ATA_TRANSLATION_LARGE:
+#ifndef VBOX
           BX_INFO("large");
+#else /* VBOX */
+          bios_printf(BIOS_PRINTF_INFO, "large");
+#endif /* VBOX */
           break;
         case ATA_TRANSLATION_RECHS:
+#ifndef VBOX
           BX_INFO("r-echs");
+#else /* VBOX */
+          bios_printf(BIOS_PRINTF_INFO, "r-echs");
+#endif /* VBOX */
           break;
         }
@@ -2438 +2474 @@
       // clip to 1024 cylinders in lchs
       if (cylinders > 1024) cylinders=1024;
+#ifndef VBOX
       BX_INFO(" LCHS=%d/%d/%d\n", cylinders, heads, spt);
+#else /* VBOX */
+      bios_printf(BIOS_PRINTF_INFO, " LCHS=%d/%d/%d\n", cylinders, heads, spt);
+#endif /* VBOX */
 
       write_word(ebda_seg,&EbdaData->ata.devices[device].lchs.heads, heads);