diff options
| author | Anthony PERARD <anthony.perard@vates.tech> | 2024-09-23 15:59:24 +0200 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2025-01-27 14:37:53 +0000 |
| commit | 8c1e786e506474bae02f81b48a5644afb324d1bb (patch) | |
| tree | 1ae8db8a96c1e6b8aff9dc0573c1ff08cc7d9033 /OvmfPkg | |
| parent | 3cf7a644ebd69ac4bfc92f1be27cb9dd7b871b02 (diff) | |
| download | edk2-8c1e786e506474bae02f81b48a5644afb324d1bb.tar.gz | |
OvmfPkg/XenPvBlkDxe: Update disk size calculation
The specification wasn't clear and even contradict itself regarding
the calculation of the disk size. This have been clarified by Xen
commit 221f2748e8da ("blkif: reconcile protocol specification with
in-use implementations").
https://xenbits.xenproject.org/gitweb/?p=xen.git;a=commit;h=221f2748e8dabe8361b8cdfcffbeab9102c4c899
The value from the xenstore node "sectors" must be multiplied by 512
to have the size of the disk.
Calculation of LastBlock is now the same for both CD-ROM case and
generic case.
Signed-off-by: Anthony PERARD <anthony.perard@vates.tech>
Diffstat (limited to 'OvmfPkg')
| -rw-r--r-- | OvmfPkg/XenPvBlkDxe/BlockFront.c | 2 | ||||
| -rw-r--r-- | OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.c | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/OvmfPkg/XenPvBlkDxe/BlockFront.c b/OvmfPkg/XenPvBlkDxe/BlockFront.c index 5a3ad5e4e5..eb503eb7c1 100644 --- a/OvmfPkg/XenPvBlkDxe/BlockFront.c +++ b/OvmfPkg/XenPvBlkDxe/BlockFront.c @@ -356,7 +356,7 @@ Again: DEBUG ((
DEBUG_INFO,
- "XenPvBlk: New disk with %ld sectors of %d bytes\n",
+ "XenPvBlk: New disk with %ld 512B-sectors and logical sector size of %d bytes\n",
Dev->MediaInfo.Sectors,
Dev->MediaInfo.SectorSize
));
diff --git a/OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.c b/OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.c index dfc40bffaa..218ada89c6 100644 --- a/OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.c +++ b/OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.c @@ -295,15 +295,19 @@ XenPvBlkDxeDriverBindingStart ( // MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
//
Media->BlockSize = 2048;
- Media->LastBlock = DivU64x32 (
- Dev->MediaInfo.Sectors,
- Media->BlockSize / Dev->MediaInfo.SectorSize
- ) - 1;
} else {
Media->BlockSize = Dev->MediaInfo.SectorSize;
- Media->LastBlock = Dev->MediaInfo.Sectors - 1;
}
+ //
+ // Sectors is express as 512B unit, size of disk is "Sectors * 512",
+ // independently from SectorSize.
+ //
+ Media->LastBlock = DivU64x32 (
+ Dev->MediaInfo.Sectors,
+ Media->BlockSize / 512
+ ) - 1;
+
ASSERT (Media->BlockSize % 512 == 0);
Dev->BlockIo.Media = Media;
|