Changeset 26109 in vbox for trunk/src/VBox/Devices/EFI

Timestamp:

Jan 31, 2010 10:29:08 AM (15 years ago)

Author:

vboxsync

Message:

EFI: allow passing boot args via extradata

Location:

trunk/src/VBox/Devices/EFI

Files:

• DevEFI.cpp (modified) (6 diffs)
• Firmware2/VBoxPkg/Include/DevEFI.h (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/DevEFI.cpp

@@ -107 +107 @@
     /** I/O-APIC enabled? */
     uint8_t         u8IOAPIC;
+
+    /* Boot parameters passed to the firmware */
+    char           pszBootArgs[256];
 } DEVEFI;
 typedef DEVEFI *PDEVEFI;
@@ -126 +129 @@
 static uint32_t efiInfoSize(PDEVEFI pThis)
 {
-    /* So far, everything is 4 bytes, as we only support 32-bit EFI */
     switch (pThis->iInfoSelector)
     {
@@ -136 +138 @@
         case EFI_INFO_INDEX_STACK_SIZE:
             return 4;
+         case EFI_INFO_INDEX_BOOT_ARGS:
+             return RTStrNLen(pThis->pszBootArgs, sizeof pThis->pszBootArgs) + 1;
     }
     Assert(false);
@@ -165 +169 @@
             iValue = 128*1024; /* 128 K */
             break;
+        case EFI_INFO_INDEX_BOOT_ARGS:
+            return pThis->pszBootArgs[pThis->iInfoPosition];
         default:
             Assert(false);
@@ -893 +899 @@
 #endif
                               "64BitEntry\0"
+                              "BootArgs\0"
                               ))
         return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
@@ -964 +971 @@
         pThis->pszEfiRomFile = NULL;
     }
+
+     /*
+     * Get boot args.
+     */
+    rc = CFGMR3QueryString(pCfgHandle, "BootArgs",
+                           pThis->pszBootArgs, sizeof pThis->pszBootArgs);
+    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+    {
+        strcpy(pThis->pszBootArgs, "");
+        rc = VINF_SUCCESS;
+    }
+    if (RT_FAILURE(rc))
+        return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
+                                   N_("Configuration error: Querying \"BootArgs\" as a string failed"));
+
+    LogRel(("EFI boot args: %s\n", pThis->pszBootArgs));
 
 #ifdef DEVEFI_WITH_VBOXDBG_SCRIPT

trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.h

@@ -54 +54 @@
     EFI_INFO_INDEX_STACK_BASE,
     EFI_INFO_INDEX_STACK_SIZE,
+    EFI_INFO_INDEX_BOOT_ARGS,
     EFI_INFO_INDEX_END
 } EfiInfoIndex;
@@ -143 +144 @@
 
 #endif
-