Changeset 26264 in vbox

Timestamp:

Feb 5, 2010 2:51:28 AM (15 years ago)

Author:

vboxsync

Message:

VMM: More warnings.

Location:

trunk/src/VBox/VMM

Files:

• PDMDriver.cpp (modified) (1 diff)
• VMMAll/TRPMAll.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PDMDriver.cpp

@@ -488 +488 @@
                                  pLun->iLun,
                                  pLun->pDevIns ? pLun->pDevIns->pReg->szName : pLun->pUsbIns->pReg->szName,
-                                 pLun->pDevIns ? pLun->pDevIns->iInstance             : pLun->pUsbIns->iInstance,
-                                 pDrvAbove, pDrvAbove ? pDrvAbove->pReg->szName : "", pDrvAbove ? pDrvAbove->iInstance : -1));
+                                 pLun->pDevIns ? pLun->pDevIns->iInstance    : pLun->pUsbIns->iInstance,
+                                 pDrvAbove, pDrvAbove ? pDrvAbove->pReg->szName : "", pDrvAbove ? pDrvAbove->iInstance : UINT32_MAX));
                         else
                             Log(("PDM: Attached driver %p:'%s'/%d, pDrvAbove=%p:'%s'/%d\n",
                                  pNew, pDrv->pReg->szName, pNew->iInstance,
-                                 pDrvAbove, pDrvAbove ? pDrvAbove->pReg->szName : "", pDrvAbove ? pDrvAbove->iInstance : -1));
+                                 pDrvAbove, pDrvAbove ? pDrvAbove->pReg->szName : "", pDrvAbove ? pDrvAbove->iInstance : UINT32_MAX));
                     }
                     else

trunk/src/VBox/VMM/VMMAll/TRPMAll.cpp

@@ -508 +508 @@
                     goto failure;
 
-                pGdtEntry = (RTGCPTR)(uintptr_t)&((X86DESC *)gdtr.pGdt)[GuestIdte.Gen.u16SegSel >> X86_SEL_SHIFT]; /// @todo fix this
+                pGdtEntry = gdtr.pGdt + (GuestIdte.Gen.u16SegSel >> X86_SEL_SHIFT) * sizeof(X86DESC);
 #ifdef IN_RC
                 rc = MMGCRamRead(pVM, &Desc, (void *)pGdtEntry, sizeof(Desc));