Changeset 44419 in vbox for trunk/src/VBox/Main

Timestamp:

Jan 28, 2013 12:06:54 PM (12 years ago)

Author:

vboxsync

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

83393

Message:

Main: One more use of PVM and some other cleanups.

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (3 diffs)
• src-client/ConsoleImpl.cpp (modified) (3 diffs)
• src-client/ConsoleImpl2.cpp (modified) (26 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2005-2012 Oracle Corporation
+ * Copyright (C) 2005-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -521 +521 @@
     static DECLCALLBACK(int) configConstructor(PUVM pUVM, PVM pVM, void *pvConsole);
     int configConstructorInner(PUVM pUVM, PVM pVM, AutoWriteLock *pAlock);
-    int configCfgmOverlay(PVM pVM, IVirtualBox *pVirtualBox, IMachine *pMachine);
+    int configCfgmOverlay(PCFGMNODE pRoot, IVirtualBox *pVirtualBox, IMachine *pMachine);
     int configDumpAPISettingsTweaks(IVirtualBox *pVirtualBox, IMachine *pMachine);
 
@@ -576 +576 @@
                                                    bool fForce);
 
-    HRESULT attachRawPCIDevices(PVM pVM, BusAssignmentManager *BusMgr, PCFGMNODE pDevices);
+    HRESULT attachRawPCIDevices(PUVM pUVM, BusAssignmentManager *BusMgr, PCFGMNODE pDevices);
     void attachStatusDriver(PCFGMNODE pCtlInst, PPDMLED *papLeds,
                             uint64_t uFirst, uint64_t uLast,

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2005-2012 Oracle Corporation
+ * Copyright (C) 2005-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -7549 +7549 @@
                  * deadlock).
                  */
-                std::auto_ptr<VMPowerDownTask> task(new VMPowerDownTask(that,
-                                                                        pProgress));
+                std::auto_ptr<VMPowerDownTask> task(new VMPowerDownTask(that, pProgress));
 
                  /* If creating a task failed, this can currently mean one of
@@ -7565 +7564 @@
 
                 int vrc = RTThreadCreate(NULL, Console::powerDownThread,
-                                         (void *) task.get(), 0,
+                                         (void *)task.get(), 0,
                                          RTTHREADTYPE_MAIN_WORKER, 0,
                                          "VMPwrDwn");

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

@@ -479 +479 @@
 
 #ifdef VBOX_WITH_PCI_PASSTHROUGH
-HRESULT Console::attachRawPCIDevices(PVM pVM,
-                                     BusAssignmentManager *BusMgr,
-                                     PCFGMNODE            pDevices)
+HRESULT Console::attachRawPCIDevices(PUVM pUVM, BusAssignmentManager *pBusMgr, PCFGMNODE pDevices)
 {
     HRESULT hrc = S_OK;
@@ -505 +503 @@
     static const char *s_pszPCIRawExtPackName = "Oracle VM VirtualBox Extension Pack";
     if (!mptrExtPackManager->isExtPackUsable(s_pszPCIRawExtPackName))
-    {
         /* Always fatal! */
-        return VMSetError(pVM, VERR_NOT_FOUND, RT_SRC_POS,
+        return VMR3SetError(pUVM, VERR_NOT_FOUND, RT_SRC_POS,
                 N_("Implementation of the PCI passthrough framework not found!\n"
                    "The VM cannot be started. To fix this problem, either "
                    "install the '%s' or disable PCI passthrough via VBoxManage"),
                 s_pszPCIRawExtPackName);
-    }
 # endif
 
@@ -534 +530 @@
             int iBase = GuestPCIAddress.miBus - 1;
 
-            while (!BusMgr->hasPCIDevice("ich9pcibridge", iBase) && iBase > 0)
+            while (!pBusMgr->hasPCIDevice("ich9pcibridge", iBase) && iBase > 0)
             {
                 iBridgesMissed++; iBase--;
@@ -544 +540 @@
                 InsertConfigNode(pBridges, Utf8StrFmt("%d", iBase + iBridge).c_str(), &pInst);
                 InsertConfigInteger(pInst, "Trusted",              1);
-                hrc = BusMgr->assignPCIDevice("ich9pcibridge", pInst);
+                hrc = pBusMgr->assignPCIDevice("ich9pcibridge", pInst);
             }
         }
@@ -597 +593 @@
         GuestPCIAddress.fromLong(guest);
         Assert(GuestPCIAddress.valid());
-        hrc = BusMgr->assignHostPCIDevice("pciraw", pInst, HostPCIAddress, GuestPCIAddress, true);
+        hrc = pBusMgr->assignHostPCIDevice("pciraw", pInst, HostPCIAddress, GuestPCIAddress, true);
         if (hrc != S_OK)
             return hrc;
@@ -759 +755 @@
     }
 
-    BusAssignmentManager* BusMgr = mBusMgr = BusAssignmentManager::createInstance(chipsetType);
+    BusAssignmentManager *pBusMgr = mBusMgr = BusAssignmentManager::createInstance(chipsetType);
 
     ULONG cCpus = 1;
@@ -1147 +1143 @@
             InsertConfigNode(pDev,     "0", &pInst);
             InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
-            hrc = BusMgr->assignPCIDevice("ich9pcibridge", pInst);                          H();
+            hrc = pBusMgr->assignPCIDevice("ich9pcibridge", pInst);                         H();
 
             InsertConfigNode(pDev,     "1", &pInst);
             InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
-            hrc = BusMgr->assignPCIDevice("ich9pcibridge", pInst);                          H();
+            hrc = pBusMgr->assignPCIDevice("ich9pcibridge", pInst);                         H();
 
 #ifdef VBOX_WITH_PCI_PASSTHROUGH
             /* Add PCI passthrough devices */
-            hrc = attachRawPCIDevices(pVM, BusMgr, pDevices);                               H();
+            hrc = attachRawPCIDevices(pUVM, pBusMgr, pDevices);                             H();
 #endif
         }
@@ -1213 +1209 @@
             InsertConfigNode(pDevices, "lpc", &pDev);
             InsertConfigNode(pDev,     "0", &pInst);
-            hrc = BusMgr->assignPCIDevice("lpc", pInst);                                    H();
+            hrc = pBusMgr->assignPCIDevice("lpc", pInst);                                   H();
             InsertConfigInteger(pInst, "Trusted",   1); /* boolean */
         }
@@ -1309 +1305 @@
         InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
 
-        hrc = BusMgr->assignPCIDevice("vga", pInst);                                        H();
+        hrc = pBusMgr->assignPCIDevice("vga", pInst);                                       H();
         InsertConfigNode(pInst,    "Config", &pCfg);
         ULONG cVRamMBs;
@@ -1588 +1584 @@
                 case StorageControllerType_LsiLogic:
                 {
-                    hrc = BusMgr->assignPCIDevice("lsilogic", pCtlInst);                    H();
+                    hrc = pBusMgr->assignPCIDevice("lsilogic", pCtlInst);                   H();
 
                     InsertConfigInteger(pCfg, "Bootable",  fBootable);
@@ -1602 +1598 @@
                 case StorageControllerType_BusLogic:
                 {
-                    hrc = BusMgr->assignPCIDevice("buslogic", pCtlInst);                    H();
+                    hrc = pBusMgr->assignPCIDevice("buslogic", pCtlInst);                   H();
 
                     InsertConfigInteger(pCfg, "Bootable",  fBootable);
@@ -1616 +1612 @@
                 case StorageControllerType_IntelAhci:
                 {
-                    hrc = BusMgr->assignPCIDevice("ahci", pCtlInst);                        H();
+                    hrc = pBusMgr->assignPCIDevice("ahci", pCtlInst);                       H();
 
                     ULONG cPorts = 0;
@@ -1624 +1620 @@
 
                     /* Needed configuration values for the bios, only first controller. */
-                    if (!BusMgr->hasPCIDevice("ahci", 1))
+                    if (!pBusMgr->hasPCIDevice("ahci", 1))
                     {
 #define MAX_SATA_LUN_COUNT 4
@@ -1713 +1709 @@
                      * IDE (update this when the main interface changes)
                      */
-                    hrc = BusMgr->assignPCIDevice("piix3ide", pCtlInst);                    H();
+                    hrc = pBusMgr->assignPCIDevice("piix3ide", pCtlInst);                   H();
                     InsertConfigString(pCfg,   "Type", controllerString(enmCtrlType));
                     /* Attach the status driver */
@@ -1749 +1745 @@
                 case StorageControllerType_LsiLogicSas:
                 {
-                    hrc = BusMgr->assignPCIDevice("lsilogicsas", pCtlInst);                 H();
+                    hrc = pBusMgr->assignPCIDevice("lsilogicsas", pCtlInst);                H();
 
                     InsertConfigString(pCfg,  "ControllerType", "SAS1068");
@@ -1898 +1894 @@
 #endif
             PCIBusAddress PCIAddr = PCIBusAddress(0, iPCIDeviceNo, 0);
-            hrc = BusMgr->assignPCIDevice(pszAdapterName, pInst, PCIAddr);                  H();
+            hrc = pBusMgr->assignPCIDevice(pszAdapterName, pInst, PCIAddr);                 H();
 
             InsertConfigNode(pInst, "Config", &pCfg);
@@ -2131 +2127 @@
         InsertConfigNode(pInst,    "Config", &pCfg);
         InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
-        hrc = BusMgr->assignPCIDevice("VMMDev", pInst);                                     H();
+        hrc = pBusMgr->assignPCIDevice("VMMDev", pInst);                                    H();
 
         Bstr hwVersion;
@@ -2188 +2184 @@
                     InsertConfigNode(pDev,     "0", &pInst);
                     InsertConfigInteger(pInst, "Trusted",          1); /* boolean */
-                    hrc = BusMgr->assignPCIDevice("ichac97", pInst);                        H();
+                    hrc = pBusMgr->assignPCIDevice("ichac97", pInst);                       H();
                     InsertConfigNode(pInst,    "Config", &pCfg);
                     break;
@@ -2212 +2208 @@
                     InsertConfigNode(pDev,     "0", &pInst);
                     InsertConfigInteger(pInst, "Trusted",          1); /* boolean */
-                    hrc = BusMgr->assignPCIDevice("hda", pInst);                            H();
+                    hrc = pBusMgr->assignPCIDevice("hda", pInst);                           H();
                     InsertConfigNode(pInst,    "Config", &pCfg);
                 }
@@ -2311 +2307 @@
                 InsertConfigNode(pInst,    "Config", &pCfg);
                 InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
-                hrc = BusMgr->assignPCIDevice("usb-ohci", pInst);                           H();
+                hrc = pBusMgr->assignPCIDevice("usb-ohci", pInst);                          H();
                 InsertConfigNode(pInst,    "LUN#0", &pLunL0);
                 InsertConfigString(pLunL0, "Driver",               "VUSBRootHub");
@@ -2343 +2339 @@
                         InsertConfigNode(pInst,    "Config", &pCfg);
                         InsertConfigInteger(pInst, "Trusted", 1); /* boolean */
-                        hrc = BusMgr->assignPCIDevice("usb-ehci", pInst);                   H();
+                        hrc = pBusMgr->assignPCIDevice("usb-ehci", pInst);                  H();
 
                         InsertConfigNode(pInst,    "LUN#0", &pLunL0);
@@ -2691 +2687 @@
             InsertConfigInteger(pInst, "Trusted", 1); /* boolean */
             InsertConfigNode(pInst,    "Config", &pCfg);
-            hrc = BusMgr->assignPCIDevice("acpi", pInst);                                   H();
+            hrc = pBusMgr->assignPCIDevice("acpi", pInst);                                  H();
 
             InsertConfigInteger(pCfg,  "RamSize",          cbRam);
@@ -2711 +2707 @@
             {
                 PCIBusAddress Address;
-                if (BusMgr->findPCIAddress("hda", 0, Address))
+                if (pBusMgr->findPCIAddress("hda", 0, Address))
                 {
                     uint32_t u32AudioPCIAddr = (Address.miDevice << 16) | Address.miFn;
@@ -2819 +2815 @@
      */
     if (RT_SUCCESS(rc))
-        rc = configCfgmOverlay(pVM, virtualBox, pMachine);
+        rc = configCfgmOverlay(pRoot, virtualBox, pMachine);
 
     /*
@@ -2865 +2861 @@
  */
 /* static */
-int Console::configCfgmOverlay(PVM pVM, IVirtualBox *pVirtualBox, IMachine *pMachine)
+int Console::configCfgmOverlay(PCFGMNODE pRoot, IVirtualBox *pVirtualBox, IMachine *pMachine)
 {
     /*
@@ -2880 +2876 @@
      * extra data to support global settings with local overrides.
      */
-    PCFGMNODE pRoot = CFGMR3GetRoot(pVM);
-    int       rc    = VINF_SUCCESS;
+    int rc = VINF_SUCCESS;
     try
     {