Changeset 2637 in vbox for trunk/src

Timestamp:

May 14, 2007 7:14:38 PM (18 years ago)

Author:

vboxsync

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

21162

Message:

if IOAPIC is enabled enable ACPI as well

File:

• trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp (modified) (10 diffs)

trunk/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp

@@ -160 +160 @@
 
 static bool g_fIOAPIC = false;
-static bool fACPI = true;
-static bool fAudio = false;
+static bool g_fACPI = true;
+static bool g_fAudio = false;
 #ifdef VBOXBFE_WITH_USB
-static bool fUSB = false;
+static bool g_fUSB = false;
 #endif
 //static bool fPacketSniffer = false;
@@ -426 +426 @@
         }
         else if (strcmp(pszArg, "-fullscreen") == 0)
-        {
             fFullscreen = true;
-        }
         else if (strcmp(pszArg, "-nofstoggle") == 0)
-        {
             gfAllowFullscreenToggle = false;
-        }
         else if (strcmp(pszArg, "-nohostkey") == 0)
         {
@@ -439 +435 @@
         }
         else if (strcmp(pszArg, "-acpi") == 0)
-        {
-            fACPI = true;
-        }
+            g_fACPI = true;
         else if (strcmp(pszArg, "-noacpi") == 0)
-        {
-            fACPI = false;
-        }
+            g_fACPI = false;
         else if (strcmp(pszArg, "-ioapic") == 0)
-        {
             g_fIOAPIC = true;
-        }
         else if (strcmp(pszArg, "-noioapic") == 0)
-        {
             g_fIOAPIC = false;
-        }
         else if (strcmp(pszArg, "-audio") == 0)
-        {
-            fAudio = true;
-        }
+            g_fAudio = true;
 #ifdef VBOXBFE_WITH_USB
         else if (strcmp(pszArg, "-usb") == 0)
-        {
-            fUSB = true;
-        }
+            g_fUSB = true;
 #endif
         else if (strcmp(pszArg, "-hda") == 0)
@@ -600 +584 @@
 #endif
         else if (strcmp(pszArg, "-rellog") == 0)
-        {
             g_fReleaseLog = true;
-        }
         else if (strcmp(pszArg, "-norellog") == 0)
-        {
             g_fReleaseLog = false;
-        }
 #ifdef VBOXSDL_ADVANCED_OPTIONS
         else if (strcmp(pszArg, "-rawr0") == 0)
-        {
             fRawR0 = true;
-        }
         else if (strcmp(pszArg, "-norawr0") == 0)
-        {
             fRawR0 = false;
-        }
         else if (strcmp(pszArg, "-rawr3") == 0)
-        {
             fRawR3 = true;
-        }
         else if (strcmp(pszArg, "-norawr3") == 0)
-        {
             fRawR3 = false;
-        }
         else if (strcmp(pszArg, "-patm") == 0)
-        {
             fPATM = true;
-        }
         else if (strcmp(pszArg, "-nopatm") == 0)
-        {
             fPATM = false;
-        }
         else if (strcmp(pszArg, "-csam") == 0)
-        {
             fCSAM = true;
-        }
         else if (strcmp(pszArg, "-nocsam") == 0)
-        {
             fCSAM = false;
-        }
 #endif /* VBOXSDL_ADVANCED_OPTIONS */
 #ifdef __L4__
@@ -652 +616 @@
             return 1;
         }
+    }
+
+    if (g_fIOAPIC && !g_fACPI)
+    {
+        RTPrintf("IOAPIC enabled, enabling ACPI as well!\n");
+        g_fACPI = true;
     }
 
@@ -964 +934 @@
      * Capture USB devices.
      */
-    if (fUSB)
+    if (g_fUSB)
     {
         gHostUSB = new HostUSB();
@@ -1170 +1140 @@
      * ACPI
      */
-    if (fACPI)
+    if (g_fACPI || g_fIOAPIC)
     {
         rc = CFGMR3InsertNode(pDevices, "acpi", &pDev);                             CHECK_RC();
@@ -1302 +1272 @@
     rc = CFGMR3InsertInteger(pInst, "Trusted",              1);     /* boolean */   CHECK_RC();
     rc = CFGMR3InsertNode(pInst,    "Config", &pCfg);                               CHECK_RC();
+    rc = CFGMR3InsertInteger(pCfg,  "IOAPIC", g_fIOAPIC);                           CHECK_RC();
 
     /*
@@ -1571 +1542 @@
      * AC'97 ICH audio
      */
-    if (fAudio)
+    if (g_fAudio)
     {
         rc = CFGMR3InsertNode(pDevices, "ichac97", &pDev);
@@ -1599 +1570 @@
      * The USB Controller.
      */
-    if (fUSB)
+    if (g_fUSB)
     {
         rc = CFGMR3InsertNode(pDevices, "usb-ohci", &pDev);                         CHECK_RC();