[libvirt PATCH] storage_file: Compute QCOW2 cluster size as ULL

Jiri Denemark jdenemar at redhat.com
Mon Oct 25 15:32:43 UTC 2021


While the QCOW2 cluster size is represented in only 4 bits in the QCOW2
header and thus 1 << cluster_size cannot overflow int,
qcow2GetClusterSize is supposed to return unsigned long long so we can
just compute the result as ULL rather than computing it as int and
promoting to unsigned long long.

Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
---
 src/storage_file/storage_file_probe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/storage_file/storage_file_probe.c b/src/storage_file/storage_file_probe.c
index f5bb8b7dbb..dc438a5e5d 100644
--- a/src/storage_file/storage_file_probe.c
+++ b/src/storage_file/storage_file_probe.c
@@ -487,7 +487,7 @@ qcow2GetClusterSize(const char *buf,
     clusterBits = virReadBufInt32BE(buf + QCOWX_HDR_CLUSTER_BITS_OFFSET);
 
     if (clusterBits > 0)
-        return 1 << clusterBits;
+        return 1ULL << clusterBits;
 
     return 0;
 }
-- 
2.33.1




More information about the libvir-list mailing list