Changeset 24840 in vbox for trunk

Timestamp:

Nov 21, 2009 9:52:59 AM (15 years ago)

Author:

vboxsync

Message:

Main: firmware choose depends on guest bitness type.

File:

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

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -211 +211 @@
     bool afPciDeviceNo[32] = {false};
     bool fFdcEnabled = false;
+    BOOL fIs64BitGuest = false;
 
 #if !defined (VBOX_WITH_XPCOM)
@@ -377 +378 @@
         hrc = host->GetProcessorFeature(ProcessorFeature_LongMode,
                                         &fSupportsLongMode);                        H();
-        BOOL fIs64BitGuest = false;
         hrc = guestOSType->COMGETTER(Is64Bit)(&fIs64BitGuest);                      H();
 
@@ -827 +827 @@
         Utf8Str efiRomFile;
         /** @todo: which entry point to use for dual firmware, depend on guest? */
-        bool f64BitEntry = eFwType == FirmwareType_EFI64;
-
-        rc = findEfiRom(eFwType, efiRomFile);                                       RC_CHECK();
+        bool f64BitEntry = fIs64BitGuest;
+        //eFwType = f64BitEntry? FirmwareType_EFI64: FirmwareType_EFI;
+        rc = findEfiRom(f64BitEntry? FirmwareType_EFI64: FirmwareType_EFI, efiRomFile);                  RC_CHECK();
         /*
          * EFI.