Changeset 61116 in vbox

Timestamp:

May 23, 2016 8:56:09 AM (9 years ago)

Author:

vboxsync

Message:

Main/Console: Use the APICMODE enum, tabs.

Location:

trunk

Files:

• include/VBox/vmm/apic.h (modified) (1 diff)
• src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMR3/APIC.cpp (modified) (1 diff)
• src/VBox/VMM/include/APICInternal.h (modified) (1 diff)

trunk/include/VBox/vmm/apic.h

@@ -141 +141 @@
 #define XAPIC_OFF_LVT_EXT_END                XAPIC_OFF_LVT_CMCI
 
+/**
+ * APIC operating modes.
+ *
+ * The values match hardware states.
+ * See Intel spec. 10.12.1 "Detecting and Enabling x2APIC Mode".
+ */
+typedef enum APICMODE
+{
+    APICMODE_DISABLED = 0,
+    APICMODE_INVALID,
+    APICMODE_XAPIC,
+    APICMODE_X2APIC
+} APICMODE;
 
 RT_C_DECLS_BEGIN

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

@@ -72 +72 @@
 #include <VBox/vmm/pdmapi.h> /* For PDMR3DriverAttach/PDMR3DriverDetach. */
 #include <VBox/vmm/pdmusb.h> /* For PDMR3UsbCreateEmulatedDevice. */
+#include <VBox/vmm/apic.h>   /* For APICMODE enum. */
 #include <VBox/vmm/pdmstorageifs.h>
 #include <VBox/version.h>
@@ -1033 +1034 @@
 
         /* Adjust firmware APIC handling to stay within the VCPU limits. */
-        if (uFwAPIC == 2 && !fEnableX2APIC)
-        {
-            if (fEnableAPIC)
-                uFwAPIC = 1;
-            else
-                uFwAPIC = 0;
-            LogRel(("Limiting the firmware APIC level from x2APIC to %s\n", fEnableAPIC ? "APIC" : "Disabled"));
-        }
-        else if (uFwAPIC == 1 && !fEnableAPIC)
-        {
-            uFwAPIC = 0;
-            LogRel(("Limiting the firmware APIC level from APIC to Disabled\n"));
-        }
+        if (uFwAPIC == 2 && !fEnableX2APIC)
+        {
+            if (fEnableAPIC)
+                uFwAPIC = 1;
+            else
+                uFwAPIC = 0;
+            LogRel(("Limiting the firmware APIC level from x2APIC to %s\n", fEnableAPIC ? "APIC" : "Disabled"));
+        }
+        else if (uFwAPIC == 1 && !fEnableAPIC)
+        {
+            uFwAPIC = 0;
+            LogRel(("Limiting the firmware APIC level from APIC to Disabled\n"));
+        }
 
         /*
@@ -1602 +1603 @@
             InsertConfigNode(pInst,    "Config", &pCfg);
             InsertConfigInteger(pCfg,  "IOAPIC", fIOAPIC);
-            uint32_t uAPICMode = 2;
+            APICMODE enmAPICMode = APICMODE_XAPIC;
             if (fEnableX2APIC)
-                uAPICMode = 3;
+                enmAPICMode = APICMODE_X2APIC;
             else if (!fEnableAPIC)
-                uAPICMode = 0;
-            InsertConfigInteger(pCfg,  "Mode", uAPICMode);
+                enmAPICMode = APICMODE_DISABLED;
+            InsertConfigInteger(pCfg,  "Mode", enmAPICMode);
             InsertConfigInteger(pCfg,  "NumCPUs", cCpus);
 

trunk/src/VBox/VMM/VMMR3/APIC.cpp

@@ -1460 +1460 @@
      * Validate APIC settings.
      */
-    int rc = CFGMR3ValidateConfig(pCfg, "/APIC/",
-                                  "RZEnabled"
-                                  "|Mode"
-                                  "|IOAPIC"
-                                  "|NumCPUs",
-                                  "" /* pszValidNodes */, "APIC" /* pszWho */, 0 /* uInstance */);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    rc = CFGMR3QueryBoolDef(pCfg, "RZEnabled", &pApic->fRZEnabled, true);
+    if (!CFGMR3AreValuesValid(pCfg, "RZEnabled\0"
+                                    "Mode\0"
+                                    "IOAPIC\0"
+                                    "NumCPUs\0"))
+    {
+        return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
+                                N_("APIC configuration error: unknown option specified"));
+    }
+
+    int rc = CFGMR3QueryBoolDef(pCfg, "RZEnabled", &pApic->fRZEnabled, true);
     AssertLogRelRCReturn(rc, rc);
 

trunk/src/VBox/VMM/include/APICInternal.h

@@ -1121 +1121 @@
 
 /**
- * APIC operating modes.
- *
- * The values match hardware states.
- * See Intel spec. 10.12.1 "Detecting and Enabling x2APIC Mode".
- */
-typedef enum APICMODE
-{
-    APICMODE_DISABLED = 0,
-    APICMODE_INVALID,
-    APICMODE_XAPIC,
-    APICMODE_X2APIC
-} APICMODE;
-
-/**
  * APIC Pending-Interrupt Bitmap (PIB).
  */