motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 10:34:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

block/null: Implement bdrv_get_allocated_file_size

Browse source 
It is trivial, so we might as well do it.

Remove _filter_actual_image_size from iotest 184, so we get to see the
result in its reference output.

Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Max Reitz 2020-06-22 13:58:45 +02:00 • committed by Kevin Wolf
parent 081e465026
commit 07cd7b659a
4 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
block/null.c
View file

@ -262,6 +262,11 @@ static void null_refresh_filename(BlockDriverState *bs)
bs->drv->format_name); bs->drv->format_name);
} }
static int64_t null_allocated_file_size(BlockDriverState *bs)
{
return 0;
}
static const char *const null_strong_runtime_opts[] = { static const char *const null_strong_runtime_opts[] = {
BLOCK_OPT_SIZE, BLOCK_OPT_SIZE,
NULL_OPT_ZEROES, NULL_OPT_ZEROES,
@ -277,6 +282,7 @@ static BlockDriver bdrv_null_co = {
.bdrv_file_open = null_file_open, .bdrv_file_open = null_file_open,
.bdrv_parse_filename = null_co_parse_filename, .bdrv_parse_filename = null_co_parse_filename,
.bdrv_getlength = null_getlength, .bdrv_getlength = null_getlength,
.bdrv_get_allocated_file_size = null_allocated_file_size,
.bdrv_co_preadv = null_co_preadv, .bdrv_co_preadv = null_co_preadv,
.bdrv_co_pwritev = null_co_pwritev, .bdrv_co_pwritev = null_co_pwritev,
@ -297,6 +303,7 @@ static BlockDriver bdrv_null_aio = {
.bdrv_file_open = null_file_open, .bdrv_file_open = null_file_open,
.bdrv_parse_filename = null_aio_parse_filename, .bdrv_parse_filename = null_aio_parse_filename,
.bdrv_getlength = null_getlength, .bdrv_getlength = null_getlength,
.bdrv_get_allocated_file_size = null_allocated_file_size,
.bdrv_aio_preadv = null_aio_preadv, .bdrv_aio_preadv = null_aio_preadv,
.bdrv_aio_pwritev = null_aio_pwritev, .bdrv_aio_pwritev = null_aio_pwritev,

2
tests/qemu-iotests/153.out
View file

@ -464,7 +464,7 @@ No conflict:
image: null-co:// image: null-co://
file format: null-co file format: null-co
virtual size: 1 GiB (1073741824 bytes) virtual size: 1 GiB (1073741824 bytes)
disk size: unavailable disk size: 0 B
Conflict: Conflict:
qemu-img: --force-share/-U conflicts with image options qemu-img: --force-share/-U conflicts with image options

3
tests/qemu-iotests/184
View file

@ -45,8 +45,7 @@ do_run_qemu()
run_qemu() run_qemu()
{ {
do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_qmp\ do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qemu | _filter_qmp\
| _filter_qemu_io | _filter_generated_node_ids \ | _filter_qemu_io | _filter_generated_node_ids
| _filter_actual_image_size
} }
test_throttle=$($QEMU_IMG --help|grep throttle) test_throttle=$($QEMU_IMG --help|grep throttle)

6
tests/qemu-iotests/184.out
View file

@ -29,7 +29,8 @@ Testing:
"image": { "image": {
"virtual-size": 1073741824, "virtual-size": 1073741824,
"filename": "json:{\"throttle-group\": \"group0\", \"driver\": \"throttle\", \"file\": {\"driver\": \"null-co\"}}", "filename": "json:{\"throttle-group\": \"group0\", \"driver\": \"throttle\", \"file\": {\"driver\": \"null-co\"}}",
"format": "throttle" "format": "throttle",
"actual-size": 0
}, },
"iops_wr": 0, "iops_wr": 0,
"ro": false, "ro": false,
@ -56,7 +57,8 @@ Testing:
"image": { "image": {
"virtual-size": 1073741824, "virtual-size": 1073741824,
"filename": "null-co://", "filename": "null-co://",
"format": "null-co" "format": "null-co",
"actual-size": 0
}, },
"iops_wr": 0, "iops_wr": 0,
"ro": false, "ro": false,