[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/17] block/vpc: Use sizeof() instead of 1024 for dynamic header
From: |
Kevin Wolf |
Subject: |
[PULL 14/17] block/vpc: Use sizeof() instead of 1024 for dynamic header size |
Date: |
Fri, 18 Dec 2020 13:10:38 +0100 |
From: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201217162003.1102738-7-armbru@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/vpc.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/block/vpc.c b/block/vpc.c
index 08a0f710ad..6cb656ac82 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -344,7 +344,7 @@ static int vpc_open(BlockDriverState *bs, QDict *options,
int flags,
if (disk_type == VHD_DYNAMIC) {
ret = bdrv_pread(bs->file, be64_to_cpu(footer->data_offset),
- &dyndisk_header, 1024);
+ &dyndisk_header, sizeof(dyndisk_header));
if (ret < 0) {
error_setg(errp, "Error reading dynamic VHD header");
goto fail;
@@ -858,7 +858,7 @@ static int create_dynamic_disk(BlockBackend *blk, uint8_t
*buf,
}
/* Prepare the Dynamic Disk Header */
- memset(&dyndisk_header, 0, 1024);
+ memset(&dyndisk_header, 0, sizeof(dyndisk_header));
memcpy(dyndisk_header.magic, "cxsparse", 8);
@@ -872,12 +872,13 @@ static int create_dynamic_disk(BlockBackend *blk, uint8_t
*buf,
dyndisk_header.block_size = cpu_to_be32(block_size);
dyndisk_header.max_table_entries = cpu_to_be32(num_bat_entries);
- dyndisk_header.checksum = cpu_to_be32(vpc_checksum(&dyndisk_header, 1024));
+ dyndisk_header.checksum = cpu_to_be32(
+ vpc_checksum(&dyndisk_header, sizeof(dyndisk_header)));
/* Write the header */
offset = 512;
- ret = blk_pwrite(blk, offset, &dyndisk_header, 1024, 0);
+ ret = blk_pwrite(blk, offset, &dyndisk_header, sizeof(dyndisk_header), 0);
if (ret < 0) {
goto fail;
}
--
2.29.2
- [PULL 02/17] hw/block/nand: Decommission the NAND museum, (continued)
- [PULL 02/17] hw/block/nand: Decommission the NAND museum, Kevin Wolf, 2020/12/18
- [PULL 05/17] docs: add qemu-storage-daemon(1) man page, Kevin Wolf, 2020/12/18
- [PULL 07/17] iotests: make _filter_qom_path more strict, Kevin Wolf, 2020/12/18
- [PULL 04/17] docs: generate qemu-storage-daemon-qmp-ref(7) man page, Kevin Wolf, 2020/12/18
- [PULL 06/17] MAINTAINERS: add Kevin Wolf as storage daemon maintainer, Kevin Wolf, 2020/12/18
- [PULL 08/17] iotests:172: use _filter_qom_path, Kevin Wolf, 2020/12/18
- [PULL 09/17] block/vpc: Make vpc_open() read the full dynamic header, Kevin Wolf, 2020/12/18
- [PULL 10/17] block/vpc: Don't abuse the footer buffer as BAT sector buffer, Kevin Wolf, 2020/12/18
- [PULL 12/17] block/vpc: Make vpc_checksum() take void *, Kevin Wolf, 2020/12/18
- [PULL 13/17] block/vpc: Pad VHDDynDiskHeader, replace uint8_t[] buffers, Kevin Wolf, 2020/12/18
- [PULL 14/17] block/vpc: Use sizeof() instead of 1024 for dynamic header size,
Kevin Wolf <=
- [PULL 11/17] block/vpc: Don't abuse the footer buffer for dynamic header, Kevin Wolf, 2020/12/18
- [PULL 16/17] block/vpc: Pass footer buffers as VHDFooter * instead of uint8_t *, Kevin Wolf, 2020/12/18
- [PULL 17/17] block/vpc: Use sizeof() instead of HEADER_SIZE for footer size, Kevin Wolf, 2020/12/18
- [PULL 15/17] block/vpc: Pad VHDFooter, replace uint8_t[] buffers, Kevin Wolf, 2020/12/18
- Re: [PULL 00/17] Block layer patches, Peter Maydell, 2020/12/31