diff options
| author |   Kevin Wolf <kwolf@redhat.com> | 2009-11-30 16:54:15 +0100 |
|---|---|---|
| committer |   Anthony Liguori <aliguori@us.ibm.com> | 2009-12-03 11:45:50 -0600 |
| commit | 12c09b8ce22d74f78ff50f95676cbe4f501752ae (patch) | |
| tree | bec44c2ce73007642fdeba4f2019c078520c4e72 | |
| parent | qcow2: Fix some more qemu_malloc fallout (diff) | |
| download | qemu-kvm-12c09b8ce22d74f78ff50f95676cbe4f501752ae.tar.gz qemu-kvm-12c09b8ce22d74f78ff50f95676cbe4f501752ae.tar.bz2 qemu-kvm-12c09b8ce22d74f78ff50f95676cbe4f501752ae.zip | |
qemu-img: There is more than one host device driver
I haven't heard yet of anyone using qemu-img to copy an image to a real floppy,
but it's a valid use case.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | block/raw-posix.c | 4 | ||||
| -rw-r--r-- | block_int.h | 3 | ||||
| -rw-r--r-- | qemu-img.c | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/block/raw-posix.c b/block/raw-posix.c index 266d8415d..706799fa3 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -1014,6 +1014,7 @@ static BlockDriver bdrv_host_device = { .bdrv_close = raw_close, .bdrv_create = hdev_create, .create_options = raw_create_options, + .no_zero_init = 1, .bdrv_flush = raw_flush, .bdrv_aio_readv = raw_aio_readv, @@ -1110,6 +1111,7 @@ static BlockDriver bdrv_host_floppy = { .bdrv_close = raw_close, .bdrv_create = hdev_create, .create_options = raw_create_options, + .no_zero_init = 1, .bdrv_flush = raw_flush, .bdrv_aio_readv = raw_aio_readv, @@ -1192,6 +1194,7 @@ static BlockDriver bdrv_host_cdrom = { .bdrv_close = raw_close, .bdrv_create = hdev_create, .create_options = raw_create_options, + .no_zero_init = 1, .bdrv_flush = raw_flush, .bdrv_aio_readv = raw_aio_readv, @@ -1313,6 +1316,7 @@ static BlockDriver bdrv_host_cdrom = { .bdrv_close = raw_close, .bdrv_create = hdev_create, .create_options = raw_create_options, + .no_zero_init = 1, .bdrv_flush = raw_flush, .bdrv_aio_readv = raw_aio_readv, diff --git a/block_int.h b/block_int.h index 907e86410..9a3b2e09d 100644 --- a/block_int.h +++ b/block_int.h @@ -117,6 +117,9 @@ struct BlockDriver { /* Returns number of errors in image, -errno for internal errors */ int (*bdrv_check)(BlockDriverState* bs); + /* Set if newly created images are not guaranteed to contain only zeros */ + int no_zero_init; + struct BlockDriver *next; }; diff --git a/qemu-img.c b/qemu-img.c index 972843ab8..f19c6440e 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -743,7 +743,7 @@ static int img_convert(int argc, char **argv) if (n > bs_offset + bs_sectors - sector_num) n = bs_offset + bs_sectors - sector_num; - if (strcmp(drv->format_name, "host_device")) { + if (!drv->no_zero_init) { /* If the output image is being created as a copy on write image, assume that sectors which are unallocated in the input image are present in both the output's and input's base images (no @@ -776,7 +776,7 @@ static int img_convert(int argc, char **argv) If the output is to a host device, we also write out sectors that are entirely 0, since whatever data was already there is garbage, not 0s. */ - if (strcmp(drv->format_name, "host_device") == 0 || out_baseimg || + if (drv->no_zero_init || out_baseimg || is_allocated_sectors(buf1, n, &n1)) { if (bdrv_write(out_bs, sector_num, buf1, n1) < 0) error("error while writing"); |