OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vmdk: Clean up backing file handling

Browse Source 
VMDK is doing interesting things when it needs to open a backing file. This
patch changes that part to look more like in other drivers. The nice side
effect is that the file name isn't needed any more in the open function.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2010-04-16 21:07:19 +02:00
parent c336500df5
commit 9949f97e84
1 changed files with 10 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
block/vmdk.c
View File

@ -76,7 +76,6 @@ typedef struct BDRVVmdkState {
unsigned int cluster_sectors; unsigned int cluster_sectors;
uint32_t parent_cid; uint32_t parent_cid;
int is_parent;
} BDRVVmdkState; } BDRVVmdkState;
typedef struct VmdkMetaData { typedef struct VmdkMetaData {
@ -338,19 +337,11 @@ fail:
return ret; return ret;
} }
static void vmdk_parent_close(BlockDriverState *bs) static int vmdk_parent_open(BlockDriverState *bs)
{
if (bs->backing_hd)
bdrv_close(bs->backing_hd);
}
static int parent_open = 0;
static int vmdk_parent_open(BlockDriverState *bs, const char * filename)
{ {
BDRVVmdkState *s = bs->opaque; BDRVVmdkState *s = bs->opaque;
char *p_name; char *p_name;
char desc[DESC_SIZE]; char desc[DESC_SIZE];
char parent_img_name[1024];
/* the descriptor offset = 0x200 */ /* the descriptor offset = 0x200 */
if (bdrv_pread(s->hd, 0x200, desc, DESC_SIZE) != DESC_SIZE) if (bdrv_pread(s->hd, 0x200, desc, DESC_SIZE) != DESC_SIZE)
@ -358,7 +349,6 @@ static int vmdk_parent_open(BlockDriverState *bs, const char * filename)
if ((p_name = strstr(desc,"parentFileNameHint")) != NULL) { if ((p_name = strstr(desc,"parentFileNameHint")) != NULL) {
char *end_name; char *end_name;
struct stat file_buf;
p_name += sizeof("parentFileNameHint") + 1; p_name += sizeof("parentFileNameHint") + 1;
if ((end_name = strchr(p_name,'\"')) == NULL) if ((end_name = strchr(p_name,'\"')) == NULL)
@ -367,24 +357,6 @@ static int vmdk_parent_open(BlockDriverState *bs, const char * filename)
return -1; return -1;
pstrcpy(bs->backing_file, end_name - p_name + 1, p_name); pstrcpy(bs->backing_file, end_name - p_name + 1, p_name);
if (stat(bs->backing_file, &file_buf) != 0) {
path_combine(parent_img_name, sizeof(parent_img_name),
filename, bs->backing_file);
} else {
pstrcpy(parent_img_name, sizeof(parent_img_name),
bs->backing_file);
}
bs->backing_hd = bdrv_new("");
if (!bs->backing_hd) {
failure:
bdrv_close(s->hd);
return -1;
}
parent_open = 1;
if (bdrv_open(bs->backing_hd, parent_img_name, 0, NULL) < 0)
goto failure;
parent_open = 0;
} }
return 0; return 0;
@ -396,11 +368,6 @@ static int vmdk_open(BlockDriverState *bs, const char *filename, int flags)
uint32_t magic; uint32_t magic;
int l1_size, i, ret; int l1_size, i, ret;
if (parent_open) {
/* Parent must be opened as RO, no RDWR. */
flags = 0;
}
ret = bdrv_file_open(&s->hd, filename, flags); ret = bdrv_file_open(&s->hd, filename, flags);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -436,13 +403,8 @@ static int vmdk_open(BlockDriverState *bs, const char *filename, int flags)
s->l1_table_offset = le64_to_cpu(header.rgd_offset) << 9; s->l1_table_offset = le64_to_cpu(header.rgd_offset) << 9;
s->l1_backup_table_offset = le64_to_cpu(header.gd_offset) << 9; s->l1_backup_table_offset = le64_to_cpu(header.gd_offset) << 9;
if (parent_open)
s->is_parent = 1;
else
s->is_parent = 0;
// try to open parent images, if exist // try to open parent images, if exist
if (vmdk_parent_open(bs, filename) != 0) if (vmdk_parent_open(bs) != 0)
goto fail; goto fail;
// write the CID once after the image creation // write the CID once after the image creation
s->parent_cid = vmdk_read_cid(bs,1); s->parent_cid = vmdk_read_cid(bs,1);
@ -583,15 +545,15 @@ static uint64_t get_cluster_offset(BlockDriverState *bs, VmdkMetaData *m_data,
if (!cluster_offset) { if (!cluster_offset) {
if (!allocate) if (!allocate)
return 0; return 0;
// Avoid the L2 tables update for the images that have snapshots.
if (!s->is_parent) {
cluster_offset = bdrv_getlength(s->hd);
bdrv_truncate(s->hd, cluster_offset + (s->cluster_sectors << 9));
cluster_offset >>= 9; // Avoid the L2 tables update for the images that have snapshots.
tmp = cpu_to_le32(cluster_offset); cluster_offset = bdrv_getlength(s->hd);
l2_table[l2_index] = tmp; bdrv_truncate(s->hd, cluster_offset + (s->cluster_sectors << 9));
}
cluster_offset >>= 9;
tmp = cpu_to_le32(cluster_offset);
l2_table[l2_index] = tmp;
/* First of all we write grain itself, to avoid race condition /* First of all we write grain itself, to avoid race condition
* that may to corrupt the image. * that may to corrupt the image.
* This problem may occur because of insufficient space on host disk * This problem may occur because of insufficient space on host disk
@ -866,8 +828,6 @@ static void vmdk_close(BlockDriverState *bs)
qemu_free(s->l1_table); qemu_free(s->l1_table);
qemu_free(s->l2_cache); qemu_free(s->l2_cache);
// try to close parent image, if exist
vmdk_parent_close(s->hd);
bdrv_delete(s->hd); bdrv_delete(s->hd);
} }