qemu-iotests: 140: don't use IDE device
IDE is only implemented by very few architectures (mostly PC). The
test doesn't actually need a block device attached to the
BlockBackend, so just drop it and adjust the reference output
accordingly.
Fixes: 16dee418 ("iotests: Add test for eject under NBD server")
Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com>
Message-id: 1455827853-33477-2-git-send-email-silbe@linux.vnet.ibm.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
			
			
This commit is contained in:
		
							parent
							
								
									f436c94102
								
							
						
					
					
						commit
						4b84fc70ce
					
				@ -49,7 +49,7 @@ _make_test_img 64k
 | 
				
			|||||||
$QEMU_IO -c 'write -P 42 0 64k' "$TEST_IMG" | _filter_qemu_io
 | 
					$QEMU_IO -c 'write -P 42 0 64k' "$TEST_IMG" | _filter_qemu_io
 | 
				
			||||||
 | 
					
 | 
				
			||||||
keep_stderr=y \
 | 
					keep_stderr=y \
 | 
				
			||||||
_launch_qemu -drive if=ide,media=cdrom,id=drv,file="$TEST_IMG",format=$IMGFMT \
 | 
					_launch_qemu -drive if=none,media=cdrom,id=drv,file="$TEST_IMG",format=$IMGFMT \
 | 
				
			||||||
    2> >(_filter_nbd)
 | 
					    2> >(_filter_nbd)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
_send_qemu_cmd $QEMU_HANDLE \
 | 
					_send_qemu_cmd $QEMU_HANDLE \
 | 
				
			||||||
 | 
				
			|||||||
@ -7,7 +7,6 @@ wrote 65536/65536 bytes at offset 0
 | 
				
			|||||||
{"return": {}}
 | 
					{"return": {}}
 | 
				
			||||||
read 65536/65536 bytes at offset 0
 | 
					read 65536/65536 bytes at offset 0
 | 
				
			||||||
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 | 
					64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 | 
				
			||||||
{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "drv", "tray-open": true}}
 | 
					 | 
				
			||||||
{"return": {}}
 | 
					{"return": {}}
 | 
				
			||||||
can't open device nbd+unix:///drv?socket=TEST_DIR/nbd: No export with name 'drv' available
 | 
					can't open device nbd+unix:///drv?socket=TEST_DIR/nbd: No export with name 'drv' available
 | 
				
			||||||
no file open, try 'help open'
 | 
					no file open, try 'help open'
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user