Changeset 58959 in vbox

Timestamp:

Dec 2, 2015 9:10:52 PM (9 years ago)

Author:

vboxsync

Message:

Main: Fix starting a VM with a physical PCI device attached. The assignment->COMGETTER(...) calls failed unnoticed with E_ACCESSDENIED producing bogues PCI addresses

Location:

trunk/src/VBox/Main

Files:

• src-all/PCIDeviceAttachmentImpl.cpp (modified) (2 diffs)
• src-client/ConsoleImpl2.cpp (modified) (2 diffs)

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

@@ -66 +66 @@
                                   BOOL          fPhysical)
 {
-    (void)aParent;
+    NOREF(aParent);
+
+    /* Enclose the state transition NotReady->InInit->Ready */
+    AutoInitSpan autoInitSpan(this);
+    AssertReturn(autoInitSpan.isOk(), E_FAIL);
+
     m = new Data(aDevName, aHostAddress, aGuestAddress, fPhysical);
 
-    return m != NULL ? S_OK : E_FAIL;
+    /* Confirm a successful initialization */
+    autoInitSpan.setSucceeded();
+
+    return S_OK;
 }
 
@@ -96 +104 @@
 void PCIDeviceAttachment::uninit()
 {
-    if (m)
-    {
-        delete m;
-        m = NULL;
-    }
+    /* Enclose the state transition Ready->InUninit->NotReady */
+    AutoUninitSpan autoUninitSpan(this);
+    if (autoUninitSpan.uninitDone())
+        return;
+
+    delete m;
+    m = NULL;
 }
 

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

@@ -573 +573 @@
         PCIBusAddress GuestPCIAddress;
 
-        assignment->COMGETTER(GuestAddress)(&guest);
+        hrc = assignment->COMGETTER(GuestAddress)(&guest);   H();
         GuestPCIAddress.fromLong(guest);
         Assert(GuestPCIAddress.valid());
@@ -626 +626 @@
         Bstr aDevName;
 
-        assignment->COMGETTER(HostAddress)(&host);
-        assignment->COMGETTER(GuestAddress)(&guest);
-        assignment->COMGETTER(Name)(aDevName.asOutParam());
+        hrc = assignment->COMGETTER(HostAddress)(&host);            H();
+        hrc = assignment->COMGETTER(GuestAddress)(&guest);          H();
+        hrc = assignment->COMGETTER(Name)(aDevName.asOutParam());   H();
 
         InsertConfigNode(pPCIDevs, Utf8StrFmt("%d", iDev).c_str(), &pInst);