summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--block.c12
-rw-r--r--block_int.h3
2 files changed, 7 insertions, 8 deletions
diff --git a/block.c b/block.c
index 529dd4e250..dacee2f7fb 100644
--- a/block.c
+++ b/block.c
@@ -296,7 +296,7 @@ int bdrv_open2(BlockDriverState *bs, const char *filename, int flags,
bdrv_delete(bs1);
get_tmp_filename(tmp_filename, sizeof(tmp_filename));
- if (bdrv_create(&bdrv_qcow, tmp_filename,
+ if (bdrv_create(&bdrv_qcow2, tmp_filename,
total_size, filename, 0) < 0) {
return -1;
}
@@ -335,7 +335,9 @@ int bdrv_open2(BlockDriverState *bs, const char *filename, int flags,
qemu_free(bs->opaque);
return ret;
}
-
+ if (drv->bdrv_getlength) {
+ bs->total_sectors = bdrv_getlength(bs) >> SECTOR_BITS;
+ }
#ifndef _WIN32
if (bs->is_temporary) {
unlink(filename);
@@ -647,11 +649,7 @@ int64_t bdrv_getlength(BlockDriverState *bs)
void bdrv_get_geometry(BlockDriverState *bs, int64_t *nb_sectors_ptr)
{
- int64_t size;
- size = bdrv_getlength(bs);
- if (size < 0)
- size = 0;
- *nb_sectors_ptr = size >> SECTOR_BITS;
+ *nb_sectors_ptr = bs->total_sectors;
}
/* force a given boot sector. */
diff --git a/block_int.h b/block_int.h
index b3bc5b3871..26cc4ffbac 100644
--- a/block_int.h
+++ b/block_int.h
@@ -73,7 +73,8 @@ struct BlockDriver {
};
struct BlockDriverState {
- int64_t total_sectors; /* XXX: will be suppressed */
+ int64_t total_sectors; /* if we are reading a disk image, give its
+ size in sectors */
int read_only; /* if true, the media is read only */
int inserted; /* if true, the media is present */
int removable; /* if true, the media can be removed */