Changeset 7989 in vbox

Timestamp:

Apr 15, 2008 1:30:41 PM (17 years ago)

Author:

vboxsync

Message:

Backed out 29633 & 29635 again

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManage.cpp (modified) (5 diffs)
• Main/ConsoleImpl2.cpp (modified) (1 diff)
• Main/MachineDebuggerImpl.cpp (modified) (1 diff)
• Main/MachineImpl.cpp (modified) (6 diffs)
• Main/idl/VirtualBox.xidl (modified) (3 diffs)
• Main/include/MachineDebuggerImpl.h (modified) (1 diff)
• Main/include/MachineImpl.h (modified) (2 diffs)
• Main/xml/VirtualBox-settings-common.xsd (modified) (1 diff)
• VMM/CPUM.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -326 +326 @@
                  "                            [-acpi on|off]\n"
                  "                            [-ioapic on|off]\n"
-                 "                            [-pae on|off]\n"
                  "                            [-hwvirtex on|off|default]\n"
                  "                            [-monitorcount <number>]\n"
@@ -920 +919 @@
     else
         RTPrintf("IOAPIC:          %s\n", ioapicEnabled ? "on" : "off");
-
-    BOOL PAEEnabled;
-    machine->COMGETTER(PAEEnabled)(&PAEEnabled);
-    if (details == VMINFO_MACHINEREADABLE)
-        RTPrintf("pae=\"%s\"\n", PAEEnabled ? "on" : "off");
-    else
-        RTPrintf("PAE: %s\n", PAEEnabled ? "on" : "off");
 
     LONG64 timeOffset;
@@ -3722 +3714 @@
     char *acpi = NULL;
     char *hwvirtex = NULL;
-    char *pae = NULL;
     char *ioapic = NULL;
     int monitorcount = -1;
@@ -3859 +3850 @@
             hwvirtex = argv[i];
         }
-        else if (strcmp(argv[i], "-pae") == 0)
-        {
-            if (argc <= i + 1)
-            {
-                return errorArgument("Missing argument to '%s'", argv[i]);
-            }
-            i++;
-            pae = argv[i];
-        }
         else if (strcmp(argv[i], "-monitorcount") == 0)
         {
@@ -4551 +4533 @@
             {
                 errorArgument("Invalid -hwvirtex argument '%s'", hwvirtex);
-                rc = E_FAIL;
-                break;
-            }
-        }
-        if (pae)
-        {
-            if (strcmp(pae, "on") == 0)
-            {
-                CHECK_ERROR(machine, COMSETTER(PAEEnabled)(true));
-            }
-            else if (strcmp(pae, "off") == 0)
-            {
-                CHECK_ERROR(machine, COMSETTER(PAEEnabled)(false));
-            }
-            else
-            {
-                errorArgument("Invalid -pae argument '%s'", ioapic);
                 rc = E_FAIL;
                 break;

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -167 +167 @@
     }
 #endif
-
-    /* Physical Address Extension (PAE) */
-    BOOL fEnablePAE = false;
-    hrc = pMachine->COMGETTER(PAEEnabled)(&fEnablePAE);                             H();
-    rc = CFGMR3InsertInteger(pRoot, "EnablePAE", fEnablePAE);                       RC_CHECK();
 
     BOOL fIOAPIC;

trunk/src/VBox/Main/MachineDebuggerImpl.cpp

@@ -510 +510 @@
 
 /**
- * Returns the current PAE flag.
- *
- * @returns COM status code
- * @param   enabled address of result variable
- */
-STDMETHODIMP MachineDebugger::COMGETTER(PAEEnabled)(BOOL *enabled)
-{
-    if (!enabled)
-        return E_POINTER;
-
-    AutoLock lock(this);
-    CHECK_READY();
-
-    Console::SafeVMPtrQuiet pVM (mParent);
-    if (pVM.isOk())
-    {
-        uint64_t cr4 = CPUMGetGuestCR4(pVM.raw());
-        *enabled = !!(cr4 & X86_CR4_PAE);
-    }
-    else
-        *enabled = false;
-    return S_OK;
-}
-
-/**
  * Returns the current virtual time rate.
  *

trunk/src/VBox/Main/MachineImpl.cpp

@@ -173 +173 @@
     mMonitorCount = 1;
     mHWVirtExEnabled = TSBool_False;
-    mPAEEnabled = false;
 
     /* default boot order: floppy - DVD - HDD */
@@ -200 +199 @@
         mMonitorCount != that.mMonitorCount ||
         mHWVirtExEnabled != that.mHWVirtExEnabled ||
-        mPAEEnabled != that.mPAEEnabled ||
         mClipboardMode != that.mClipboardMode)
         return false;
@@ -1114 +1112 @@
     mHWData.backup();
     mHWData->mHWVirtExEnabled = enable;
-
-    return S_OK;
-}
-
-STDMETHODIMP Machine::COMGETTER(PAEEnabled)(BOOL *enabled)
-{
-    if (!enabled)
-        return E_POINTER;
-
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoReaderLock alock (this);
-
-    *enabled = mHWData->mPAEEnabled;
-
-    return S_OK;
-}
-
-STDMETHODIMP Machine::COMSETTER(PAEEnabled)(BOOL enable)
-{
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
-
-    AutoLock alock (this);
-
-    HRESULT rc = checkStateDependency (MutableStateDep);
-    CheckComRCReturnRC (rc);
-
-    /** @todo check validity! */
-
-    mHWData.backup();
-    mHWData->mPAEEnabled = enable;
 
     return S_OK;
@@ -4280 +4245 @@
         /* default value in case the node is not there */
         mHWData->mHWVirtExEnabled = TSBool_Default;
-        mHWData->mPAEEnabled      = false;
 
         Key cpuNode = aNode.findKey ("CPU");
@@ -4296 +4260 @@
                     mHWData->mHWVirtExEnabled = TSBool_Default;
             }
-            /* PAE (optional, default is false) */
-            mHWData->mPAEEnabled = cpuNode.value <BOOL> ("PAE");
         }
     }
@@ -5653 +5615 @@
             case TSBool_Default:
                 value = "default";
-                break;
-        }
-        cpuNode.setStringValue ("enabled", value);
-
-        /* PAE (optional, default is false) */
-        cpuNode.setValue <BOOL> ("PAE", mHWData->mPAEEnabled);
+        }
+        hwVirtExNode.setStringValue ("enabled", value);
     }
 

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -2484 +2484 @@
   <interface
      name="IMachine" extends="$unknown"
-     uuid="f95c0793-7737-49a1-85d9-6da81097173b"
+     uuid="4f6b4977-95fd-40b1-8391-fc165c040635"
      wsmap="managed"
      >
@@ -2707 +2707 @@
     </attribute>
 
-    <attribute name="PAEEnabled" type="boolean" default="false">
-      <desc>
-        This setting determines whether VirtualBox will expose the Physical Address
-        Extension (PAE) feature of the host CPU to the guest. Note that in case PAE 
-        is not available, it will not be reported.
-      </desc>
-    </attribute>
-
     <attribute name="snapshotFolder" type="wstring">
       <desc>
@@ -8566 +8558 @@
       </desc>
     </attribute>
-    
-    <attribute name="PAEEnabled" type="boolean" readonly="yes">
-      <desc>
-        Flag indicating whether the VM is currently making use of the Physical
-        Address Extension CPU feature.
-      </desc>
-    </attribute>
 
     <attribute name="virtualTimeRate" type="unsigned long">

trunk/src/VBox/Main/include/MachineDebuggerImpl.h

@@ -63 +63 @@
     STDMETHOD(COMSETTER(LogEnabled))(BOOL enable);
     STDMETHOD(COMGETTER(HWVirtExEnabled))(BOOL *enabled);
-    STDMETHOD(COMGETTER(PAEEnabled))(BOOL *enabled);
     STDMETHOD(COMGETTER(VirtualTimeRate))(ULONG *pct);
     STDMETHOD(COMSETTER(VirtualTimeRate))(ULONG pct);

trunk/src/VBox/Main/include/MachineImpl.h

@@ -231 +231 @@
         ULONG          mMonitorCount;
         TSBool_T       mHWVirtExEnabled;
-        BOOL           mPAEEnabled;
 
         DeviceType_T   mBootOrder [SchemaDefs::MaxBootPosition];
@@ -460 +459 @@
     STDMETHOD(COMGETTER(HWVirtExEnabled))(TSBool_T *enabled);
     STDMETHOD(COMSETTER(HWVirtExEnabled))(TSBool_T enabled);
-    STDMETHOD(COMGETTER(PAEEnabled))(BOOL *enabled);
-    STDMETHOD(COMSETTER(PAEEnabled))(BOOL enabled);
     STDMETHOD(COMGETTER(SnapshotFolder))(BSTR *aSavedStateFolder);
     STDMETHOD(COMSETTER(SnapshotFolder))(INPTR BSTR aSavedStateFolder);

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -410 +410 @@
   <xsd:sequence>
     <xsd:element name="HardwareVirtEx" type="THWVirtExType" minOccurs="0"/>
-    <xsd:element name="PAE" type="xsd:boolean" default="false"/>
   </xsd:sequence>
 </xsd:complexType>

trunk/src/VBox/VMM/CPUM.cpp

@@ -407 +407 @@
 
     /* Check if PAE was explicitely enabled by the user. */
-    bool fEnable = false;
-    int rc = CFGMR3QueryBool(CFGMR3GetRoot(pVM), "EnablePAE", &fEnable);
-    if (VBOX_SUCCESS(rc) && fEnable)
-        CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_PAE);
+    PCFGMNODE pNode = CFGMR3GetChildF(CFGMR3GetRoot(pVM), "CPUM/CPUID");
+    if (pNode)
+    {
+        bool fEnable;
+        int rc = CFGMR3QueryBool(pNode, "EnablePAE", &fEnable);
+        if (VBOX_SUCCESS(rc) && fEnable)
+            CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_PAE);
+    }
 
     /*