Index: /trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp	(revision 54759)
+++ /trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp	(revision 54760)
@@ -1270,9 +1270,10 @@
                                 uint32_t *pEax, uint32_t *pEbx, uint32_t *pEcx, uint32_t *pEdx)
 {
-    bool           fExactSubLeafHit;
-    PVM            pVM   = pVCpu->CTX_SUFF(pVM);
-    PCPUMCPUIDLEAF pLeaf = cpumCpuIdGetLeafEx(pVM, uLeaf, uSubLeaf, &fExactSubLeafHit);
+    bool            fExactSubLeafHit;
+    PVM             pVM   = pVCpu->CTX_SUFF(pVM);
+    PCCPUMCPUIDLEAF pLeaf = cpumCpuIdGetLeafEx(pVM, uLeaf, uSubLeaf, &fExactSubLeafHit);
     if (pLeaf)
     {
+        AssertMsg(pLeaf->uLeaf == uLeaf, ("%#x\n", pLeaf->uLeaf, uLeaf));
         if (fExactSubLeafHit)
         {
@@ -1291,11 +1292,11 @@
                     /* Bits 31-24: Initial APIC ID */
                     Assert(pVCpu->idCpu <= 255);
-                    Assert((*pEbx >> 24) == 0); /* raw-mode assumption */
-                    *pEbx = (*pEbx & UINT32_C(0x00ffffff)) | (pVCpu->idCpu << 24);
+                    AssertMsg((pLeaf->uEbx >> 24) == 0, ("%#x\n", pLeaf->uEbx)); /* raw-mode assumption */
+                    *pEbx = (pLeaf->uEbx & UINT32_C(0x00ffffff)) | (pVCpu->idCpu << 24);
                 }
                 else if (uLeaf == 0xb)
                 {
                     /* EDX: Initial extended APIC ID. */
-                    Assert(*pEdx == 0); /* raw-mode assumption */
+                    AssertMsg(pLeaf->uEdx == 0, ("%#x\n", pLeaf->uEdx)); /* raw-mode assumption */
                     *pEdx = pVCpu->idCpu;
                 }
@@ -1303,5 +1304,5 @@
                 {
                     /* EAX: Initial extended APIC ID. */
-                    Assert(*pEax == 0); /* raw-mode assumption */
+                    AssertMsg(pLeaf->uEax == 0, ("%#x\n", pLeaf->uEax)); /* raw-mode assumption */
                     *pEax = pVCpu->idCpu;
                 }