Changeset 56035 in vbox for trunk/src/VBox/Main/include/MachineImpl.h

Timestamp:

May 22, 2015 4:03:35 PM (10 years ago)

Author:

vboxsync

Message:

Main/Machine+USBController+StorageController: Mix of deleting useless functionality, fixing of missing sanity checks and adding some additional functionality. The removed functionality is the possibility to specify patters of guest properties which will trigger notifications, which wasn't useful as it is per VM, sabotaging other API clients (e.g. the VM process assumes it gets the notifications it needs). The storage controller setters were lacking a lot of state and consistency sanity checking, which is now fixed. Both the USB and storage controllers can now be renamed (no API client uses this functionality though), all with very pessimistic assumptions (only when the VM is powered off).

File:

• trunk/src/VBox/Main/include/MachineImpl.h (modified) (7 diffs)

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

@@ -307 +307 @@
         typedef std::map<Utf8Str, GuestProperty> GuestPropertyMap;
         GuestPropertyMap    mGuestProperties;
-        Utf8Str             mGuestPropertyNotificationPatterns;
 
         FirmwareType_T      mFirmwareType;
@@ -591 +590 @@
     void i_releaseStateDependency();
 
+    HRESULT i_getStorageControllerByName(const Utf8Str &aName,
+                                         ComObjPtr<StorageController> &aStorageController,
+                                         bool aSetError = false);
+
+    HRESULT i_getUSBControllerByName(const Utf8Str &aName,
+                                     ComObjPtr<USBController> &aUSBController,
+                                     bool aSetError = false);
+
     HRESULT i_getBandwidthGroup(const Utf8Str &strBandwidthGroup,
                                 ComObjPtr<BandwidthGroup> &pBandwidthGroup,
@@ -643 +650 @@
                                  bool aSetError = false);
 
-    HRESULT i_getStorageControllerByName(const Utf8Str &aName,
-                                         ComObjPtr<StorageController> &aStorageController,
-                                         bool aSetError = false);
-
     HRESULT i_getMediumAttachmentsOfController(const Utf8Str &aName,
                                                MediaData::AttachmentList &aAttachments);
-
-    HRESULT i_getUSBControllerByName(const Utf8Str &aName,
-                                     ComObjPtr<USBController> &aUSBController,
-                                     bool aSetError = false);
 
     ULONG   i_getUSBControllerCountByType(USBControllerType_T enmType);
@@ -943 +942 @@
     HRESULT getDnDMode(DnDMode_T *aDnDMode);
     HRESULT setDnDMode(DnDMode_T aDnDMode);
-    HRESULT getGuestPropertyNotificationPatterns(com::Utf8Str &aGuestPropertyNotificationPatterns);
-    HRESULT setGuestPropertyNotificationPatterns(const com::Utf8Str &aGuestPropertyNotificationPatterns);
     HRESULT getTeleporterEnabled(BOOL *aTeleporterEnabled);
     HRESULT setTeleporterEnabled(BOOL aTeleporterEnabled);
@@ -1069 +1066 @@
     HRESULT getStorageControllerByName(const com::Utf8Str &aName,
                                        ComPtr<IStorageController> &aStorageController);
-    HRESULT getStorageControllerByInstance(ULONG aInstance,
+    HRESULT getStorageControllerByInstance(StorageBus_T aConnectionType,
+                                           ULONG aInstance,
                                            ComPtr<IStorageController> &aStorageController);
     HRESULT removeStorageController(const com::Utf8Str &aName);
@@ -1233 +1231 @@
                               const com::Utf8Str &aValue,
                               LONG64 aTimestamp,
-                              const com::Utf8Str &aFlags,
-                              BOOL *aNotify);
+                              const com::Utf8Str &aFlags);
     HRESULT lockMedia();
     HRESULT unlockMedia();
@@ -1382 +1379 @@
                               const com::Utf8Str &aValue,
                               LONG64 aTimestamp,
-                              const com::Utf8Str &aFlags,
-                              BOOL *aNotify);
+                              const com::Utf8Str &aFlags);
     HRESULT lockMedia();
     HRESULT unlockMedia();