Changeset 24250 in vbox for trunk/src/VBox/Main/include

Timestamp:

Nov 2, 2009 1:00:58 PM (15 years ago)

Author:

vboxsync

Message:

StorageController: added support for Instance number

Location:

trunk/src/VBox/Main/include

Files:

• ConsoleImpl.h (modified) (1 diff)
• MachineImpl.h (modified) (1 diff)
• StorageControllerImpl.h (modified) (5 diffs)

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

@@ -443 +443 @@
                                           const char *pszFormat, bool fPassthrough);
     const char *controllerTypeToDev(StorageControllerType_T enmCtrlType);
+    void controllerDevToBool(const char *pszCtrlDev, bool *afBool);
     HRESULT convertBusPortDeviceToLun(StorageBus_T enmBus, LONG port, LONG device, unsigned &uLun);
     HRESULT doMediumChange(IMediumAttachment *aMediumAttachment);

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

@@ -617 +617 @@
     STDMETHOD(RemoveStorageController(IN_BSTR aName));
     STDMETHOD(GetStorageControllerByName(IN_BSTR aName, IStorageController **storageController));
+    STDMETHOD(GetStorageControllerByInstance(ULONG aInstance, IStorageController **storageController));
     STDMETHOD(COMGETTER(FirmwareType)) (FirmwareType_T *aFirmware);
     STDMETHOD(COMSETTER(FirmwareType)) (FirmwareType_T  aFirmware);

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

@@ -44 +44 @@
         Data() : mStorageBus (StorageBus_IDE),
                  mStorageControllerType (StorageControllerType_PIIX4),
+                 mInstance (0),
                  mPortCount (2),
                  mPortIde0Master (0),
@@ -68 +69 @@
         /** Type of the Storage controller. */
         StorageControllerType_T mStorageControllerType;
+        /** Instance number of the storage controller. */
+        ULONG mInstance;
         /** Number of usable ports. */
         ULONG mPortCount;
@@ -104 +107 @@
     HRESULT init(Machine *aParent,
                  const Utf8Str &aName,
-                 StorageBus_T aBus);
+                 StorageBus_T aBus,
+                 ULONG aInstance);
     HRESULT init(Machine *aParent,
                  StorageController *aThat,
@@ -134 +138 @@
     StorageControllerType_T controllerType() const { return mData->mStorageControllerType; }
     StorageBus_T storageBus() const { return mData->mStorageBus; }
+    ULONG instance() const { return mData->mInstance; }
 
     bool isModified() { AutoWriteLock alock (this); return mData.isBackedUp(); }
@@ -164 +169 @@
     /** Data. */
     Backupable<Data> mData;
-
-    /* Instance number of the device in the running VM. */
-    ULONG mInstance;
 };