Changeset 22324 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Aug 18, 2009 1:57:58 PM (15 years ago)

Author:

vboxsync

Message:

AHCI: Windows 7 doesn't detect additional hard disks. The command address calculation was wrong and could lead to incorrect guest addresses if set more than one time by the guest

File:

• trunk/src/VBox/Devices/Storage/DevAHCI.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Storage/DevAHCI.cpp

@@ -1392 +1392 @@
 
     pAhciPort->regFBU = u32Value;
-    pAhciPort->GCPhysAddrFb |= ((RTGCPHYS)pAhciPort->regFBU) << 32;
+    pAhciPort->GCPhysAddrFb = AHCI_RTGCPHYS_FROM_U32(pAhciPort->regFBU, pAhciPort->regFB);
 
     return VINF_SUCCESS;
@@ -1415 +1415 @@
 
     pAhciPort->regFB = (u32Value & AHCI_PORT_FB_RESERVED);
-    pAhciPort->GCPhysAddrFb |= pAhciPort->regFB;
+    pAhciPort->GCPhysAddrFb = AHCI_RTGCPHYS_FROM_U32(pAhciPort->regFBU, pAhciPort->regFB);
 
     return VINF_SUCCESS;
@@ -1428 +1428 @@
 
     pAhciPort->regCLBU = u32Value;
-    pAhciPort->GCPhysAddrClb |= ((RTGCPHYS)pAhciPort->regCLBU) << 32;
+    pAhciPort->GCPhysAddrClb = AHCI_RTGCPHYS_FROM_U32(pAhciPort->regCLBU, pAhciPort->regCLB);
 
     return VINF_SUCCESS;
@@ -1461 +1461 @@
 
     pAhciPort->regCLB = (u32Value & AHCI_PORT_CLB_RESERVED);
-    pAhciPort->GCPhysAddrClb |= pAhciPort->regCLB;
+    pAhciPort->GCPhysAddrClb = AHCI_RTGCPHYS_FROM_U32(pAhciPort->regCLBU, pAhciPort->regCLB);
 
     return VINF_SUCCESS;