Changeset 66046 in vbox for trunk/src/VBox/Main/src-all

Timestamp:

Mar 10, 2017 4:58:36 PM (8 years ago)

Author:

vboxsync

Message:

Main/Snapshot: When creating a snapshot it's necessary to copy the medium attachment objects (and not use the same ones) to separate the new snapshot from current state. Otherwise changing a removable medium (DVD/floppy) will show up in 'fresh' snapshots, i.e. the ones taken since VBoxSVC was started. Same issue for PCI device attachments (which isn't used as much). Apart from that a lot of error checking cleanup, for consistency reasons.

File:

• trunk/src/VBox/Main/src-all/PCIDeviceAttachmentImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-all/PCIDeviceAttachmentImpl.cpp

@@ -30 +30 @@
          LONG          aHostAddress,
          LONG          aGuestAddress,
-         BOOL          afPhysical)
-        : HostAddress(aHostAddress), GuestAddress(aGuestAddress),
-          fPhysical(afPhysical)
+         BOOL          afPhysical) :
+        DevName(aDevName),
+        HostAddress(aHostAddress),
+        GuestAddress(aGuestAddress),
+        fPhysical(afPhysical)
     {
-        DevName = aDevName;
     }
 
@@ -80 +81 @@
 
     return S_OK;
+}
+
+HRESULT PCIDeviceAttachment::initCopy(IMachine *aParent, PCIDeviceAttachment *aThat)
+{
+    LogFlowThisFunc(("aParent=%p, aThat=%p\n", aParent, aThat));
+
+    ComAssertRet(aParent && aThat, E_INVALIDARG);
+
+    return init(aParent, aThat->m->DevName, aThat->m->HostAddress, aThat->m->GuestAddress, aThat->m->fPhysical);
 }