 52df1a5b61
			
		
	
	
		52df1a5b61
		
	
	
	
	
		
			
			When running the command `qemu-img snapshot -l SNAPSHOT` the output of VM_CLOCK (measures the offset between host and VM clock) cannot to accommodate values in the order of thousands (4-digit). This line [1] hints on the problem. Additionally, the column width for the VM_CLOCK field was reduced from 15 to 13 spaces in commit b39847a5 in line [2], resulting in a shortage of space. [1]: https://gitlab.com/qemu-project/qemu/-/blob/master/block/qapi.c?ref_type=heads#L753 [2]: https://gitlab.com/qemu-project/qemu/-/blob/master/block/qapi.c?ref_type=heads#L763 This patch restores the column width to 15 spaces and makes adjustments to the affected iotests accordingly. Furthermore, addresses a potential source of confusion by removing whitespace in column headers. Example, VM CLOCK is modified to VM_CLOCK. Additionally a '--' symbol is introduced when ICOUNT returns no output for clarity. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2062 Fixes: b39847a50553 ("migration: introduce icount field for snapshots") Signed-off-by: Abhiram Tilak <atp.exp@gmail.com> Message-ID: <20240123050354.22152-2-atp.exp@gmail.com> [kwolf: Fixed up qemu-iotests 261 and 286] Reviewed-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
		
			
				
	
	
		
			183 lines
		
	
	
		
			7.7 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			183 lines
		
	
	
		
			7.7 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| QA output created by 267
 | |
| 
 | |
| === No block devices at all ===
 | |
| 
 | |
| Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 | |
| Testing:
 | |
| QEMU X.Y.Z monitor - type 'help' for more information
 | |
| (qemu) savevm snap0
 | |
| Error: no block device can store vmstate for snapshot
 | |
| (qemu) info snapshots
 | |
| no block device can store vmstate for snapshot
 | |
| (qemu) loadvm snap0
 | |
| Error: no block device can store vmstate for snapshot
 | |
| (qemu) quit
 | |
| 
 | |
| 
 | |
| === -drive if=none ===
 | |
| 
 | |
| Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 | |
| Testing: -drive driver=file,file=TEST_DIR/t.IMGFMT,if=none
 | |
| QEMU X.Y.Z monitor - type 'help' for more information
 | |
| (qemu) savevm snap0
 | |
| Error: Device 'none0' is writable but does not support snapshots
 | |
| (qemu) info snapshots
 | |
| no block device can store vmstate for snapshot
 | |
| (qemu) loadvm snap0
 | |
| Error: Device 'none0' is writable but does not support snapshots
 | |
| (qemu) quit
 | |
| 
 | |
| Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 | |
| Testing: -drive driver=IMGFMT,file=TEST_DIR/t.IMGFMT,if=none
 | |
| QEMU X.Y.Z monitor - type 'help' for more information
 | |
| (qemu) savevm snap0
 | |
| (qemu) info snapshots
 | |
| List of snapshots present on all disks:
 | |
| ID      TAG               VM_SIZE                DATE        VM_CLOCK     ICOUNT
 | |
| --      snap0                SIZE yyyy-mm-dd hh:mm:ss  0000:00:00.000         --
 | |
| (qemu) loadvm snap0
 | |
| (qemu) quit
 | |
| 
 | |
| Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 | |
| Testing: -drive driver=IMGFMT,file=TEST_DIR/t.IMGFMT,if=none -device virtio-blk,drive=none0
 | |
| QEMU X.Y.Z monitor - type 'help' for more information
 | |
| (qemu) savevm snap0
 | |
| (qemu) info snapshots
 | |
| List of snapshots present on all disks:
 | |
| ID      TAG               VM_SIZE                DATE        VM_CLOCK     ICOUNT
 | |
| --      snap0                SIZE yyyy-mm-dd hh:mm:ss  0000:00:00.000         --
 | |
| (qemu) loadvm snap0
 | |
| (qemu) quit
 | |
| 
 | |
| 
 | |
| === -drive if=virtio ===
 | |
| 
 | |
| Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 | |
| Testing: -drive driver=file,file=TEST_DIR/t.IMGFMT,if=virtio
 | |
| QEMU X.Y.Z monitor - type 'help' for more information
 | |
| (qemu) savevm snap0
 | |
| Error: Device 'virtio0' is writable but does not support snapshots
 | |
| (qemu) info snapshots
 | |
| no block device can store vmstate for snapshot
 | |
| (qemu) loadvm snap0
 | |
| Error: Device 'virtio0' is writable but does not support snapshots
 | |
| (qemu) quit
 | |
| 
 | |
| Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 | |
| Testing: -drive driver=IMGFMT,file=TEST_DIR/t.IMGFMT,if=virtio
 | |
| QEMU X.Y.Z monitor - type 'help' for more information
 | |
| (qemu) savevm snap0
 | |
| (qemu) info snapshots
 | |
| List of snapshots present on all disks:
 | |
| ID      TAG               VM_SIZE                DATE        VM_CLOCK     ICOUNT
 | |
| --      snap0                SIZE yyyy-mm-dd hh:mm:ss  0000:00:00.000         --
 | |
| (qemu) loadvm snap0
 | |
| (qemu) quit
 | |
| 
 | |
| 
 | |
| === Simple -blockdev ===
 | |
| 
 | |
| Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 | |
| Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file
 | |
| QEMU X.Y.Z monitor - type 'help' for more information
 | |
| (qemu) savevm snap0
 | |
| Error: Device 'file' is writable but does not support snapshots
 | |
| (qemu) info snapshots
 | |
| no block device can store vmstate for snapshot
 | |
| (qemu) loadvm snap0
 | |
| Error: Device 'file' is writable but does not support snapshots
 | |
| (qemu) quit
 | |
| 
 | |
| Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 | |
| Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file -blockdev driver=IMGFMT,file=file,node-name=fmt
 | |
| QEMU X.Y.Z monitor - type 'help' for more information
 | |
| (qemu) savevm snap0
 | |
| (qemu) info snapshots
 | |
| List of snapshots present on all disks:
 | |
| ID      TAG               VM_SIZE                DATE        VM_CLOCK     ICOUNT
 | |
| --      snap0                SIZE yyyy-mm-dd hh:mm:ss  0000:00:00.000         --
 | |
| (qemu) loadvm snap0
 | |
| (qemu) quit
 | |
| 
 | |
| Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 | |
| Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file -blockdev driver=raw,file=file,node-name=raw -blockdev driver=IMGFMT,file=raw,node-name=fmt
 | |
| QEMU X.Y.Z monitor - type 'help' for more information
 | |
| (qemu) savevm snap0
 | |
| (qemu) info snapshots
 | |
| List of snapshots present on all disks:
 | |
| ID      TAG               VM_SIZE                DATE        VM_CLOCK     ICOUNT
 | |
| --      snap0                SIZE yyyy-mm-dd hh:mm:ss  0000:00:00.000         --
 | |
| (qemu) loadvm snap0
 | |
| (qemu) quit
 | |
| 
 | |
| 
 | |
| === -blockdev with a filter on top ===
 | |
| 
 | |
| Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 | |
| Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file -blockdev driver=IMGFMT,file=file,node-name=fmt -blockdev driver=copy-on-read,file=fmt,node-name=filter
 | |
| QEMU X.Y.Z monitor - type 'help' for more information
 | |
| (qemu) savevm snap0
 | |
| (qemu) info snapshots
 | |
| List of snapshots present on all disks:
 | |
| ID      TAG               VM_SIZE                DATE        VM_CLOCK     ICOUNT
 | |
| --      snap0                SIZE yyyy-mm-dd hh:mm:ss  0000:00:00.000         --
 | |
| (qemu) loadvm snap0
 | |
| (qemu) quit
 | |
| 
 | |
| 
 | |
| === -blockdev with a backing file ===
 | |
| 
 | |
| Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=134217728
 | |
| Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT
 | |
| Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT.base,node-name=backing-file -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file -blockdev driver=IMGFMT,file=file,backing=backing-file,node-name=fmt
 | |
| QEMU X.Y.Z monitor - type 'help' for more information
 | |
| (qemu) savevm snap0
 | |
| (qemu) info snapshots
 | |
| List of snapshots present on all disks:
 | |
| ID      TAG               VM_SIZE                DATE        VM_CLOCK     ICOUNT
 | |
| --      snap0                SIZE yyyy-mm-dd hh:mm:ss  0000:00:00.000         --
 | |
| (qemu) loadvm snap0
 | |
| (qemu) quit
 | |
| 
 | |
| Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT
 | |
| Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT.base,node-name=backing-file -blockdev driver=IMGFMT,file=backing-file,node-name=backing-fmt -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file -blockdev driver=IMGFMT,file=file,backing=backing-fmt,node-name=fmt
 | |
| QEMU X.Y.Z monitor - type 'help' for more information
 | |
| (qemu) savevm snap0
 | |
| (qemu) info snapshots
 | |
| List of snapshots present on all disks:
 | |
| ID      TAG               VM_SIZE                DATE        VM_CLOCK     ICOUNT
 | |
| --      snap0                SIZE yyyy-mm-dd hh:mm:ss  0000:00:00.000         --
 | |
| (qemu) loadvm snap0
 | |
| (qemu) quit
 | |
| 
 | |
| Internal snapshots on overlay:
 | |
| Snapshot list:
 | |
| ID      TAG               VM_SIZE                DATE        VM_CLOCK     ICOUNT
 | |
| 1       snap0                SIZE yyyy-mm-dd hh:mm:ss  0000:00:00.000         --
 | |
| Internal snapshots on backing file:
 | |
| 
 | |
| === -blockdev with NBD server on the backing file ===
 | |
| 
 | |
| Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT
 | |
| Testing: -blockdev driver=file,filename=TEST_DIR/t.IMGFMT.base,node-name=backing-file -blockdev driver=IMGFMT,file=backing-file,node-name=backing-fmt -blockdev driver=file,filename=TEST_DIR/t.IMGFMT,node-name=file -blockdev driver=IMGFMT,file=file,backing=backing-fmt,node-name=fmt
 | |
| QEMU X.Y.Z monitor - type 'help' for more information
 | |
| (qemu) nbd_server_start unix:SOCK_DIR/nbd
 | |
| (qemu) nbd_server_add -w backing-fmt
 | |
| (qemu) savevm snap0
 | |
| (qemu) info snapshots
 | |
| List of snapshots present on all disks:
 | |
| ID      TAG               VM_SIZE                DATE        VM_CLOCK     ICOUNT
 | |
| --      snap0                SIZE yyyy-mm-dd hh:mm:ss  0000:00:00.000         --
 | |
| (qemu) loadvm snap0
 | |
| (qemu) quit
 | |
| 
 | |
| Internal snapshots on overlay:
 | |
| Snapshot list:
 | |
| ID      TAG               VM_SIZE                DATE        VM_CLOCK     ICOUNT
 | |
| 1       snap0                SIZE yyyy-mm-dd hh:mm:ss  0000:00:00.000         --
 | |
| Internal snapshots on backing file:
 | |
| Snapshot list:
 | |
| ID      TAG               VM_SIZE                DATE        VM_CLOCK     ICOUNT
 | |
| 1       snap0                SIZE yyyy-mm-dd hh:mm:ss  0000:00:00.000         --
 | |
| *** done
 |