Changeset 26109 in vbox for trunk/src/VBox/Main

Timestamp:

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

Author:

vboxsync

Message:

EFI: allow passing boot args via extradata

File:

• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -810 +810 @@
                     (FirmwareType_T)FirmwareType_EFI32;
         }
+        bool f64BitEntry = eFwType == FirmwareType_EFI64;
 
         rc = findEfiRom(virtualBox, eFwType, efiRomFile);                                                                                                                          RC_CHECK();
-        bool f64BitEntry = eFwType == FirmwareType_EFI64;
+
+        /* Compute boot args */
+        Bstr bootArgs;
+        hrc = pMachine->GetExtraData(Bstr("VBoxInternal2/EfiBootArgs"), bootArgs.asOutParam()); H();
+
         /*
-         * EFI.
+         * EFI subtree.
          */
         rc = CFGMR3InsertNode(pDevices, "efi", &pDev);                              RC_CHECK();
@@ -824 +829 @@
         rc = CFGMR3InsertInteger(pCfg,  "NumCPUs",          cCpus);                 RC_CHECK();
         rc = CFGMR3InsertString(pCfg,   "EfiRom",           efiRomFile.raw());      RC_CHECK();
-        rc = CFGMR3InsertInteger(pCfg,  "IOAPIC",               fIOAPIC);           RC_CHECK();
+        rc = CFGMR3InsertString(pCfg,   "BootArgs",         Utf8Str(bootArgs).raw());      RC_CHECK();
+        rc = CFGMR3InsertInteger(pCfg,  "IOAPIC",           fIOAPIC);           RC_CHECK();
         rc = CFGMR3InsertBytes(pCfg,    "UUID", &HardwareUuid,sizeof(HardwareUuid));RC_CHECK();
         rc = CFGMR3InsertInteger(pCfg,  "64BitEntry", f64BitEntry); /* boolean */   RC_CHECK();