In case when get_image_offset() returns -1, we do zero out the corresponding chunk of qiov. So, this should be reported as ZERO. Note that this changes visible output of "qemu-img map --output=json" and "qemu-io -c map" commands. For qemu-img map, the change is obvious: we just mark as zero what is really zero. For qemu-io it's less obvious: what was unallocated now is allocated. There is an inconsistency in understanding of unallocated regions in Qemu: backing-supporting format-drivers return 0 block-status to report go-to-backing logic for this area. Some protocol-drivers (iscsi) return 0 to report fs-unallocated-non-zero status (i.e., don't occupy space on disk, read result is undefined). BDRV_BLOCK_ALLOCATED is defined as something more close to go-to-backing logic. Still it is calculated as ZERO | DATA, so 0 from iscsi is treated as unallocated. It doesn't influence backing-chain behavior, as iscsi can't have backing file. But it does influence "qemu-io -c map". We should solve this inconsistency at some future point. Now, let's just make backing-not-supporting format drivers (vdi in the previous patch and vpc now) to behave more like backing-supporting drivers and not report 0 block-status. More over, returning ZERO status is absolutely valid thing, and again, corresponds to how the other format-drivers (backing-supporting) work. After block-status update, it never reports 0, so setting unallocated_blocks_are_zero doesn't make sense (as the only user of it is bdrv_co_block_status and it checks unallocated_blocks_are_zero only for unallocated areas). Drop it. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20200528094405.145708-5-vsementsov@virtuozzo.com> [mreitz: qemu-io -c map as used by iotest 146 now reports everything as allocated; in order to make the test do something useful, we use qemu-img map --output=json now] Signed-off-by: Max Reitz <mreitz@redhat.com>
		
			
				
	
	
		
			195 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			195 lines
		
	
	
		
			4.3 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
| #!/usr/bin/env bash
 | |
| #
 | |
| # Test VHD image format creator detection and override
 | |
| #
 | |
| # Copyright (C) 2016 Red Hat, Inc.
 | |
| #
 | |
| # This program is free software; you can redistribute it and/or modify
 | |
| # it under the terms of the GNU General Public License as published by
 | |
| # the Free Software Foundation; either version 2 of the License, or
 | |
| # (at your option) any later version.
 | |
| #
 | |
| # This program is distributed in the hope that it will be useful,
 | |
| # but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | |
| # GNU General Public License for more details.
 | |
| #
 | |
| # You should have received a copy of the GNU General Public License
 | |
| # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | |
| #
 | |
| 
 | |
| # creator
 | |
| owner=jcody@redhat.com
 | |
| 
 | |
| seq=`basename $0`
 | |
| echo "QA output created by $seq"
 | |
| 
 | |
| status=1    # failure is the default!
 | |
| 
 | |
| _cleanup()
 | |
| {
 | |
|     _cleanup_qemu
 | |
|     _cleanup_test_img
 | |
| }
 | |
| trap "_cleanup; exit \$status" 0 1 2 3 15
 | |
| 
 | |
| # get standard environment, filters and checks
 | |
| . ./common.rc
 | |
| . ./common.filter
 | |
| . ./common.qemu
 | |
| 
 | |
| _supported_fmt vpc
 | |
| _supported_proto file
 | |
| _supported_os Linux
 | |
| 
 | |
| 
 | |
| qemu_comm_method="monitor"
 | |
| silent=
 | |
| 
 | |
| echo
 | |
| echo === Testing VPC Autodetect ===
 | |
| echo
 | |
| _use_sample_img virtualpc-dynamic.vhd.bz2
 | |
| 
 | |
| $QEMU_IMG map --output=json --image-opts \
 | |
|     "driver=vpc,file.filename=$TEST_IMG" \
 | |
|     | _filter_qemu_img_map
 | |
| 
 | |
| echo
 | |
| echo === Testing VPC with current_size force ===
 | |
| echo
 | |
| 
 | |
| $QEMU_IMG map --output=json --image-opts \
 | |
|     "driver=vpc,force_size_calc=current_size,file.filename=$TEST_IMG" \
 | |
|     | _filter_qemu_img_map
 | |
| 
 | |
| echo
 | |
| echo === Testing VPC with chs force ===
 | |
| echo
 | |
| 
 | |
| $QEMU_IMG map --output=json --image-opts \
 | |
|     "driver=vpc,force_size_calc=chs,file.filename=$TEST_IMG" \
 | |
|     | _filter_qemu_img_map
 | |
| 
 | |
| _cleanup_test_img
 | |
| 
 | |
| echo
 | |
| echo === Testing Hyper-V Autodetect ===
 | |
| echo
 | |
| _use_sample_img hyperv2012r2-dynamic.vhd.bz2
 | |
| 
 | |
| $QEMU_IMG map --output=json --image-opts \
 | |
|     "driver=vpc,file.filename=$TEST_IMG" \
 | |
|     | _filter_qemu_img_map
 | |
| 
 | |
| echo
 | |
| echo === Testing Hyper-V with current_size force ===
 | |
| echo
 | |
| 
 | |
| $QEMU_IMG map --output=json --image-opts \
 | |
|     "driver=vpc,force_size_calc=current_size,file.filename=$TEST_IMG" \
 | |
|     | _filter_qemu_img_map
 | |
| 
 | |
| echo
 | |
| echo === Testing Hyper-V with chs force ===
 | |
| echo
 | |
| 
 | |
| $QEMU_IMG map --output=json --image-opts \
 | |
|     "driver=vpc,force_size_calc=chs,file.filename=$TEST_IMG" \
 | |
|     | _filter_qemu_img_map
 | |
| 
 | |
| _cleanup_test_img
 | |
| 
 | |
| echo
 | |
| echo === Testing d2v Autodetect ===
 | |
| echo
 | |
| _use_sample_img d2v-zerofilled.vhd.bz2
 | |
| 
 | |
| $QEMU_IMG map --output=json --image-opts \
 | |
|     "driver=vpc,file.filename=$TEST_IMG" \
 | |
|     | _filter_qemu_img_map
 | |
| 
 | |
| echo
 | |
| echo === Testing d2v with current_size force ===
 | |
| echo
 | |
| 
 | |
| $QEMU_IMG map --output=json --image-opts \
 | |
|     "driver=vpc,force_size_calc=current_size,file.filename=$TEST_IMG" \
 | |
|     | _filter_qemu_img_map
 | |
| 
 | |
| echo
 | |
| echo === Testing d2v with chs force ===
 | |
| echo
 | |
| 
 | |
| $QEMU_IMG map --output=json --image-opts \
 | |
|     "driver=vpc,force_size_calc=chs,file.filename=$TEST_IMG" \
 | |
|     | _filter_qemu_img_map
 | |
| 
 | |
| _cleanup_test_img
 | |
| 
 | |
| echo
 | |
| echo === Testing Image create, default ===
 | |
| echo
 | |
| 
 | |
| TEST_IMG="${TEST_DIR}/vpc-create-test.vpc"
 | |
| 
 | |
| _make_test_img 4G
 | |
| 
 | |
| echo
 | |
| echo === Read created image, default opts ====
 | |
| echo
 | |
| 
 | |
| $QEMU_IMG map --output=json --image-opts \
 | |
|     "driver=vpc,file.filename=$TEST_IMG" \
 | |
|     | _filter_qemu_img_map
 | |
| 
 | |
| echo
 | |
| echo === Read created image, force_size_calc=chs ====
 | |
| echo
 | |
| 
 | |
| $QEMU_IMG map --output=json --image-opts \
 | |
|     "driver=vpc,force_size_calc=chs,file.filename=$TEST_IMG" \
 | |
|     | _filter_qemu_img_map
 | |
| 
 | |
| echo
 | |
| echo === Read created image, force_size_calc=current_size ====
 | |
| echo
 | |
| 
 | |
| $QEMU_IMG map --output=json --image-opts \
 | |
|     "driver=vpc,force_size_calc=current_size,file.filename=$TEST_IMG" \
 | |
|     | _filter_qemu_img_map
 | |
| 
 | |
| echo
 | |
| echo === Testing Image create, force_size ===
 | |
| echo
 | |
| 
 | |
| _make_test_img -o force_size 4G
 | |
| 
 | |
| echo
 | |
| echo === Read created image, default opts ====
 | |
| echo
 | |
| 
 | |
| $QEMU_IMG map --output=json --image-opts \
 | |
|     "driver=vpc,file.filename=$TEST_IMG" \
 | |
|     | _filter_qemu_img_map
 | |
| 
 | |
| echo
 | |
| echo === Read created image, force_size_calc=chs ====
 | |
| echo
 | |
| 
 | |
| $QEMU_IMG map --output=json --image-opts \
 | |
|     "driver=vpc,force_size_calc=chs,file.filename=$TEST_IMG" \
 | |
|     | _filter_qemu_img_map
 | |
| 
 | |
| echo
 | |
| echo === Read created image, force_size_calc=current_size ====
 | |
| echo
 | |
| 
 | |
| $QEMU_IMG map --output=json --image-opts \
 | |
|     "driver=vpc,force_size_calc=current_size,file.filename=$TEST_IMG" \
 | |
|     | _filter_qemu_img_map
 | |
| 
 | |
| echo "*** done"
 | |
| rm -f $seq.full
 | |
| status=0
 |