[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 2/4] block/vdi: Don't assume that blocks are larger than VdiH
From: |
David Edmondson |
Subject: |
[RFC PATCH 2/4] block/vdi: Don't assume that blocks are larger than VdiHeader |
Date: |
Tue, 9 Mar 2021 10:21:55 +0000 |
Given that the block size is read from the header of the VDI file, a
wide variety of sizes might be seen. Rather than re-using a block
sized memory region when writing the VDI header, allocate an
appropriately sized buffer.
Signed-off-by: David Edmondson <david.edmondson@oracle.com>
---
block/vdi.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/block/vdi.c b/block/vdi.c
index 2a6dc26124..548f8a057b 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -696,18 +696,20 @@ nonallocating_write:
if (block) {
/* One or more new blocks were allocated. */
- VdiHeader *header = (VdiHeader *) block;
+ VdiHeader *header;
uint8_t *base;
uint64_t offset;
uint32_t n_sectors;
+ g_free(block);
+ header = g_malloc(sizeof(*header));
+
logout("now writing modified header\n");
assert(VDI_IS_ALLOCATED(bmap_first));
*header = s->header;
vdi_header_to_le(header);
- ret = bdrv_pwrite(bs->file, 0, block, sizeof(VdiHeader));
- g_free(block);
- block = NULL;
+ ret = bdrv_pwrite(bs->file, 0, header, sizeof(*header));
+ g_free(header);
if (ret < 0) {
return ret;
--
2.30.1
[RFC PATCH 3/4] coroutine/mutex: Store the coroutine in the CoWaitRecord only once, David Edmondson, 2021/03/09