[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/17] block/vpc: Pass footer buffers as VHDFooter * instead of ui
From: |
Kevin Wolf |
Subject: |
[PULL 16/17] block/vpc: Pass footer buffers as VHDFooter * instead of uint8_t * |
Date: |
Fri, 18 Dec 2020 13:10:40 +0100 |
From: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201217162003.1102738-9-armbru@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/vpc.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/block/vpc.c b/block/vpc.c
index f3ea92dcb0..aac13788df 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -819,7 +819,7 @@ static int calculate_geometry(int64_t total_sectors,
uint16_t *cyls,
return 0;
}
-static int create_dynamic_disk(BlockBackend *blk, uint8_t *buf,
+static int create_dynamic_disk(BlockBackend *blk, VHDFooter *footer,
int64_t total_sectors)
{
VHDDynDiskHeader dyndisk_header;
@@ -833,13 +833,13 @@ static int create_dynamic_disk(BlockBackend *blk, uint8_t
*buf,
block_size = 0x200000;
num_bat_entries = DIV_ROUND_UP(total_sectors, block_size / 512);
- ret = blk_pwrite(blk, offset, buf, HEADER_SIZE, 0);
+ ret = blk_pwrite(blk, offset, footer, HEADER_SIZE, 0);
if (ret < 0) {
goto fail;
}
offset = 1536 + ((num_bat_entries * 4 + 511) & ~511);
- ret = blk_pwrite(blk, offset, buf, HEADER_SIZE, 0);
+ ret = blk_pwrite(blk, offset, footer, HEADER_SIZE, 0);
if (ret < 0) {
goto fail;
}
@@ -887,7 +887,7 @@ static int create_dynamic_disk(BlockBackend *blk, uint8_t
*buf,
return ret;
}
-static int create_fixed_disk(BlockBackend *blk, uint8_t *buf,
+static int create_fixed_disk(BlockBackend *blk, VHDFooter *footer,
int64_t total_size, Error **errp)
{
int ret;
@@ -900,7 +900,7 @@ static int create_fixed_disk(BlockBackend *blk, uint8_t
*buf,
return ret;
}
- ret = blk_pwrite(blk, total_size - HEADER_SIZE, buf, HEADER_SIZE, 0);
+ ret = blk_pwrite(blk, total_size - HEADER_SIZE, footer, HEADER_SIZE, 0);
if (ret < 0) {
error_setg_errno(errp, -ret, "Unable to write VHD header");
return ret;
@@ -1071,12 +1071,12 @@ static int coroutine_fn
vpc_co_create(BlockdevCreateOptions *opts,
footer.checksum = cpu_to_be32(vpc_checksum(&footer, HEADER_SIZE));
if (disk_type == VHD_DYNAMIC) {
- ret = create_dynamic_disk(blk, (uint8_t *)&footer, total_sectors);
+ ret = create_dynamic_disk(blk, &footer, total_sectors);
if (ret < 0) {
error_setg(errp, "Unable to create or write VHD header");
}
} else {
- ret = create_fixed_disk(blk, (uint8_t *)&footer, total_size, errp);
+ ret = create_fixed_disk(blk, &footer, total_size, errp);
}
out:
--
2.29.2
- [PULL 07/17] iotests: make _filter_qom_path more strict, (continued)
- [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, 2020/12/18
- [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 <=
- [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