diff options
| author | Felix Geyer <debfx-pkg@fobos.de> | 2011-07-29 17:55:18 +0200 |
|---|---|---|
| committer | Felix Geyer <debfx-pkg@fobos.de> | 2011-07-29 17:55:18 +0200 |
| commit | cba113ca2826bc4814be2f69a7704c865a37d4ea (patch) | |
| tree | 511123b10dd1e58e56958520534f5c50e6f570fc /src/VBox/Main/src-server/StorageControllerImpl.cpp | |
| parent | 6a16f6900dd884e07125b51c9625f6be0a1f9b70 (diff) | |
| download | virtualbox-cba113ca2826bc4814be2f69a7704c865a37d4ea.tar.gz | |
Imported Upstream version 4.1.0-dfsgupstream/4.1.0-dfsg
Diffstat (limited to 'src/VBox/Main/src-server/StorageControllerImpl.cpp')
| -rw-r--r-- | src/VBox/Main/src-server/StorageControllerImpl.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/VBox/Main/src-server/StorageControllerImpl.cpp b/src/VBox/Main/src-server/StorageControllerImpl.cpp index 81387fc44..b51387fca 100644 --- a/src/VBox/Main/src-server/StorageControllerImpl.cpp +++ b/src/VBox/Main/src-server/StorageControllerImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: StorageControllerImpl.cpp $ */ +/* $Id: StorageControllerImpl.cpp 37926 2011-07-13 15:36:59Z vboxsync $ */ /** @file * @@ -104,12 +104,13 @@ struct StorageController::Data HRESULT StorageController::FinalConstruct() { - return S_OK; + return BaseFinalConstruct(); } void StorageController::FinalRelease() { uninit(); + BaseFinalRelease(); } // public initializer/uninitializer for internal purposes only @@ -474,7 +475,7 @@ STDMETHODIMP StorageController::COMSETTER(PortCount) (ULONG aPortCount) case StorageBus_SATA: { /* AHCI SATA supports a maximum of 30 ports. */ - if ((aPortCount < 1) || (aPortCount > 30)) + if (aPortCount < 1 || aPortCount > 30) return setError(E_INVALIDARG, tr("Invalid port count: %lu (must be in range [%lu, %lu])"), aPortCount, 1, 30); @@ -690,9 +691,9 @@ STDMETHODIMP StorageController::SetIDEEmulationPort(LONG DevicePosition, LONG aP return setError(E_NOTIMPL, tr("Invalid controller type")); - if ((aPortNumber < 0) || (aPortNumber >= 30)) + if (aPortNumber < 0 || aPortNumber >= 30) return setError(E_INVALIDARG, - tr("Invalid port number: %l (must be in range [%lu, %lu])"), + tr("Invalid port number: %ld (must be in range [%lu, %lu])"), aPortNumber, 0, 29); switch (DevicePosition) @@ -762,15 +763,14 @@ HRESULT StorageController::checkPortAndDeviceValid(LONG aControllerPort, HRESULT rc = m->pSystemProperties->GetMaxDevicesPerPortForStorageBus(m->bd->mStorageBus, &devicesPerPort); if (FAILED(rc)) return rc; - if ( (aControllerPort < 0) - || (aControllerPort >= (LONG)portCount) - || (aDevice < 0) - || (aDevice >= (LONG)devicesPerPort) + if ( aControllerPort < 0 + || aControllerPort >= (LONG)portCount + || aDevice < 0 + || aDevice >= (LONG)devicesPerPort ) return setError(E_INVALIDARG, - tr("The port and/or count parameter are out of range [%lu:%lu]"), - portCount, - devicesPerPort); + tr("The port and/or device parameter are out of range: port=%d (must be in range [0, %d]), device=%d (must be in range [0, %d])"), + (int)aControllerPort, (int)portCount-1, (int)aDevice, (int)devicesPerPort-1); return S_OK; } |