qtest/ahci: halted NCQ test
Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Message-id: 1435767578-32743-10-git-send-email-jsnow@redhat.com
This commit is contained in:
		
							parent
							
								
									e08a98357b
								
							
						
					
					
						commit
						7f6cf5ee12
					
				@ -1200,13 +1200,13 @@ static void test_migrate_ncq(void)
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * DMA Error Test
 | 
					 * Halted IO Error Test
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * Simulate an error on first write, Try to write a pattern,
 | 
					 * Simulate an error on first write, Try to write a pattern,
 | 
				
			||||||
 * Confirm the VM has stopped, resume the VM, verify command
 | 
					 * Confirm the VM has stopped, resume the VM, verify command
 | 
				
			||||||
 * has completed, then read back the data and verify.
 | 
					 * has completed, then read back the data and verify.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
static void test_halted_dma(void)
 | 
					static void ahci_halted_io_test(uint8_t cmd_read, uint8_t cmd_write)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    AHCIQState *ahci;
 | 
					    AHCIQState *ahci;
 | 
				
			||||||
    uint8_t port;
 | 
					    uint8_t port;
 | 
				
			||||||
@ -1241,7 +1241,7 @@ static void test_halted_dma(void)
 | 
				
			|||||||
    memwrite(ptr, tx, bufsize);
 | 
					    memwrite(ptr, tx, bufsize);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* Attempt to write (and fail) */
 | 
					    /* Attempt to write (and fail) */
 | 
				
			||||||
    cmd = ahci_guest_io_halt(ahci, port, CMD_WRITE_DMA,
 | 
					    cmd = ahci_guest_io_halt(ahci, port, cmd_write,
 | 
				
			||||||
                             ptr, bufsize, 0);
 | 
					                             ptr, bufsize, 0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* Attempt to resume the command */
 | 
					    /* Attempt to resume the command */
 | 
				
			||||||
@ -1249,7 +1249,7 @@ static void test_halted_dma(void)
 | 
				
			|||||||
    ahci_free(ahci, ptr);
 | 
					    ahci_free(ahci, ptr);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* Read back and verify */
 | 
					    /* Read back and verify */
 | 
				
			||||||
    ahci_io(ahci, port, CMD_READ_DMA, rx, bufsize, 0);
 | 
					    ahci_io(ahci, port, cmd_read, rx, bufsize, 0);
 | 
				
			||||||
    g_assert_cmphex(memcmp(tx, rx, bufsize), ==, 0);
 | 
					    g_assert_cmphex(memcmp(tx, rx, bufsize), ==, 0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* Cleanup and go home */
 | 
					    /* Cleanup and go home */
 | 
				
			||||||
@ -1258,6 +1258,16 @@ static void test_halted_dma(void)
 | 
				
			|||||||
    g_free(tx);
 | 
					    g_free(tx);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static void test_halted_dma(void)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    ahci_halted_io_test(CMD_READ_DMA, CMD_WRITE_DMA);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static void test_halted_ncq(void)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    ahci_halted_io_test(READ_FPDMA_QUEUED, WRITE_FPDMA_QUEUED);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/**
 | 
					/**
 | 
				
			||||||
 * DMA Error Migration Test
 | 
					 * DMA Error Migration Test
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
@ -1677,6 +1687,7 @@ int main(int argc, char **argv)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    qtest_add_func("/ahci/io/ncq/simple", test_ncq_simple);
 | 
					    qtest_add_func("/ahci/io/ncq/simple", test_ncq_simple);
 | 
				
			||||||
    qtest_add_func("/ahci/migrate/ncq/simple", test_migrate_ncq);
 | 
					    qtest_add_func("/ahci/migrate/ncq/simple", test_migrate_ncq);
 | 
				
			||||||
 | 
					    qtest_add_func("/ahci/io/ncq/retry", test_halted_ncq);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    ret = g_test_run();
 | 
					    ret = g_test_run();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user