[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 17/17] qtest/ide: Test flush / retry for ISA
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PATCH v2 17/17] qtest/ide: Test flush / retry for ISA and PCI |
Date: |
Fri, 30 Jan 2015 10:37:45 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 |
On 17/12/2014 02:36, John Snow wrote:
> This patch adds tests for werror and rerror functionality
> for the PCI and ISA ide buses.
>
> Tests for the AHCI device are to be included at a later
> date after requisite patches have been merged upstream
> to support needed functionality by the tests.
>
> Signed-off-by: Paolo Bonzini <address@hidden>
> Signed-off-by: John Snow <address@hidden>
> ---
> tests/ide-test.c | 20 +++++++++++++++-----
> 1 file changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/tests/ide-test.c b/tests/ide-test.c
> index 29f4039..b28a302 100644
> --- a/tests/ide-test.c
> +++ b/tests/ide-test.c
> @@ -118,7 +118,6 @@ static void ide_test_start(const char *cmdline_fmt, ...)
> va_end(ap);
>
> qtest_start(cmdline);
> - qtest_irq_intercept_in(global_qtest, "ioapic");
> guest_malloc = pc_alloc_init();
>
> g_free(cmdline);
> @@ -388,6 +387,7 @@ static void test_bmdma_setup(void)
> "-drive file=%s,if=ide,serial=%s,cache=writeback,format=raw "
> "-global ide-hd.ver=%s",
> tmp_path, "testdisk", "version");
> + qtest_irq_intercept_in(global_qtest, "ioapic");
> }
>
> static void test_bmdma_teardown(void)
> @@ -516,7 +516,7 @@ static void prepare_blkdebug_script(const char *debug_fn,
> const char *event)
> g_assert(ret == 0);
> }
>
> -static void test_retry_flush(void)
> +static void test_retry_flush(const char *machine)
> {
> uint8_t data;
> const char *s;
> @@ -580,6 +580,16 @@ static void test_flush_nodev(void)
> ide_test_quit();
> }
>
> +static void test_pci_retry_flush(const char *machine)
> +{
> + test_retry_flush("pc");
> +}
> +
> +static void test_isa_retry_flush(const char *machine)
> +{
> + test_retry_flush("isapc");
> +}
> +
> int main(int argc, char **argv)
> {
> const char *arch = qtest_get_arch();
> @@ -617,9 +627,9 @@ int main(int argc, char **argv)
> qtest_add_func("/ide/bmdma/teardown", test_bmdma_teardown);
>
> qtest_add_func("/ide/flush", test_flush);
> - qtest_add_func("/ide/flush_nodev", test_flush_nodev);
> -
> - qtest_add_func("/ide/retry/flush", test_retry_flush);
> + qtest_add_func("/ide/flush/nodev", test_flush_nodev);
> + qtest_add_func("/ide/flush/retry_pci", test_pci_retry_flush);
> + qtest_add_func("/ide/flush/retry_isa", test_isa_retry_flush);
>
> ret = g_test_run();
>
>
Quite different from my original version, so:
Reviewed-by: Paolo Bonzini <address@hidden>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [Qemu-devel] [PATCH v2 17/17] qtest/ide: Test flush / retry for ISA and PCI,
Paolo Bonzini <=