haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

VMDK: add field BDRVVmdkState.desc_offset

Browse source 
There are several occurrence of magic number 0x200 as the descriptor
offset within mono sparse image file. This is not the case for images
with separate descriptor file. So a field is added to BDRVVmdkState to
hold the correct value.

Signed-off-by: Fam Zheng <famcool@gmail.com>
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Fam Zheng 2011-07-12 19:56:32 +08:00 committed by Kevin Wolf
parent b4b3ab146c
commit e1da9b2433
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
block/vmdk.c
View file

@ -81,6 +81,7 @@ typedef struct VmdkExtent {
} VmdkExtent; } VmdkExtent;
typedef struct BDRVVmdkState { typedef struct BDRVVmdkState {
int desc_offset;
uint32_t parent_cid; uint32_t parent_cid;
int num_extents; int num_extents;
/* Extent array with num_extents entries, ascend ordered by address */ /* Extent array with num_extents entries, ascend ordered by address */
@ -175,10 +176,11 @@ static uint32_t vmdk_read_cid(BlockDriverState *bs, int parent)
uint32_t cid; uint32_t cid;
const char *p_name, *cid_str; const char *p_name, *cid_str;
size_t cid_str_size; size_t cid_str_size;
BDRVVmdkState *s = bs->opaque;
/* the descriptor offset = 0x200 */ if (bdrv_pread(bs->file, s->desc_offset, desc, DESC_SIZE) != DESC_SIZE) {
if (bdrv_pread(bs->file, 0x200, desc, DESC_SIZE) != DESC_SIZE)
return 0; return 0;
}
if (parent) { if (parent) {
cid_str = "parentCID"; cid_str = "parentCID";
@ -200,10 +202,12 @@ static int vmdk_write_cid(BlockDriverState *bs, uint32_t cid)
{ {
char desc[DESC_SIZE], tmp_desc[DESC_SIZE]; char desc[DESC_SIZE], tmp_desc[DESC_SIZE];
char *p_name, *tmp_str; char *p_name, *tmp_str;
BDRVVmdkState *s = bs->opaque;
/* the descriptor offset = 0x200 */ memset(desc, 0, sizeof(desc));
if (bdrv_pread(bs->file, 0x200, desc, DESC_SIZE) != DESC_SIZE) if (bdrv_pread(bs->file, s->desc_offset, desc, DESC_SIZE) != DESC_SIZE) {
return -1; return -EIO;
}
tmp_str = strstr(desc,"parentCID"); tmp_str = strstr(desc,"parentCID");
pstrcpy(tmp_desc, sizeof(tmp_desc), tmp_str); pstrcpy(tmp_desc, sizeof(tmp_desc), tmp_str);
@ -213,8 +217,9 @@ static int vmdk_write_cid(BlockDriverState *bs, uint32_t cid)
pstrcat(desc, sizeof(desc), tmp_desc); pstrcat(desc, sizeof(desc), tmp_desc);
} }
if (bdrv_pwrite_sync(bs->file, 0x200, desc, DESC_SIZE) < 0) if (bdrv_pwrite_sync(bs->file, s->desc_offset, desc, DESC_SIZE) < 0) {
return -1; return -EIO;
}
return 0; return 0;
} }
@ -402,10 +407,11 @@ static int vmdk_parent_open(BlockDriverState *bs)
{ {
char *p_name; char *p_name;
char desc[DESC_SIZE]; char desc[DESC_SIZE];
BDRVVmdkState *s = bs->opaque;
/* the descriptor offset = 0x200 */ if (bdrv_pread(bs->file, s->desc_offset, desc, DESC_SIZE) != DESC_SIZE) {
if (bdrv_pread(bs->file, 0x200, desc, DESC_SIZE) != DESC_SIZE)
return -1; return -1;
}
if ((p_name = strstr(desc,"parentFileNameHint")) != NULL) { if ((p_name = strstr(desc,"parentFileNameHint")) != NULL) {
char *end_name; char *end_name;
@ -506,8 +512,10 @@ static int vmdk_open_vmdk3(BlockDriverState *bs, int flags)
int ret; int ret;
uint32_t magic; uint32_t magic;
VMDK3Header header; VMDK3Header header;
BDRVVmdkState *s = bs->opaque;
VmdkExtent *extent; VmdkExtent *extent;
s->desc_offset = 0x200;
ret = bdrv_pread(bs->file, sizeof(magic), &header, sizeof(header)); ret = bdrv_pread(bs->file, sizeof(magic), &header, sizeof(header));
if (ret < 0) { if (ret < 0) {
goto fail; goto fail;
@ -539,6 +547,7 @@ static int vmdk_open_vmdk4(BlockDriverState *bs, int flags)
BDRVVmdkState *s = bs->opaque; BDRVVmdkState *s = bs->opaque;
VmdkExtent *extent; VmdkExtent *extent;
s->desc_offset = 0x200;
ret = bdrv_pread(bs->file, sizeof(magic), &header, sizeof(header)); ret = bdrv_pread(bs->file, sizeof(magic), &header, sizeof(header));
if (ret < 0) { if (ret < 0) {
goto fail; goto fail;