Changeset 85950 in vbox

Timestamp:

Aug 31, 2020 11:40:19 AM (4 years ago)

Author:

vboxsync

Message:

Devices/DevEFI: Support querying the configured APIC mode

Location:

trunk/src/VBox/Devices/EFI

Files:

• DevEFI.cpp (modified) (2 diffs)
• DevEFI.h (modified) (1 diff)

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

@@ -1202 +1202 @@
         case EFI_INFO_INDEX_MCFG_SIZE:
             return 8;
+        case EFI_INFO_INDEX_APIC_MODE:
+            return 1;
     }
     return UINT32_MAX;
+}
+
+
+/**
+ * efiInfoNextByte for a uint8_t value.
+ *
+ * @returns Next (current) byte.
+ * @param   pThisCC             The EFI state for the current context.
+ * @param   u8                  The value.
+ */
+static uint8_t efiInfoNextByteU8(PDEVEFIR3 pThisCC, uint8_t u8)
+{
+    uint32_t off = pThisCC->offInfo;
+    if (off >= 1)
+        return 0;
+    return (uint8_t)u8;
 }
 
@@ -1282 +1300 @@
         case EFI_INFO_INDEX_MCFG_BASE:          return efiInfoNextByteU64(pThisCC, pThisCC->u64McfgBase);
         case EFI_INFO_INDEX_MCFG_SIZE:          return efiInfoNextByteU64(pThisCC, pThisCC->cbMcfgLength);
+        case EFI_INFO_INDEX_APIC_MODE:          return efiInfoNextByteU8(pThisCC, pThisCC->u8APIC);
 
         default:

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

@@ -72 +72 @@
     EFI_INFO_INDEX_MCFG_BASE,
     EFI_INFO_INDEX_MCFG_SIZE,
+    EFI_INFO_INDEX_APIC_MODE,
     EFI_INFO_INDEX_END
 } EfiInfoIndex;
+
+/** @name APIC mode defines as returned by EFI_INFO_INDEX_APIC_MODE
+ * @{ */
+#define EFI_APIC_MODE_DISABLED          0
+#define EFI_APIC_MODE_APIC              1
+#define EFI_APIC_MODE_X2APIC            2
+/** @} */
 
 /** Panic port.