Changeset 42551 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Aug 2, 2012 4:44:39 PM (13 years ago)

Author:

vboxsync

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

79727

Message:

Main: big API naming cleanup, use all caps acronyms everywhere, including SDK docs
Frontends/VBoxManage: implement guestcontrol execute for new API, disabled by default

Location:

trunk/src/VBox/Main/src-client

Files:

• BusAssignmentManager.cpp (modified) (13 diffs)
• ConsoleImpl.cpp (modified) (16 diffs)
• ConsoleImpl2.cpp (modified) (58 diffs)
• GuestProcessImpl.cpp (modified) (1 diff)
• GuestSessionImpl.cpp (modified) (2 diffs)
• PCIRawDevImpl.cpp (moved) (moved from trunk/src/VBox/Main/src-client/PciRawDevImpl.cpp ) (17 diffs)
• VBoxDriversRegister.cpp (modified) (3 diffs)

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2010-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -26 +26 @@
 
 
-#include "PciDeviceAttachmentImpl.h"
+#include "PCIDeviceAttachmentImpl.h"
 
 #include <map>
@@ -217 +217 @@
 struct BusAssignmentManager::State
 {
-    struct PciDeviceRecord
+    struct PCIDeviceRecord
     {
         char          szDevName[32];
-        PciBusAddress HostAddress;
-
-        PciDeviceRecord(const char* pszName, PciBusAddress aHostAddress)
+        PCIBusAddress HostAddress;
+
+        PCIDeviceRecord(const char* pszName, PCIBusAddress aHostAddress)
         {
             RTStrCopy(this->szDevName, sizeof(szDevName), pszName);
@@ -228 +228 @@
         }
 
-        PciDeviceRecord(const char* pszName)
+        PCIDeviceRecord(const char* pszName)
         {
             RTStrCopy(this->szDevName, sizeof(szDevName), pszName);
         }
 
-        bool operator<(const PciDeviceRecord &a) const
+        bool operator<(const PCIDeviceRecord &a) const
         {
             return RTStrNCmp(szDevName, a.szDevName, sizeof(szDevName)) < 0;
         }
 
-        bool operator==(const PciDeviceRecord &a) const
+        bool operator==(const PCIDeviceRecord &a) const
         {
             return RTStrNCmp(szDevName, a.szDevName, sizeof(szDevName)) == 0;
@@ -244 +244 @@
     };
 
-    typedef std::map <PciBusAddress,PciDeviceRecord > PciMap;
-    typedef std::vector<PciBusAddress>                PciAddrList;
-    typedef std::vector<const DeviceAssignmentRule*>  PciRulesList;
-    typedef std::map <PciDeviceRecord,PciAddrList >   ReversePciMap;
+    typedef std::map <PCIBusAddress,PCIDeviceRecord > PCIMap;
+    typedef std::vector<PCIBusAddress>                PCIAddrList;
+    typedef std::vector<const DeviceAssignmentRule*>  PCIRulesList;
+    typedef std::map <PCIDeviceRecord,PCIAddrList >   ReversePCIMap;
 
     volatile int32_t cRefCnt;
     ChipsetType_T    mChipsetType;
-    PciMap           mPciMap;
-    ReversePciMap    mReversePciMap;
+    PCIMap           mPCIMap;
+    ReversePCIMap    mReversePCIMap;
 
     State()
@@ -262 +262 @@
     HRESULT init(ChipsetType_T chipsetType);
 
-    HRESULT record(const char* pszName, PciBusAddress& GuestAddress, PciBusAddress HostAddress);
-    HRESULT autoAssign(const char* pszName, PciBusAddress& Address);
-    bool    checkAvailable(PciBusAddress& Address);
-    bool    findPciAddress(const char* pszDevName, int iInstance, PciBusAddress& Address);
+    HRESULT record(const char* pszName, PCIBusAddress& GuestAddress, PCIBusAddress HostAddress);
+    HRESULT autoAssign(const char* pszName, PCIBusAddress& Address);
+    bool    checkAvailable(PCIBusAddress& Address);
+    bool    findPCIAddress(const char* pszDevName, int iInstance, PCIBusAddress& Address);
 
     const char* findAlias(const char* pszName);
-    void addMatchingRules(const char* pszName, PciRulesList& aList);
-    void listAttachedPciDevices(ComSafeArrayOut(IPciDeviceAttachment*, aAttached));
+    void addMatchingRules(const char* pszName, PCIRulesList& aList);
+    void listAttachedPCIDevices(ComSafeArrayOut(IPCIDeviceAttachment*, aAttached));
 };
 
@@ -278 +278 @@
 }
 
-HRESULT BusAssignmentManager::State::record(const char* pszName, PciBusAddress& Address, PciBusAddress HostAddress)
-{
-    PciDeviceRecord devRec(pszName, HostAddress);
+HRESULT BusAssignmentManager::State::record(const char* pszName, PCIBusAddress& Address, PCIBusAddress HostAddress)
+{
+    PCIDeviceRecord devRec(pszName, HostAddress);
 
     /* Remember address -> device mapping */
-    mPciMap.insert(PciMap::value_type(Address, devRec));
-
-    ReversePciMap::iterator it = mReversePciMap.find(devRec);
-    if (it == mReversePciMap.end())
-    {
-        mReversePciMap.insert(ReversePciMap::value_type(devRec, PciAddrList()));
-        it = mReversePciMap.find(devRec);
+    mPCIMap.insert(PCIMap::value_type(Address, devRec));
+
+    ReversePCIMap::iterator it = mReversePCIMap.find(devRec);
+    if (it == mReversePCIMap.end())
+    {
+        mReversePCIMap.insert(ReversePCIMap::value_type(devRec, PCIAddrList()));
+        it = mReversePCIMap.find(devRec);
     }
 
@@ -298 +298 @@
 }
 
-bool    BusAssignmentManager::State::findPciAddress(const char* pszDevName, int iInstance, PciBusAddress& Address)
-{
-    PciDeviceRecord devRec(pszDevName);
-
-    ReversePciMap::iterator it = mReversePciMap.find(devRec);
-    if (it == mReversePciMap.end())
+bool    BusAssignmentManager::State::findPCIAddress(const char* pszDevName, int iInstance, PCIBusAddress& Address)
+{
+    PCIDeviceRecord devRec(pszDevName);
+
+    ReversePCIMap::iterator it = mReversePCIMap.find(devRec);
+    if (it == mReversePCIMap.end())
         return false;
 
@@ -313 +313 @@
 }
 
-void BusAssignmentManager::State::addMatchingRules(const char* pszName, PciRulesList& aList)
+void BusAssignmentManager::State::addMatchingRules(const char* pszName, PCIRulesList& aList)
 {
     size_t iRuleset, iRule;
@@ -359 +359 @@
 }
 
-HRESULT BusAssignmentManager::State::autoAssign(const char* pszName, PciBusAddress& Address)
-{
-    PciRulesList matchingRules;
+HRESULT BusAssignmentManager::State::autoAssign(const char* pszName, PCIBusAddress& Address)
+{
+    PCIRulesList matchingRules;
 
     addMatchingRules(pszName,  matchingRules);
@@ -388 +388 @@
 }
 
-bool BusAssignmentManager::State::checkAvailable(PciBusAddress& Address)
-{
-    PciMap::const_iterator it = mPciMap.find(Address);
-
-    return (it == mPciMap.end());
-}
-
-
-void BusAssignmentManager::State::listAttachedPciDevices(ComSafeArrayOut(IPciDeviceAttachment*, aAttached))
-{
-    com::SafeIfaceArray<IPciDeviceAttachment> result(mPciMap.size());
+bool BusAssignmentManager::State::checkAvailable(PCIBusAddress& Address)
+{
+    PCIMap::const_iterator it = mPCIMap.find(Address);
+
+    return (it == mPCIMap.end());
+}
+
+
+void BusAssignmentManager::State::listAttachedPCIDevices(ComSafeArrayOut(IPCIDeviceAttachment*, aAttached))
+{
+    com::SafeIfaceArray<IPCIDeviceAttachment> result(mPCIMap.size());
 
     size_t iIndex = 0;
-    ComObjPtr<PciDeviceAttachment> dev;
-    for (PciMap::const_iterator it = mPciMap.begin(); it !=  mPciMap.end(); ++it)
+    ComObjPtr<PCIDeviceAttachment> dev;
+    for (PCIMap::const_iterator it = mPCIMap.begin(); it !=  mPCIMap.end(); ++it)
     {
         dev.createObject();
@@ -458 +458 @@
 }
 
-HRESULT BusAssignmentManager::assignPciDeviceImpl(const char* pszDevName,
+HRESULT BusAssignmentManager::assignPCIDeviceImpl(const char* pszDevName,
                                                   PCFGMNODE pCfg,
-                                                  PciBusAddress& GuestAddress,
-                                                  PciBusAddress HostAddress,
+                                                  PCIBusAddress& GuestAddress,
+                                                  PCIBusAddress HostAddress,
                                                   bool fGuestAddressRequired)
 {
@@ -504 +504 @@
 
 
-bool BusAssignmentManager::findPciAddress(const char* pszDevName, int iInstance, PciBusAddress& Address)
-{
-    return pState->findPciAddress(pszDevName, iInstance, Address);
-}
-
-void BusAssignmentManager::listAttachedPciDevices(ComSafeArrayOut(IPciDeviceAttachment*, aAttached))
-{
-    pState->listAttachedPciDevices(ComSafeArrayOutArg(aAttached));
-}
+bool BusAssignmentManager::findPCIAddress(const char* pszDevName, int iInstance, PCIBusAddress& Address)
+{
+    return pState->findPCIAddress(pszDevName, iInstance, Address);
+}
+
+void BusAssignmentManager::listAttachedPCIDevices(ComSafeArrayOut(IPCIDeviceAttachment*, aAttached))
+{
+    pState->listAttachedPCIDevices(ComSafeArrayOutArg(aAttached));
+}

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

@@ -325 +325 @@
                 Bstr hostIp, guestIp;
                 LONG hostPort, guestPort;
-                pNREv->COMGETTER(HostIp)(hostIp.asOutParam());
+                pNREv->COMGETTER(HostIP)(hostIp.asOutParam());
                 pNREv->COMGETTER(HostPort)(&hostPort);
-                pNREv->COMGETTER(GuestIp)(guestIp.asOutParam());
+                pNREv->COMGETTER(GuestIP)(guestIp.asOutParam());
                 pNREv->COMGETTER(GuestPort)(&guestPort);
                 ULONG ulSlot;
@@ -338 +338 @@
             break;
 
-            case VBoxEventType_OnHostPciDevicePlug:
+            case VBoxEventType_OnHostPCIDevicePlug:
             {
                 // handle if needed
@@ -555 +555 @@
             com::SafeArray<VBoxEventType_T> eventTypes;
             eventTypes.push_back(VBoxEventType_OnNATRedirect);
-            eventTypes.push_back(VBoxEventType_OnHostPciDevicePlug);
+            eventTypes.push_back(VBoxEventType_OnHostPCIDevicePlug);
             rc = pES->RegisterListener(aVmListener, ComSafeArrayAsInParam(eventTypes), true);
             AssertComRC(rc);
@@ -1923 +1923 @@
 }
 
-STDMETHODIMP Console::COMGETTER(AttachedPciDevices)(ComSafeArrayOut(IPciDeviceAttachment *, aAttachments))
+STDMETHODIMP Console::COMGETTER(AttachedPCIDevices)(ComSafeArrayOut(IPCIDeviceAttachment *, aAttachments))
 {
     CheckComArgOutSafeArrayPointerValid(aAttachments);
@@ -1933 +1933 @@
 
     if (mBusMgr)
-        mBusMgr->listAttachedPciDevices(ComSafeArrayOutArg(aAttachments));
+        mBusMgr->listAttachedPCIDevices(ComSafeArrayOutArg(aAttachments));
     else
     {
-        com::SafeIfaceArray<IPciDeviceAttachment> result((size_t)0);
+        com::SafeIfaceArray<IPCIDeviceAttachment> result((size_t)0);
         result.detachTo(ComSafeArrayOutArg(aAttachments));
     }
@@ -3775 +3775 @@
                                              fUseHostIOCache,
                                              false /* fSetupMerge */,
-                                             false /* fBuiltinIoCache */,
+                                             false /* fBuiltinIOCache */,
                                              0 /* uMergeSource */,
                                              0 /* uMergeTarget */,
@@ -4020 +4020 @@
                                              fUseHostIOCache,
                                              false /* fSetupMerge */,
-                                             false /* fBuiltinIoCache */,
+                                             false /* fBuiltinIOCache */,
                                              0 /* uMergeSource */,
                                              0 /* uMergeTarget */,
@@ -4436 +4436 @@
  */
 HRESULT Console::onNATRedirectRuleChange(ULONG ulInstance, BOOL aNatRuleRemove,
-                                         NATProtocol_T aProto, IN_BSTR aHostIp, LONG aHostPort, IN_BSTR aGuestIp, LONG aGuestPort)
+                                         NATProtocol_T aProto, IN_BSTR aHostIP, LONG aHostPort, IN_BSTR aGuestIP, LONG aGuestPort)
 {
     LogFlowThisFunc(("\n"));
@@ -4507 +4507 @@
             bool fUdp = aProto == NATProtocol_UDP;
             vrc = pNetNatCfg->pfnRedirectRuleCommand(pNetNatCfg, !!aNatRuleRemove, fUdp,
-                                                     Utf8Str(aHostIp).c_str(), aHostPort, Utf8Str(aGuestIp).c_str(),
+                                                     Utf8Str(aHostIP).c_str(), aHostPort, Utf8Str(aGuestIP).c_str(),
                                                      aGuestPort);
             if (RT_FAILURE(vrc))
@@ -5558 +5558 @@
     /** @todo AssertComRC -> AssertComRCReturn! Could potentially end up
      *        using uninitialized variables here. */
-    BOOL fBuiltinIoCache;
-    rc = mMachine->COMGETTER(IoCacheEnabled)(&fBuiltinIoCache);
+    BOOL fBuiltinIOCache;
+    rc = mMachine->COMGETTER(IOCacheEnabled)(&fBuiltinIOCache);
     AssertComRC(rc);
     SafeIfaceArray<IStorageController> ctrls;
@@ -5643 +5643 @@
                           enmBus,
                           fUseHostIOCache,
-                          fBuiltinIoCache,
+                          fBuiltinIOCache,
                           true /* fSetupMerge */,
                           aSourceIdx,
@@ -5719 +5719 @@
                           enmBus,
                           fUseHostIOCache,
-                          fBuiltinIoCache,
+                          fBuiltinIOCache,
                           false /* fSetupMerge */,
                           0 /* uMergeSource */,
@@ -9096 +9096 @@
                                                        StorageBus_T enmBus,
                                                        bool fUseHostIOCache,
-                                                       bool fBuiltinIoCache,
+                                                       bool fBuiltinIOCache,
                                                        bool fSetupMerge,
                                                        unsigned uMergeSource,
@@ -9131 +9131 @@
                                           enmBus,
                                           fUseHostIOCache,
-                                          fBuiltinIoCache,
+                                          fBuiltinIOCache,
                                           fSetupMerge,
                                           uMergeSource,
@@ -9314 +9314 @@
                 const char *pcszDevice = Console::convertControllerTypeToDev(enmController);
 
-                BOOL fBuiltinIoCache;
-                rc = that->mMachine->COMGETTER(IoCacheEnabled)(&fBuiltinIoCache);
+                BOOL fBuiltinIOCache;
+                rc = that->mMachine->COMGETTER(IOCacheEnabled)(&fBuiltinIOCache);
                 if (FAILED(rc))
                     throw rc;
@@ -9333 +9333 @@
                                       enmBus,
                                       fUseHostIOCache,
-                                      fBuiltinIoCache,
+                                      fBuiltinIOCache,
                                       false /* fSetupMerge */,
                                       0 /* uMergeSource */,

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

@@ -38 +38 @@
 #include "Global.h"
 #ifdef VBOX_WITH_PCI_PASSTHROUGH
-# include "PciRawDevImpl.h"
+# include "PCIRawDevImpl.h"
 #endif
 
@@ -217 +217 @@
 {
     ULONG          mInstance;
-    PciBusAddress  mPciAddress;
+    PCIBusAddress  mPCIAddress;
 
     ULONG          mBootPrio;
@@ -466 +466 @@
 
 #ifdef VBOX_WITH_PCI_PASSTHROUGH
-HRESULT Console::attachRawPciDevices(PVM pVM,
+HRESULT Console::attachRawPCIDevices(PVM pVM,
                                      BusAssignmentManager *BusMgr,
                                      PCFGMNODE            pDevices)
@@ -473 +473 @@
     PCFGMNODE pInst, pCfg, pLunL0, pLunL1;
 
-    SafeIfaceArray<IPciDeviceAttachment> assignments;
+    SafeIfaceArray<IPCIDeviceAttachment> assignments;
     ComPtr<IMachine> aMachine = machine();
 
-    hrc = aMachine->COMGETTER(PciDeviceAssignments)(ComSafeArrayAsOutParam(assignments));
+    hrc = aMachine->COMGETTER(PCIDeviceAssignments)(ComSafeArrayAsOutParam(assignments));
     if (   hrc != S_OK
         || assignments.size() < 1)
@@ -490 +490 @@
      */
 # ifdef VBOX_WITH_EXTPACK
-    static const char *s_pszPciRawExtPackName = "Oracle VM VirtualBox Extension Pack";
-    if (!mptrExtPackManager->isExtPackUsable(s_pszPciRawExtPackName))
+    static const char *s_pszPCIRawExtPackName = "Oracle VM VirtualBox Extension Pack";
+    if (!mptrExtPackManager->isExtPackUsable(s_pszPCIRawExtPackName))
     {
         /* Always fatal! */
@@ -498 +498 @@
                    "The VM cannot be started. To fix this problem, either "
                    "install the '%s' or disable PCI passthrough via VBoxManage"),
-                s_pszPciRawExtPackName);
+                s_pszPCIRawExtPackName);
     }
 # endif
@@ -508 +508 @@
     for (size_t iDev = 0; iDev < assignments.size(); iDev++)
     {
-        ComPtr<IPciDeviceAttachment> assignment = assignments[iDev];
+        ComPtr<IPCIDeviceAttachment> assignment = assignments[iDev];
         LONG guest = 0;
-        PciBusAddress GuestPciAddress;
+        PCIBusAddress GuestPCIAddress;
 
         assignment->COMGETTER(GuestAddress)(&guest);
-        GuestPciAddress.fromLong(guest);
-        Assert(GuestPciAddress.valid());
-
-        if (GuestPciAddress.miBus > 0)
+        GuestPCIAddress.fromLong(guest);
+        Assert(GuestPCIAddress.valid());
+
+        if (GuestPCIAddress.miBus > 0)
         {
             int iBridgesMissed = 0;
-            int iBase = GuestPciAddress.miBus - 1;
-
-            while (!BusMgr->hasPciDevice("ich9pcibridge", iBase) && iBase > 0)
+            int iBase = GuestPCIAddress.miBus - 1;
+
+            while (!BusMgr->hasPCIDevice("ich9pcibridge", iBase) && iBase > 0)
             {
                 iBridgesMissed++; iBase--;
@@ -531 +531 @@
                 InsertConfigNode(pBridges, Utf8StrFmt("%d", iBase + iBridge).c_str(), &pInst);
                 InsertConfigInteger(pInst, "Trusted",              1);
-                hrc = BusMgr->assignPciDevice("ich9pcibridge", pInst);
+                hrc = BusMgr->assignPCIDevice("ich9pcibridge", pInst);
             }
         }
@@ -537 +537 @@
 
     /* Now actually add devices */
-    PCFGMNODE pPciDevs = NULL;
+    PCFGMNODE pPCIDevs = NULL;
 
     if (assignments.size() > 0)
     {
-        InsertConfigNode(pDevices, "pciraw",  &pPciDevs);
+        InsertConfigNode(pDevices, "pciraw",  &pPCIDevs);
 
         PCFGMNODE pRoot = CFGMR3GetParent(pDevices); Assert(pRoot);
 
-        /* Tell PGM to tell GPciRaw about guest mappings. */
+        /* Tell PGM to tell GPCIRaw about guest mappings. */
         CFGMR3InsertNode(pRoot, "PGM", NULL);
         InsertConfigInteger(CFGMR3GetChild(pRoot, "PGM"), "PciPassThrough", 1);
@@ -560 +560 @@
     for (size_t iDev = 0; iDev < assignments.size(); iDev++)
     {
-        PciBusAddress HostPciAddress, GuestPciAddress;
-        ComPtr<IPciDeviceAttachment> assignment = assignments[iDev];
+        PCIBusAddress HostPCIAddress, GuestPCIAddress;
+        ComPtr<IPCIDeviceAttachment> assignment = assignments[iDev];
         LONG host, guest;
         Bstr aDevName;
@@ -569 +569 @@
         assignment->COMGETTER(Name)(aDevName.asOutParam());
 
-        InsertConfigNode(pPciDevs, Utf8StrFmt("%d", iDev).c_str(), &pInst);
+        InsertConfigNode(pPCIDevs, Utf8StrFmt("%d", iDev).c_str(), &pInst);
         InsertConfigInteger(pInst, "Trusted", 1);
 
-        HostPciAddress.fromLong(host);
-        Assert(HostPciAddress.valid());
+        HostPCIAddress.fromLong(host);
+        Assert(HostPCIAddress.valid());
         InsertConfigNode(pInst,        "Config",  &pCfg);
         InsertConfigString(pCfg,       "DeviceName",  aDevName);
 
         InsertConfigInteger(pCfg,      "DetachHostDriver",  1);
-        InsertConfigInteger(pCfg,      "HostPCIBusNo",      HostPciAddress.miBus);
-        InsertConfigInteger(pCfg,      "HostPCIDeviceNo",   HostPciAddress.miDevice);
-        InsertConfigInteger(pCfg,      "HostPCIFunctionNo", HostPciAddress.miFn);
-
-        GuestPciAddress.fromLong(guest);
-        Assert(GuestPciAddress.valid());
-        hrc = BusMgr->assignHostPciDevice("pciraw", pInst, HostPciAddress, GuestPciAddress, true);
+        InsertConfigInteger(pCfg,      "HostPCIBusNo",      HostPCIAddress.miBus);
+        InsertConfigInteger(pCfg,      "HostPCIDeviceNo",   HostPCIAddress.miDevice);
+        InsertConfigInteger(pCfg,      "HostPCIFunctionNo", HostPCIAddress.miFn);
+
+        GuestPCIAddress.fromLong(guest);
+        Assert(GuestPCIAddress.valid());
+        hrc = BusMgr->assignHostPCIDevice("pciraw", pInst, HostPCIAddress, GuestPCIAddress, true);
         if (hrc != S_OK)
             return hrc;
 
-        InsertConfigInteger(pCfg,      "GuestPCIBusNo",      GuestPciAddress.miBus);
-        InsertConfigInteger(pCfg,      "GuestPCIDeviceNo",   GuestPciAddress.miDevice);
-        InsertConfigInteger(pCfg,      "GuestPCIFunctionNo", GuestPciAddress.miFn);
+        InsertConfigInteger(pCfg,      "GuestPCIBusNo",      GuestPCIAddress.miBus);
+        InsertConfigInteger(pCfg,      "GuestPCIDeviceNo",   GuestPCIAddress.miDevice);
+        InsertConfigInteger(pCfg,      "GuestPCIFunctionNo", GuestPCIAddress.miFn);
 
         /* the driver */
@@ -600 +600 @@
         InsertConfigString(pLunL1,     "Driver", "MainPciRaw");
         InsertConfigNode(pLunL1,       "Config", &pCfg);
-        PciRawDev* pMainDev = new PciRawDev(this);
+        PCIRawDev* pMainDev = new PCIRawDev(this);
         InsertConfigInteger(pCfg,      "Object", (uintptr_t)pMainDev);
     }
@@ -1002 +1002 @@
         /* I/O cache size */
         ULONG ioCacheSize = 5;
-        hrc = pMachine->COMGETTER(IoCacheSize)(&ioCacheSize);                               H();
+        hrc = pMachine->COMGETTER(IOCacheSize)(&ioCacheSize);                               H();
         InsertConfigInteger(pPDMBlkCache, "CacheSize", ioCacheSize * _1M);
 
@@ -1100 +1100 @@
          * PCI buses.
          */
-        uint32_t uIocPciAddress, uHbcPciAddress;
+        uint32_t uIocPCIAddress, uHbcPCIAddress;
         switch (chipsetType)
         {
@@ -1107 +1107 @@
             case ChipsetType_PIIX3:
                 InsertConfigNode(pDevices, "pci", &pDev);
-                uHbcPciAddress = (0x0 << 16) | 0;
-                uIocPciAddress = (0x1 << 16) | 0; // ISA controller
+                uHbcPCIAddress = (0x0 << 16) | 0;
+                uIocPCIAddress = (0x1 << 16) | 0; // ISA controller
                 break;
             case ChipsetType_ICH9:
                 InsertConfigNode(pDevices, "ich9pci", &pDev);
-                uHbcPciAddress = (0x1e << 16) | 0;
-                uIocPciAddress = (0x1f << 16) | 0; // LPC controller
+                uHbcPCIAddress = (0x1e << 16) | 0;
+                uIocPCIAddress = (0x1f << 16) | 0; // LPC controller
                 break;
         }
@@ -1131 +1131 @@
             InsertConfigNode(pDev,     "0", &pInst);
             InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
-            hrc = BusMgr->assignPciDevice("ich9pcibridge", pInst);                          H();
+            hrc = BusMgr->assignPCIDevice("ich9pcibridge", pInst);                          H();
 
             InsertConfigNode(pDev,     "1", &pInst);
             InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
-            hrc = BusMgr->assignPciDevice("ich9pcibridge", pInst);                          H();
+            hrc = BusMgr->assignPCIDevice("ich9pcibridge", pInst);                          H();
 
 #ifdef VBOX_WITH_PCI_PASSTHROUGH
             /* Add PCI passthrough devices */
-            hrc = attachRawPciDevices(pVM, BusMgr, pDevices);                               H();
+            hrc = attachRawPCIDevices(pVM, BusMgr, pDevices);                               H();
 #endif
         }
@@ -1150 +1150 @@
          * High Precision Event Timer (HPET)
          */
-        BOOL fHpetEnabled;
+        BOOL fHPETEnabled;
         /* Other guests may wish to use HPET too, but MacOS X not functional without it */
-        hrc = pMachine->COMGETTER(HpetEnabled)(&fHpetEnabled);                              H();
+        hrc = pMachine->COMGETTER(HPETEnabled)(&fHPETEnabled);                              H();
         /* so always enable HPET in extended profile */
-        fHpetEnabled |= fOsXGuest;
+        fHPETEnabled |= fOsXGuest;
         /* HPET is always present on ICH9 */
-        fHpetEnabled |= (chipsetType == ChipsetType_ICH9);
-        if (fHpetEnabled)
+        fHPETEnabled |= (chipsetType == ChipsetType_ICH9);
+        if (fHPETEnabled)
         {
             InsertConfigNode(pDevices, "hpet", &pDev);
@@ -1197 +1197 @@
             InsertConfigNode(pDevices, "lpc", &pDev);
             InsertConfigNode(pDev,     "0", &pInst);
-            hrc = BusMgr->assignPciDevice("lpc", pInst);                                    H();
+            hrc = BusMgr->assignPCIDevice("lpc", pInst);                                    H();
             InsertConfigInteger(pInst, "Trusted",   1); /* boolean */
         }
@@ -1293 +1293 @@
         InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
 
-        hrc = BusMgr->assignPciDevice("vga", pInst);                                        H();
+        hrc = BusMgr->assignPCIDevice("vga", pInst);                                        H();
         InsertConfigNode(pInst,    "Config", &pCfg);
         ULONG cVRamMBs;
@@ -1564 +1564 @@
                 case StorageControllerType_LsiLogic:
                 {
-                    hrc = BusMgr->assignPciDevice("lsilogic", pCtlInst);                    H();
+                    hrc = BusMgr->assignPCIDevice("lsilogic", pCtlInst);                    H();
 
                     InsertConfigInteger(pCfg, "Bootable",  fBootable);
@@ -1578 +1578 @@
                 case StorageControllerType_BusLogic:
                 {
-                    hrc = BusMgr->assignPciDevice("buslogic", pCtlInst);                    H();
+                    hrc = BusMgr->assignPCIDevice("buslogic", pCtlInst);                    H();
 
                     InsertConfigInteger(pCfg, "Bootable",  fBootable);
@@ -1592 +1592 @@
                 case StorageControllerType_IntelAhci:
                 {
-                    hrc = BusMgr->assignPciDevice("ahci", pCtlInst);                        H();
+                    hrc = BusMgr->assignPCIDevice("ahci", pCtlInst);                        H();
 
                     ULONG cPorts = 0;
@@ -1600 +1600 @@
 
                     /* Needed configuration values for the bios, only first controller. */
-                    if (!BusMgr->hasPciDevice("ahci", 1))
+                    if (!BusMgr->hasPCIDevice("ahci", 1))
                     {
                         if (pBiosCfg)
@@ -1635 +1635 @@
                      * IDE (update this when the main interface changes)
                      */
-                    hrc = BusMgr->assignPciDevice("piix3ide", pCtlInst);                    H();
+                    hrc = BusMgr->assignPCIDevice("piix3ide", pCtlInst);                    H();
                     InsertConfigString(pCfg,   "Type", controllerString(enmCtrlType));
                     /* Attach the status driver */
@@ -1671 +1671 @@
                 case StorageControllerType_LsiLogicSas:
                 {
-                    hrc = BusMgr->assignPciDevice("lsilogicsas", pCtlInst);                 H();
+                    hrc = BusMgr->assignPCIDevice("lsilogicsas", pCtlInst);                 H();
 
                     InsertConfigString(pCfg,  "ControllerType", "SAS1068");
@@ -1694 +1694 @@
 
             /* Builtin I/O cache - per device setting. */
-            BOOL fBuiltinIoCache = true;
-            hrc = pMachine->COMGETTER(IoCacheEnabled)(&fBuiltinIoCache);                    H();
+            BOOL fBuiltinIOCache = true;
+            hrc = pMachine->COMGETTER(IOCacheEnabled)(&fBuiltinIOCache);                    H();
 
 
@@ -1706 +1706 @@
                                             enmBus,
                                             !!fUseHostIOCache,
-                                            !!fBuiltinIoCache,
+                                            !!fBuiltinIOCache,
                                             false /* fSetupMerge */,
                                             0 /* uMergeSource */,
@@ -1789 +1789 @@
             /* the first network card gets the PCI ID 3, the next 3 gets 8..10,
              * next 4 get 16..19. */
-            int iPciDeviceNo;
+            int iPCIDeviceNo;
             switch (ulInstance)
             {
                 case 0:
-                    iPciDeviceNo = 3;
+                    iPCIDeviceNo = 3;
                     break;
                 case 1: case 2: case 3:
-                    iPciDeviceNo = ulInstance - 1 + 8;
+                    iPCIDeviceNo = ulInstance - 1 + 8;
                     break;
                 case 4: case 5: case 6: case 7:
-                    iPciDeviceNo = ulInstance - 4 + 16;
+                    iPCIDeviceNo = ulInstance - 4 + 16;
                     break;
                 default:
                     /* auto assignment */
-                    iPciDeviceNo = -1;
+                    iPCIDeviceNo = -1;
                     break;
             }
@@ -1811 +1811 @@
              * it assigns slot 11 to the first network controller.
              */
-            if (iPciDeviceNo == 3 && adapterType == NetworkAdapterType_I82545EM)
-            {
-                iPciDeviceNo = 0x11;
+            if (iPCIDeviceNo == 3 && adapterType == NetworkAdapterType_I82545EM)
+            {
+                iPCIDeviceNo = 0x11;
                 fSwapSlots3and11 = true;
             }
-            else if (iPciDeviceNo == 0x11 && fSwapSlots3and11)
-                iPciDeviceNo = 3;
+            else if (iPCIDeviceNo == 0x11 && fSwapSlots3and11)
+                iPCIDeviceNo = 3;
 #endif
-            PciBusAddress PciAddr = PciBusAddress(0, iPciDeviceNo, 0);
-            hrc = BusMgr->assignPciDevice(pszAdapterName, pInst, PciAddr);                  H();
+            PCIBusAddress PCIAddr = PCIBusAddress(0, iPCIDeviceNo, 0);
+            hrc = BusMgr->assignPCIDevice(pszAdapterName, pInst, PCIAddr);                  H();
 
             InsertConfigNode(pInst, "Config", &pCfg);
@@ -1836 +1836 @@
             nic.mInstance    = ulInstance;
             /* Could be updated by reference, if auto assigned */
-            nic.mPciAddress  = PciAddr;
+            nic.mPCIAddress  = PCIAddr;
 
             hrc = networkAdapter->COMGETTER(BootPriority)(&nic.mBootPrio);                  H();
@@ -1944 +1944 @@
                 InsertConfigNode(pNetBootCfg, achBootIdx, &pNetBtDevCfg);
                 InsertConfigInteger(pNetBtDevCfg, "NIC", it->mInstance);
-                InsertConfigInteger(pNetBtDevCfg, "PCIBusNo",      it->mPciAddress.miBus);
-                InsertConfigInteger(pNetBtDevCfg, "PCIDeviceNo",   it->mPciAddress.miDevice);
-                InsertConfigInteger(pNetBtDevCfg, "PCIFunctionNo", it->mPciAddress.miFn);
+                InsertConfigInteger(pNetBtDevCfg, "PCIBusNo",      it->mPCIAddress.miBus);
+                InsertConfigInteger(pNetBtDevCfg, "PCIDeviceNo",   it->mPCIAddress.miDevice);
+                InsertConfigInteger(pNetBtDevCfg, "PCIFunctionNo", it->mPCIAddress.miFn);
             }
         }
@@ -2053 +2053 @@
         InsertConfigNode(pInst,    "Config", &pCfg);
         InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
-        hrc = BusMgr->assignPciDevice("VMMDev", pInst);                                     H();
+        hrc = BusMgr->assignPCIDevice("VMMDev", pInst);                                     H();
 
         Bstr hwVersion;
@@ -2110 +2110 @@
                     InsertConfigNode(pDev,     "0", &pInst);
                     InsertConfigInteger(pInst, "Trusted",          1); /* boolean */
-                    hrc = BusMgr->assignPciDevice("ichac97", pInst);                        H();
+                    hrc = BusMgr->assignPCIDevice("ichac97", pInst);                        H();
                     InsertConfigNode(pInst,    "Config", &pCfg);
                     break;
@@ -2134 +2134 @@
                     InsertConfigNode(pDev,     "0", &pInst);
                     InsertConfigInteger(pInst, "Trusted",          1); /* boolean */
-                    hrc = BusMgr->assignPciDevice("hda", pInst);                            H();
+                    hrc = BusMgr->assignPCIDevice("hda", pInst);                            H();
                     InsertConfigNode(pInst,    "Config", &pCfg);
                 }
@@ -2233 +2233 @@
                 InsertConfigNode(pInst,    "Config", &pCfg);
                 InsertConfigInteger(pInst, "Trusted",              1); /* boolean */
-                hrc = BusMgr->assignPciDevice("usb-ohci", pInst);                           H();
+                hrc = BusMgr->assignPCIDevice("usb-ohci", pInst);                           H();
                 InsertConfigNode(pInst,    "LUN#0", &pLunL0);
                 InsertConfigString(pLunL0, "Driver",               "VUSBRootHub");
@@ -2244 +2244 @@
 
 #ifdef VBOX_WITH_EHCI
-                BOOL fEhciEnabled;
-                hrc = USBCtlPtr->COMGETTER(EnabledEhci)(&fEhciEnabled);                     H();
-                if (fEhciEnabled)
+                BOOL fEHCIEnabled;
+                hrc = USBCtlPtr->COMGETTER(EnabledEHCI)(&fEHCIEnabled);                     H();
+                if (fEHCIEnabled)
                 {
                     /*
@@ -2265 +2265 @@
                         InsertConfigNode(pInst,    "Config", &pCfg);
                         InsertConfigInteger(pInst, "Trusted", 1); /* boolean */
-                        hrc = BusMgr->assignPciDevice("usb-ehci", pInst);                   H();
+                        hrc = BusMgr->assignPCIDevice("usb-ehci", pInst);                   H();
 
                         InsertConfigNode(pInst,    "LUN#0", &pLunL0);
@@ -2380 +2380 @@
 
                 /* Virtual USB Mouse/Tablet */
-                PointingHidType_T aPointingHid;
-                hrc = pMachine->COMGETTER(PointingHidType)(&aPointingHid);                  H();
-                if (aPointingHid == PointingHidType_USBMouse || aPointingHid == PointingHidType_USBTablet)
+                PointingHIDType_T aPointingHID;
+                hrc = pMachine->COMGETTER(PointingHIDType)(&aPointingHID);                  H();
+                if (aPointingHID == PointingHIDType_USBMouse || aPointingHID == PointingHIDType_USBTablet)
                 {
                     InsertConfigNode(pUsbDevices, "HidMouse", &pDev);
@@ -2388 +2388 @@
                     InsertConfigNode(pInst,    "Config", &pCfg);
 
-                    if (aPointingHid == PointingHidType_USBTablet)
+                    if (aPointingHID == PointingHIDType_USBTablet)
                     {
                         InsertConfigInteger(pCfg, "Absolute", 1);
@@ -2409 +2409 @@
 
                 /* Virtual USB Keyboard */
-                KeyboardHidType_T aKbdHid;
-                hrc = pMachine->COMGETTER(KeyboardHidType)(&aKbdHid);                       H();
-                if (aKbdHid == KeyboardHidType_USBKeyboard)
+                KeyboardHIDType_T aKbdHID;
+                hrc = pMachine->COMGETTER(KeyboardHIDType)(&aKbdHID);                       H();
+                if (aKbdHID == KeyboardHIDType_USBKeyboard)
                 {
                     InsertConfigNode(pUsbDevices, "HidKeyboard", &pDev);
@@ -2589 +2589 @@
             InsertConfigInteger(pInst, "Trusted", 1); /* boolean */
             InsertConfigNode(pInst,    "Config", &pCfg);
-            hrc = BusMgr->assignPciDevice("acpi", pInst);                                   H();
+            hrc = BusMgr->assignPCIDevice("acpi", pInst);                                   H();
 
             InsertConfigInteger(pCfg,  "RamSize",          cbRam);
@@ -2597 +2597 @@
             InsertConfigInteger(pCfg,  "IOAPIC", fIOAPIC);
             InsertConfigInteger(pCfg,  "FdcEnabled", fFdcEnabled);
-            InsertConfigInteger(pCfg,  "HpetEnabled", fHpetEnabled);
+            InsertConfigInteger(pCfg,  "HpetEnabled", fHPETEnabled);
             InsertConfigInteger(pCfg,  "SmcEnabled", fSmcEnabled);
             InsertConfigInteger(pCfg,  "ShowRtc",    fShowRtc);
@@ -2603 +2603 @@
             {
                 BootNic aNic = llBootNics.front();
-                uint32_t u32NicPciAddr = (aNic.mPciAddress.miDevice << 16) | aNic.mPciAddress.miFn;
-                InsertConfigInteger(pCfg, "NicPciAddress",    u32NicPciAddr);
+                uint32_t u32NicPCIAddr = (aNic.mPCIAddress.miDevice << 16) | aNic.mPCIAddress.miFn;
+                InsertConfigInteger(pCfg, "NicPciAddress",    u32NicPCIAddr);
             }
             if (fOsXGuest && fAudioEnabled)
             {
-                PciBusAddress Address;
-                if (BusMgr->findPciAddress("hda", 0, Address))
-                {
-                    uint32_t u32AudioPciAddr = (Address.miDevice << 16) | Address.miFn;
-                    InsertConfigInteger(pCfg, "AudioPciAddress",    u32AudioPciAddr);
-                }
-            }
-            InsertConfigInteger(pCfg,  "IocPciAddress", uIocPciAddress);
+                PCIBusAddress Address;
+                if (BusMgr->findPCIAddress("hda", 0, Address))
+                {
+                    uint32_t u32AudioPCIAddr = (Address.miDevice << 16) | Address.miFn;
+                    InsertConfigInteger(pCfg, "AudioPciAddress",    u32AudioPCIAddr);
+                }
+            }
+            InsertConfigInteger(pCfg,  "IocPciAddress", uIocPCIAddress);
             if (chipsetType == ChipsetType_ICH9)
             {
@@ -2621 +2621 @@
                 InsertConfigInteger(pCfg,  "McfgLength", cbMcfgLength);
             }
-            InsertConfigInteger(pCfg,  "HostBusPciAddress", uHbcPciAddress);
+            InsertConfigInteger(pCfg,  "HostBusPciAddress", uHbcPCIAddress);
             InsertConfigInteger(pCfg,  "ShowCpu", fShowCpu);
             InsertConfigInteger(pCfg,  "CpuHotPlug", fCpuHotPlug);
@@ -2941 +2941 @@
                                     StorageBus_T enmBus,
                                     bool fUseHostIOCache,
-                                    bool fBuiltinIoCache,
+                                    bool fBuiltinIOCache,
                                     bool fSetupMerge,
                                     unsigned uMergeSource,
@@ -3266 +3266 @@
                           lType,
                           fUseHostIOCache,
-                          fBuiltinIoCache,
+                          fBuiltinIOCache,
                           fSetupMerge,
                           uMergeSource,
@@ -3308 +3308 @@
                           DeviceType_T enmType,
                           bool fUseHostIOCache,
-                          bool fBuiltinIoCache,
+                          bool fBuiltinIOCache,
                           bool fSetupMerge,
                           unsigned uMergeSource,
@@ -3473 +3473 @@
                      * and just increases the overhead.
                      */
-                    if (   fBuiltinIoCache
+                    if (   fBuiltinIOCache
                         && (enmType == DeviceType_HardDisk))
                         InsertConfigInteger(pCfg, "BlockCache", 1);
@@ -3737 +3737 @@
             case NetworkAttachmentType_NAT:
             {
-                ComPtr<INATEngine> natDriver;
-                hrc = aNetworkAdapter->COMGETTER(NatDriver)(natDriver.asOutParam());        H();
+                ComPtr<INATEngine> natEngine;
+                hrc = aNetworkAdapter->COMGETTER(NATEngine)(natEngine.asOutParam());        H();
                 InsertConfigString(pLunL0, "Driver", "NAT");
                 InsertConfigNode(pLunL0, "Config", &pCfg);
@@ -3749 +3749 @@
                 InsertConfigString(pCfg, "BootFile", Utf8StrFmt("%ls.pxe", bstr.raw()));
 
-                hrc = natDriver->COMGETTER(Network)(bstr.asOutParam());                     H();
+                hrc = natEngine->COMGETTER(Network)(bstr.asOutParam());                     H();
                 if (!bstr.isEmpty())
                     InsertConfigString(pCfg, "Network", bstr);
@@ -3758 +3758 @@
                     InsertConfigString(pCfg, "Network", Utf8StrFmt("10.0.%d.0/24", uSlot+2));
                 }
-                hrc = natDriver->COMGETTER(HostIP)(bstr.asOutParam());                      H();
+                hrc = natEngine->COMGETTER(HostIP)(bstr.asOutParam());                      H();
                 if (!bstr.isEmpty())
                     InsertConfigString(pCfg, "BindIP", bstr);
@@ -3766 +3766 @@
                 ULONG tcpSnd = 0;
                 ULONG tcpRcv = 0;
-                hrc = natDriver->GetNetworkSettings(&mtu, &sockSnd, &sockRcv, &tcpSnd, &tcpRcv); H();
+                hrc = natEngine->GetNetworkSettings(&mtu, &sockSnd, &sockRcv, &tcpSnd, &tcpRcv); H();
                 if (mtu)
                     InsertConfigInteger(pCfg, "SlirpMTU", mtu);
@@ -3777 +3777 @@
                 if (tcpSnd)
                     InsertConfigInteger(pCfg, "TcpSnd", tcpSnd);
-                hrc = natDriver->COMGETTER(TftpPrefix)(bstr.asOutParam());                  H();
+                hrc = natEngine->COMGETTER(TFTPPrefix)(bstr.asOutParam());                  H();
                 if (!bstr.isEmpty())
                 {
@@ -3783 +3783 @@
                     InsertConfigString(pCfg, "TFTPPrefix", bstr);
                 }
-                hrc = natDriver->COMGETTER(TftpBootFile)(bstr.asOutParam());                H();
+                hrc = natEngine->COMGETTER(TFTPBootFile)(bstr.asOutParam());                H();
                 if (!bstr.isEmpty())
                 {
@@ -3789 +3789 @@
                     InsertConfigString(pCfg, "BootFile", bstr);
                 }
-                hrc = natDriver->COMGETTER(TftpNextServer)(bstr.asOutParam());              H();
+                hrc = natEngine->COMGETTER(TFTPNextServer)(bstr.asOutParam());              H();
                 if (!bstr.isEmpty())
                     InsertConfigString(pCfg, "NextServer", bstr);
-                BOOL fDnsFlag;
-                hrc = natDriver->COMGETTER(DnsPassDomain)(&fDnsFlag);                       H();
-                InsertConfigInteger(pCfg, "PassDomain", fDnsFlag);
-                hrc = natDriver->COMGETTER(DnsProxy)(&fDnsFlag);                            H();
-                InsertConfigInteger(pCfg, "DNSProxy", fDnsFlag);
-                hrc = natDriver->COMGETTER(DnsUseHostResolver)(&fDnsFlag);                  H();
-                InsertConfigInteger(pCfg, "UseHostResolver", fDnsFlag);
+                BOOL fDNSFlag;
+                hrc = natEngine->COMGETTER(DNSPassDomain)(&fDNSFlag);                       H();
+                InsertConfigInteger(pCfg, "PassDomain", fDNSFlag);
+                hrc = natEngine->COMGETTER(DNSProxy)(&fDNSFlag);                            H();
+                InsertConfigInteger(pCfg, "DNSProxy", fDNSFlag);
+                hrc = natEngine->COMGETTER(DNSUseHostResolver)(&fDNSFlag);                  H();
+                InsertConfigInteger(pCfg, "UseHostResolver", fDNSFlag);
 
                 ULONG aliasMode;
-                hrc = natDriver->COMGETTER(AliasMode)(&aliasMode);                          H();
+                hrc = natEngine->COMGETTER(AliasMode)(&aliasMode);                          H();
                 InsertConfigInteger(pCfg, "AliasMode", aliasMode);
 
                 /* port-forwarding */
                 SafeArray<BSTR> pfs;
-                hrc = natDriver->COMGETTER(Redirects)(ComSafeArrayAsOutParam(pfs));         H();
+                hrc = natEngine->COMGETTER(Redirects)(ComSafeArrayAsOutParam(pfs));         H();
                 PCFGMNODE pPF = NULL;          /* /Devices/Dev/.../Config/PF#0/ */
                 for (unsigned int i = 0; i < pfs.size(); ++i)
@@ -4492 +4492 @@
                                                    tmpMask.asOutParam());
                     if (SUCCEEDED(hrc) && !tmpMask.isEmpty())
-                        hrc = hostInterface->EnableStaticIpConfig(tmpAddr.raw(),
+                        hrc = hostInterface->EnableStaticIPConfig(tmpAddr.raw(),
                                                                   tmpMask.raw());
                     else
-                        hrc = hostInterface->EnableStaticIpConfig(tmpAddr.raw(),
+                        hrc = hostInterface->EnableStaticIPConfig(tmpAddr.raw(),
                                                                   Bstr(VBOXNET_IPV4MASK_DEFAULT).raw());
                 }
@@ -4501 +4501 @@
                 {
                     /* Grab the IP number from the 'vboxnetX' instance number (see netif.h) */
-                    hrc = hostInterface->EnableStaticIpConfig(getDefaultIPv4Address(Bstr(pszHostOnlyName)).raw(),
+                    hrc = hostInterface->EnableStaticIPConfig(getDefaultIPv4Address(Bstr(pszHostOnlyName)).raw(),
                                                               Bstr(VBOXNET_IPV4MASK_DEFAULT).raw());
                 }
@@ -4515 +4515 @@
                 if (SUCCEEDED(hrc) && !tmpAddr.isEmpty() && !tmpMask.isEmpty())
                 {
-                    hrc = hostInterface->EnableStaticIpConfigV6(tmpAddr.raw(),
+                    hrc = hostInterface->EnableStaticIPConfigV6(tmpAddr.raw(),
                                                                 Utf8Str(tmpMask).toUInt32());
                     ComAssertComRC(hrc); /** @todo r=bird: Why this isn't fatal? (H()) */

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

@@ -273 +273 @@
 }
 
-STDMETHODIMP GuestProcess::COMGETTER(Pid)(ULONG *aPID)
+STDMETHODIMP GuestProcess::COMGETTER(PID)(ULONG *aPID)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL

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

@@ -289 +289 @@
     LogFlowFuncLeaveRC(S_OK);
     return S_OK;
+#endif /* VBOX_WITH_GUEST_CONTROL */
+}
+
+STDMETHODIMP GuestSession::COMSETTER(Environment)(ComSafeArrayIn(IN_BSTR, aValues))
+{
+#ifndef VBOX_WITH_GUEST_CONTROL
+    ReturnComNotImplemented();
+#else
+    LogFlowThisFuncEnter();
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    com::SafeArray<IN_BSTR> environment(ComSafeArrayInArg(aValues));
+
+    int rc = VINF_SUCCESS;
+    for (size_t i = 0; i < environment.size() && RT_SUCCESS(rc); i++)
+    {
+        Utf8Str strEnv(environment[i]);
+        if (!strEnv.isEmpty()) /* Silently skip empty entries. */
+            rc = mData.mEnvironment.Set(strEnv);
+    }
+
+    HRESULT hr = RT_SUCCESS(rc) ? S_OK : VBOX_E_IPRT_ERROR;
+    LogFlowFuncLeaveRC(hr);
+    return hr;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -1083 +1111 @@
 }
 
-STDMETHODIMP GuestSession::EnvironmentSetArray(ComSafeArrayIn(IN_BSTR, aValues))
-{
-#ifndef VBOX_WITH_GUEST_CONTROL
-    ReturnComNotImplemented();
-#else
-    LogFlowThisFuncEnter();
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    com::SafeArray<IN_BSTR> environment(ComSafeArrayInArg(aValues));
-
-    int rc = VINF_SUCCESS;
-    for (size_t i = 0; i < environment.size() && RT_SUCCESS(rc); i++)
-    {
-        Utf8Str strEnv(environment[i]);
-        if (!strEnv.isEmpty()) /* Silently skip empty entries. */
-            rc = mData.mEnvironment.Set(strEnv);
-    }
-
-    HRESULT hr = RT_SUCCESS(rc) ? S_OK : VBOX_E_IPRT_ERROR;
-    LogFlowFuncLeaveRC(hr);
-    return hr;
-#endif /* VBOX_WITH_GUEST_CONTROL */
-}
-
 STDMETHODIMP GuestSession::EnvironmentUnset(IN_BSTR aName)
 {

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2010-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16 +16 @@
  */
 #include "Logging.h"
-#include "PciRawDevImpl.h"
-#include "PciDeviceAttachmentImpl.h"
+#include "PCIRawDevImpl.h"
+#include "PCIDeviceAttachmentImpl.h"
 #include "ConsoleImpl.h"
 #include "MachineImpl.h"
@@ -30 +30 @@
 {
     /** Pointer to the real PCI raw object. */
-    PciRawDev                   *pPciRawDev;
+    PCIRawDev                   *pPCIRawDev;
     /** Pointer to the driver instance structure. */
     PPDMDRVINS                  pDrvIns;
@@ -41 +41 @@
 // constructor / destructor
 //
-PciRawDev::PciRawDev(Console *console)
+PCIRawDev::PCIRawDev(Console *console)
   : mpDrv(NULL),
     mParent(console)
@@ -47 +47 @@
 }
 
-PciRawDev::~PciRawDev()
+PCIRawDev::~PCIRawDev()
 {
 }
@@ -54 +54 @@
  * @interface_method_impl{PDMIBASE,pfnQueryInterface}
  */
-DECLCALLBACK(void *) PciRawDev::drvQueryInterface(PPDMIBASE pInterface, const char *pszIID)
+DECLCALLBACK(void *) PCIRawDev::drvQueryInterface(PPDMIBASE pInterface, const char *pszIID)
 {
     PPDMDRVINS         pDrvIns = PDMIBASE_2_PDMDRV(pInterface);
@@ -69 +69 @@
  * @interface_method_impl{PDMIPCIRAWUP,pfnPciDeviceConstructComplete}
  */
-DECLCALLBACK(int) PciRawDev::drvDeviceConstructComplete(PPDMIPCIRAWCONNECTOR pInterface, const char *pcszName,
-                                                        uint32_t uHostPciAddress, uint32_t uGuestPciAddress,
+DECLCALLBACK(int) PCIRawDev::drvDeviceConstructComplete(PPDMIPCIRAWCONNECTOR pInterface, const char *pcszName,
+                                                        uint32_t uHostPCIAddress, uint32_t uGuestPCIAddress,
                                                         int rc)
 {
     PDRVMAINPCIRAWDEV pThis = RT_FROM_CPP_MEMBER(pInterface, DRVMAINPCIRAWDEV, IConnector);
-    Console *pConsole = pThis->pPciRawDev->getParent();
+    Console *pConsole = pThis->pPCIRawDev->getParent();
     const ComPtr<IMachine>& machine = pConsole->machine();
     ComPtr<IVirtualBox> vbox;
@@ -89 +89 @@
     Assert(SUCCEEDED(hrc));
 
-    ComObjPtr<PciDeviceAttachment> pda;
+    ComObjPtr<PCIDeviceAttachment> pda;
     BstrFmt bstrName(pcszName);
     pda.createObject();
-    pda->init(machine, bstrName, uHostPciAddress, uGuestPciAddress, TRUE);
+    pda->init(machine, bstrName, uHostPCIAddress, uGuestPCIAddress, TRUE);
 
     Bstr msg("");
@@ -98 +98 @@
         msg = BstrFmt("runtime error %Rrc", rc);
 
-    fireHostPciDevicePlugEvent(es, bstrId.raw(), true /* plugged */, RT_SUCCESS(rc) /* success */, pda, msg.raw());
+    fireHostPCIDevicePlugEvent(es, bstrId.raw(), true /* plugged */, RT_SUCCESS(rc) /* success */, pda, msg.raw());
 
     return VINF_SUCCESS;
@@ -110 +110 @@
  * @param   pDrvIns     The driver instance data.
  */
-DECLCALLBACK(void) PciRawDev::drvDestruct(PPDMDRVINS pDrvIns)
+DECLCALLBACK(void) PCIRawDev::drvDestruct(PPDMDRVINS pDrvIns)
 {
     PDRVMAINPCIRAWDEV pData = PDMINS_2_DATA(pDrvIns, PDRVMAINPCIRAWDEV);
     PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns);
 
-    if (pData->pPciRawDev)
-        pData->pPciRawDev->mpDrv = NULL;
+    if (pData->pPCIRawDev)
+        pData->pPCIRawDev->mpDrv = NULL;
 }
 
@@ -126 +126 @@
  * @param   pDrvIns     The driver instance data.
  */
-DECLCALLBACK(void) PciRawDev::drvReset(PPDMDRVINS pDrvIns)
+DECLCALLBACK(void) PCIRawDev::drvReset(PPDMDRVINS pDrvIns)
 {
 }
@@ -136 +136 @@
  * @copydoc FNPDMDRVCONSTRUCT
  */
-DECLCALLBACK(int) PciRawDev::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
+DECLCALLBACK(int) PCIRawDev::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle, uint32_t fFlags)
 {
     PDRVMAINPCIRAWDEV pData = PDMINS_2_DATA(pDrvIns, PDRVMAINPCIRAWDEV);
@@ -154 +154 @@
      * IBase.
      */
-    pDrvIns->IBase.pfnQueryInterface = PciRawDev::drvQueryInterface;
+    pDrvIns->IBase.pfnQueryInterface = PCIRawDev::drvQueryInterface;
 
     /*
      * IConnector.
      */
-    pData->IConnector.pfnDeviceConstructComplete = PciRawDev::drvDeviceConstructComplete;
+    pData->IConnector.pfnDeviceConstructComplete = PCIRawDev::drvDeviceConstructComplete;
 
     /*
@@ -172 +172 @@
     }
 
-    pData->pPciRawDev = (PciRawDev*)pv;
-    pData->pPciRawDev->mpDrv = pData;
+    pData->pPCIRawDev = (PCIRawDev *)pv;
+    pData->pPCIRawDev->mpDrv = pData;
 
     return VINF_SUCCESS;
@@ -181 +181 @@
  * Main raw PCI driver registration record.
  */
-const PDMDRVREG PciRawDev::DrvReg =
+const PDMDRVREG PCIRawDev::DrvReg =
 {
     /* u32Version */
@@ -202 +202 @@
     sizeof(DRVMAINPCIRAWDEV),
     /* pfnConstruct */
-    PciRawDev::drvConstruct,
+    PCIRawDev::drvConstruct,
     /* pfnDestruct */
-    PciRawDev::drvDestruct,
+    PCIRawDev::drvDestruct,
     /* pfnRelocate */
     NULL,
@@ -212 +212 @@
     NULL,
     /* pfnReset */
-    PciRawDev::drvReset,
+    PCIRawDev::drvReset,
     /* pfnSuspend */
     NULL,

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -33 +33 @@
 #include "ConsoleImpl.h"
 #ifdef VBOX_WITH_PCI_PASSTHROUGH
-# include "PciRawDevImpl.h"
+# include "PCIRawDevImpl.h"
 #endif
 
@@ -90 +90 @@
 
 #ifdef VBOX_WITH_PCI_PASSTHROUGH
-    rc = pCallbacks->pfnRegister(pCallbacks, &PciRawDev::DrvReg);
+    rc = pCallbacks->pfnRegister(pCallbacks, &PCIRawDev::DrvReg);
     if (RT_FAILURE(rc))
         return rc;