Fix getSizePhys and size in calcOverheadEmpty

getSizePhys now uses os.stat instead of du, it would not have worked on a block device instead of a file calcOverheadEmpty used hardcoded value for cluster size Signed-off-by: Damien Thenot <[email protected]>
xcp-ng · Jan 23, 2025 · c39ba90 · c39ba90
1 parent 5e4f9e9
commit c39ba90
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/drivers/qcow2util.py b/drivers/qcow2util.py
@@ -5,6 +5,7 @@
 import struct
 from pathlib import Path
 import zlib
+import os
 
 import util
 from cowutil import CowUtil, CowImageInfo
@@ -424,8 +425,8 @@ def getMaxChainLength(self) -> int:
 
     @override
     def calcOverheadEmpty(self, virtual_size: int) -> int:
-        size_l1 = 64 * 1024
-        size_header = 64 * 1024
+        size_l1 = QCOW_CLUSTER_SIZE
+        size_header = QCOW_CLUSTER_SIZE
         size_l2 = (virtual_size * 8) / QCOW_CLUSTER_SIZE #It is only an estimation
 
         size = size_l1 + size_l2 + size_header
@@ -588,9 +589,7 @@ def getMaxResizeSize(self, path: str) -> int:
 
     @override
     def getSizePhys(self, path: str) -> int:
-        cmd = ["du", "-b", path] #TODO: use os.stat instead since it won't work with a block device
-        ret = cast(str, self._ioretry(cmd))
-        return int(ret.split()[0])
+        return os.stat(path).st_size
 
     @override
     def setSizePhys(self, path: str, size: int, debug: bool = True) -> None: