From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53126) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHGr3-0001ek-HR for qemu-devel@nongnu.org; Mon, 20 Jul 2015 15:36:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZHGqz-00030I-Bj for qemu-devel@nongnu.org; Mon, 20 Jul 2015 15:36:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52211) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHGqz-000309-7C for qemu-devel@nongnu.org; Mon, 20 Jul 2015 15:35:57 -0400 From: John Snow Date: Mon, 20 Jul 2015 14:29:19 -0400 Message-Id: <1437416961-26348-2-git-send-email-jsnow@redhat.com> In-Reply-To: <1437416961-26348-1-git-send-email-jsnow@redhat.com> References: <1437416961-26348-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PULL 1/3] qtest/ide: add another short PRDT test flavor List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jsnow@redhat.com, Stefan Hajnoczi From: Stefan Hajnoczi The existing short PRDT test case does not transfer any data because the first PRD is less than 1 sector. This patch adds another short PRDT test case where the first sector can be read but the PRDT is still smaller than the requested number of sectors. This exercises a different code path in ide_dma_cb(). Cc: John Snow Signed-off-by: Stefan Hajnoczi Reviewed-by: John Snow Message-id: 1435770571-9906-1-git-send-email-stefanha@redhat.com Signed-off-by: John Snow --- tests/ide-test.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/tests/ide-test.c b/tests/ide-test.c index 78382e9..4a07e3a 100644 --- a/tests/ide-test.c +++ b/tests/ide-test.c @@ -339,6 +339,31 @@ static void test_bmdma_short_prdt(void) assert_bit_clear(inb(IDE_BASE + reg_status), DF | ERR); } +static void test_bmdma_one_sector_short_prdt(void) +{ + uint8_t status; + + /* Read 2 sectors but only give 1 sector in PRDT */ + PrdtEntry prdt[] = { + { + .addr = 0, + .size = cpu_to_le32(0x200 | PRDT_EOT), + }, + }; + + /* Normal request */ + status = send_dma_request(CMD_READ_DMA, 0, 2, + prdt, ARRAY_SIZE(prdt)); + g_assert_cmphex(status, ==, 0); + assert_bit_clear(inb(IDE_BASE + reg_status), DF | ERR); + + /* Abort the request before it completes */ + status = send_dma_request(CMD_READ_DMA | CMDF_ABORT, 0, 2, + prdt, ARRAY_SIZE(prdt)); + g_assert_cmphex(status, ==, 0); + assert_bit_clear(inb(IDE_BASE + reg_status), DF | ERR); +} + static void test_bmdma_long_prdt(void) { uint8_t status; @@ -592,6 +617,8 @@ int main(int argc, char **argv) qtest_add_func("/ide/bmdma/setup", test_bmdma_setup); qtest_add_func("/ide/bmdma/simple_rw", test_bmdma_simple_rw); qtest_add_func("/ide/bmdma/short_prdt", test_bmdma_short_prdt); + qtest_add_func("/ide/bmdma/one_sector_short_prdt", + test_bmdma_one_sector_short_prdt); qtest_add_func("/ide/bmdma/long_prdt", test_bmdma_long_prdt); qtest_add_func("/ide/bmdma/no_busmaster", test_bmdma_no_busmaster); qtest_add_func("/ide/bmdma/teardown", test_bmdma_teardown); -- 2.1.0