UEFI: Add support for different framebuffer configs on real hardware vs VMs

uefi/Cargo.toml

@@ -16,3 +16,4 @@ log = "0.4.14"
 x86_64 = "0.14.8"
 serde-json-core = "0.5.0"
 uefi = "0.20.0"
+raw-cpuid = "10.7.0"

uefi/src/main.rs

@@ -13,6 +13,7 @@ use core::{
     ops::{Deref, DerefMut},
     ptr, slice,
 };
+use raw_cpuid::CpuId;
 use uefi::{
     prelude::{entry, Boot, Handle, Status, SystemTable},
     proto::{
@@ -469,26 +470,35 @@ fn init_logger(
     };
 
     let mode = {
-        let modes = gop.modes();
-        match (
-            config
-                .frame_buffer
-                .minimum_framebuffer_height
-                .map(|v| usize::try_from(v).unwrap()),
-            config
-                .frame_buffer
-                .minimum_framebuffer_width
-                .map(|v| usize::try_from(v).unwrap()),
-        ) {
-            (Some(height), Some(width)) => modes
-                .filter(|m| {
-                    let res = m.info().resolution();
-                    res.1 >= height && res.0 >= width
-                })
-                .last(),
-            (Some(height), None) => modes.filter(|m| m.info().resolution().1 >= height).last(),
-            (None, Some(width)) => modes.filter(|m| m.info().resolution().0 >= width).last(),
-            _ => None,
+        let mut modes = gop.modes();
+
+        if let Some(_) = CpuId::new().get_hypervisor_info() {
+            match (
+                config
+                    .frame_buffer
+                    .minimum_framebuffer_height
+                    .map(|v| usize::try_from(v).unwrap()),
+                config
+                    .frame_buffer
+                    .minimum_framebuffer_width
+                    .map(|v| usize::try_from(v).unwrap()),
+            ) {
+                (Some(height), Some(width)) => modes
+                    .filter(|m| {
+                        let res = m.info().resolution();
+                        res.1 >= height && res.0 >= width
+                    })
+                    .last(),
+                (Some(height), None) => modes.filter(|m| m.info().resolution().1 >= height).last(),
+                (None, Some(width)) => modes.filter(|m| m.info().resolution().0 >= width).last(),
+                _ => None,
+            }
+        } else {
+            // Default to using the highest resolution available on real hardware
+            let x = gop.modes().map(|m| m.info().resolution().0).max().unwrap();
+            let y = gop.modes().map(|m| m.info().resolution().1).max().unwrap();
+
+            modes.find(|m| m.info().resolution().0 == x && m.info().resolution().1 == y)
         }
     };
     if let Some(mode) = mode {