diff options
author | Kevin Wolf <kwolf@redhat.com> | 2013-10-29 12:18:58 +0100 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2013-10-29 13:10:26 +0100 |
commit | b94a2610573cd9314f244207c8b04cb75e42d7f8 (patch) | |
tree | 07be4507b5678548b73b1a822d38e990417a2f76 /block.c | |
parent | 87a5debd3161d24a7d4c685e3c0d8765b5d92a74 (diff) | |
download | qemu-b94a2610573cd9314f244207c8b04cb75e42d7f8.zip qemu-b94a2610573cd9314f244207c8b04cb75e42d7f8.tar.gz qemu-b94a2610573cd9314f244207c8b04cb75e42d7f8.tar.bz2 |
block: Avoid unecessary drv->bdrv_getlength() calls
The block layer generally keeps the size of an image cached in
bs->total_sectors so that it doesn't have to perform expensive
operations to get the size whenever it needs it.
This doesn't work however when using a backend that can change its size
without qemu being aware of it, i.e. passthrough of removable media like
CD-ROMs or floppy disks. For this reason, the caching is disabled when a
removable device is used.
It is obvious that checking whether the _guest_ device has removable
media isn't the right thing to do when we want to know whether the size
of the host backend can change. To make things worse, non-top-level
BlockDriverStates never have any device attached, which makes qemu
assume they are removable, so drv->bdrv_getlength() is always called on
the protocol layer. In the case of raw-posix, this causes unnecessary
lseek() system calls, which turned out to be rather expensive.
This patch completely changes the logic and disables bs->total_sectors
caching only for certain block driver types, for which a size change is
expected: host_cdrom and host_floppy on POSIX, host_device on win32; also
the raw format in case it sits on top of one of these protocols, but in
the common case the nested bdrv_getlength() call on the protocol driver
will use the cache again and avoid an expensive drv->bdrv_getlength()
call.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'block.c')
-rw-r--r-- | block.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -2869,9 +2869,10 @@ int64_t bdrv_getlength(BlockDriverState *bs) if (!drv) return -ENOMEDIUM; - if (bdrv_dev_has_removable_media(bs)) { - if (drv->bdrv_getlength) { - return drv->bdrv_getlength(bs); + if (drv->has_variable_length) { + int ret = refresh_total_sectors(bs, bs->total_sectors); + if (ret < 0) { + return ret; } } return bs->total_sectors * BDRV_SECTOR_SIZE; |