Changeset 64733 in vbox for trunk/src/VBox/Devices/Bus/DevPciMerge1.cpp.h

Timestamp:

Nov 22, 2016 9:10:19 AM (8 years ago)

Author:

vboxsync

Message:

pciR3MergedRegisterDeviceOnBus: Incorrect logrel-assertion condition in move path.

File:

• trunk/src/VBox/Devices/Bus/DevPciMerge1.cpp.h (modified) (1 diff)

trunk/src/VBox/Devices/Bus/DevPciMerge1.cpp.h

@@ -157 +157 @@
             {
                 PPDMPCIDEV pMovePciDev = pBus->apDevices[VBOX_PCI_DEVFN_MAKE(uPciDevNo, uMoveFun)];
-                AssertLogRelMsgReturn(!pMovePciDev && pMovePciDev->Int.s.fReassignableDevNo,
+                AssertLogRelMsgReturn(!pMovePciDev || pMovePciDev->Int.s.fReassignableDevNo,
                                       ("PCI Configuration conflict at %u.%u: %s vs %s\n",
                                        uPciDevNo, uMoveFun, pMovePciDev->pszNameR3, pszName),