ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vmdk: Rename VmdkMetaData.valid to new_allocation 

m_data is used for zero clusters even though valid == 0. It really only
means that a new cluster was allocated in the image file. Rename it to
reflect this.

While at it, change it from int to bool, too.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20200430133007.170335-2-kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2020-04-30 15:30:02 +02:00
parent e4d7019e1a
commit 4dc20e6465
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
block/vmdk.c
View File

@ -180,7 +180,7 @@ typedef struct VmdkMetaData {
unsigned int l1_index; unsigned int l1_index;
unsigned int l2_index; unsigned int l2_index;
unsigned int l2_offset; unsigned int l2_offset;
int valid; bool new_allocation;
uint32_t *l2_cache_entry; uint32_t *l2_cache_entry;
} VmdkMetaData; } VmdkMetaData;
@ -1492,7 +1492,7 @@ static int get_cluster_offset(BlockDriverState *bs,
unsigned int l2_size_bytes = extent->l2_size * extent->entry_size; unsigned int l2_size_bytes = extent->l2_size * extent->entry_size;
if (m_data) { if (m_data) {
m_data->valid = 0; m_data->new_allocation = false;
} }
if (extent->flat) { if (extent->flat) {
*cluster_offset = extent->flat_start_offset; *cluster_offset = extent->flat_start_offset;
@ -1630,7 +1630,7 @@ static int get_cluster_offset(BlockDriverState *bs,
return ret; return ret;
} }
if (m_data) { if (m_data) {
m_data->valid = 1; m_data->new_allocation = true;
m_data->l1_index = l1_index; m_data->l1_index = l1_index;
m_data->l2_index = l2_index; m_data->l2_index = l2_index;
m_data->l2_offset = l2_offset; m_data->l2_offset = l2_offset;
@ -2021,7 +2021,7 @@ static int vmdk_pwritev(BlockDriverState *bs, uint64_t offset,
if (ret) { if (ret) {
return ret; return ret;
} }
if (m_data.valid) { if (m_data.new_allocation) {
/* update L2 tables */ /* update L2 tables */
if (vmdk_L2update(extent, &m_data, if (vmdk_L2update(extent, &m_data,
cluster_offset >> BDRV_SECTOR_BITS) cluster_offset >> BDRV_SECTOR_BITS)