david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block-vpc: Fix disk size (Kevin Wolf)

Browse Source 
VirtualPC bases the virtual disk size on the geometry rather than on
the size stored in the header.

Signed-off-by: Kevin Wolf <kwolf@suse.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6456 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aliguori 2009-01-26 20:26:54 +00:00
parent 2cfacb6293
commit 1fa792286c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
block-vpc.c
View File

@ -150,6 +150,12 @@ static int vpc_open(BlockDriverState *bs, const char *filename, int flags)
if (strncmp(footer->creator, "conectix", 8)) if (strncmp(footer->creator, "conectix", 8))
goto fail; goto fail;
// The visible size of a image in Virtual PC depends on the geometry
// rather than on the size stored in the footer (the size in the footer
// is too large usually)
bs->total_sectors = (int64_t)
be16_to_cpu(footer->cyls) * footer->heads * footer->secs_per_cyl;
lseek(s->fd, be64_to_cpu(footer->data_offset), SEEK_SET); lseek(s->fd, be64_to_cpu(footer->data_offset), SEEK_SET);
if (read(fd, buf, HEADER_SIZE) != HEADER_SIZE) if (read(fd, buf, HEADER_SIZE) != HEADER_SIZE)
goto fail; goto fail;
@ -160,9 +166,6 @@ static int vpc_open(BlockDriverState *bs, const char *filename, int flags)
if (strncmp(dyndisk_header->magic, "cxsparse", 8)) if (strncmp(dyndisk_header->magic, "cxsparse", 8))
goto fail; goto fail;
bs->total_sectors = ((uint64_t)be32_to_cpu(dyndisk_header->max_table_entries) *
be32_to_cpu(dyndisk_header->block_size)) / 512;
lseek(s->fd, be64_to_cpu(dyndisk_header->table_offset), SEEK_SET); lseek(s->fd, be64_to_cpu(dyndisk_header->table_offset), SEEK_SET);
s->max_table_entries = be32_to_cpu(dyndisk_header->max_table_entries); s->max_table_entries = be32_to_cpu(dyndisk_header->max_table_entries);