Changeset 61009 in vbox for trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

Timestamp:

May 17, 2016 5:18:29 PM (9 years ago)

Author:

vboxsync

Message:

Main: big settings cleanup and writing optimization. Moved constructors/equality/default checks into the .cpp file, and write only settings which aren't at the default value. Greatly reduces the effort needed to write everything out, especially when a lot of snapshots have to be dealt with. Move the storage controllers to the hardware settings, where they always belonged. No change to the XML file (yet). Lots of settings related cleanups in the API code.

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (3 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2005-2015 Oracle Corporation
+ * Copyright (C) 2005-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -68 +68 @@
 #endif
 #include "BusAssignmentManager.h"
+#include "PCIDeviceAttachmentImpl.h"
 #include "EmulatedUSBImpl.h"
 
@@ -2000 +2001 @@
 
     if (mBusMgr)
-        mBusMgr->listAttachedPCIDevices(aAttachedPCIDevices);
+    {
+        std::vector<BusAssignmentManager::PCIDeviceInfo> devInfos;
+        mBusMgr->listAttachedPCIDevices(devInfos);
+        ComObjPtr<PCIDeviceAttachment> dev;
+        aAttachedPCIDevices.resize(devInfos.size());
+        for (size_t i = 0; i < devInfos.size(); i++)
+        {
+            const BusAssignmentManager::PCIDeviceInfo &devInfo = devInfos[i];
+            dev.createObject();
+            dev->init(NULL, devInfo.strDeviceName,
+                      devInfo.hostAddress.valid() ? devInfo.hostAddress.asLong() : -1,
+                      devInfo.guestAddress.asLong(),
+                      devInfo.hostAddress.valid());
+            dev.queryInterfaceTo(aAttachedPCIDevices[i].asOutParam());
+        }
+    }
     else
         aAttachedPCIDevices.resize(0);