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

Timestamp:

Jul 12, 2017 9:30:24 AM (8 years ago)

Author:

vboxsync

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

116910

Message:

Main/Console: EFI graphics resolution cleanup, prepare for resolution based mode selection by default
Devices/EFI: use new CFGM keys (fall back to old ones if necessary), clean up variable and info field naming
Devices/EFI/Firmware: for both GOP and UGA (which is very deprecated) try to find the mode by resolution if possible

File:

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

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -1778 +1778 @@
             GetExtraDataBoth(virtualBox, pMachine, "VBoxInternal2/EfiDeviceProps", &deviceProps);
 
-            /* Get GOP mode settings */
-            uint32_t u32GopMode = UINT32_MAX;
-            GetExtraDataBoth(virtualBox, pMachine, "VBoxInternal2/EfiGopMode", &strTmp);
+            /* Get graphics mode settings */
+            uint32_t u32GraphicsMode = UINT32_MAX;
+            GetExtraDataBoth(virtualBox, pMachine, "VBoxInternal2/EfiGraphicsMode", &strTmp);
+            if (strTmp.isEmpty())
+                GetExtraDataBoth(virtualBox, pMachine, "VBoxInternal2/EfiGopMode", &strTmp);
             if (!strTmp.isEmpty())
-                u32GopMode = strTmp.toUInt32();
-
-            /* UGA mode settings */
-            uint32_t u32UgaHorizontal = 0;
-            GetExtraDataBoth(virtualBox, pMachine, "VBoxInternal2/EfiUgaHorizontalResolution", &strTmp);
+                u32GraphicsMode = strTmp.toUInt32();
+
+            /* Get graphics resolution settings */
+            uint32_t u32HorizontalResolution = 0;
+            GetExtraDataBoth(virtualBox, pMachine, "VBoxInternal2/EfiHorizontalResolution", &strTmp);
+            if (strTmp.isEmpty())
+                GetExtraDataBoth(virtualBox, pMachine, "VBoxInternal2/EfiUgaHorizontalResolution", &strTmp);
             if (!strTmp.isEmpty())
-                u32UgaHorizontal = strTmp.toUInt32();
-
-            uint32_t u32UgaVertical = 0;
-            GetExtraDataBoth(virtualBox, pMachine, "VBoxInternal2/EfiUgaVerticalResolution", &strTmp);
+                u32HorizontalResolution = strTmp.toUInt32();
+
+            uint32_t u32VerticalResolution = 0;
+            GetExtraDataBoth(virtualBox, pMachine, "VBoxInternal2/EfiVerticalResolution", &strTmp);
+            if (strTmp.isEmpty())
+                GetExtraDataBoth(virtualBox, pMachine, "VBoxInternal2/EfiUgaVerticalResolution", &strTmp);
             if (!strTmp.isEmpty())
-                u32UgaVertical = strTmp.toUInt32();
+                u32VerticalResolution = strTmp.toUInt32();
 
             /*
@@ -1812 +1818 @@
             InsertConfigBytes(pCfg,    "UUID", &HardwareUuid,sizeof(HardwareUuid));
             InsertConfigInteger(pCfg,  "64BitEntry",  f64BitEntry); /* boolean */
-            InsertConfigInteger(pCfg,  "GopMode",     u32GopMode);
-            InsertConfigInteger(pCfg,  "UgaHorizontalResolution", u32UgaHorizontal);
-            InsertConfigInteger(pCfg,  "UgaVerticalResolution", u32UgaVertical);
+            InsertConfigInteger(pCfg,  "GraphicsMode",  u32GraphicsMode);
+            InsertConfigInteger(pCfg,  "HorizontalResolution", u32HorizontalResolution);
+            InsertConfigInteger(pCfg,  "VerticalResolution", u32VerticalResolution);
 
             /* For OS X guests we'll force passing host's DMI info to the guest */