Kill global_qtest in endianess, boot-order and pnv-xscom
cover Kill global_qtest in endianess, boot-order and pnv-xscom
It's very cumbersome to run multiple instances of QEMU in tests where this is required (e.g. in migration tests) when the test state is tracked in a global variable, so we should get rid of global_qtest in the long run. This series removes the dependency on this unwanted global_qtest variable in the endianess-test, boot-order-test and pnv-xscom-test.
Thomas Huth (3):
tests/endianesss: Make test independent of global_qtest tests/boot-order: Make test independent of global_qtest tests/pnv-xscom: Make test independent of global_qtest
tests/boot-order-test.c | 59 +++++---- tests/endianness-test.c | 329 ++++++++++++++++++++++++------------------------ tests/pnv-xscom-test.c | 29 ++--- 3 files changed, 210 insertions(+), 207 deletions(-)
Signature · 1 line
1.8.3.1
PATCH 1/3 tests/endianesss: Make test independent of global_qtest
Pass around the test state explicitly, to be able to use the qtest_in*() and qtest_out*() function in this test.
--- tests/endianness-test.c | 329 ++++++++++++++++++++++++------------------------ 1 file changed, 166 insertions(+), 163 deletions(-)
tests/endianness-test.c +166 -163
@@ -48,65 +48,68 @@ static const TestCase test_cases[] = { {} }; -static uint8_t isa_inb (const TestCase *test,uint16_t addr) +static uint8_t isa_inb (QTestState *qts,const TestCase *test,uint16_t addr) {uint8_t value;if (test->isa_base ==-1 ) { - value =inb (addr); + value =qtest_inb (qts, addr); }else { - value =readb (test->isa_base + addr); + value =qtest_readb (qts, test->isa_base + addr); }return value; } -static uint16_t isa_inw (const TestCase *test,uint16_t addr) +static uint16_t isa_inw (QTestState *qts,const TestCase *test,uint16_t addr) {uint16_t value;if (test->isa_base ==-1 ) { - value =inw (addr); + value =qtest_inw (qts, addr); }else { - value =readw (test->isa_base + addr); + value =qtest_readw (qts, test->isa_base + addr); }return test->bswap ?bswap16 (value) : value; } -static uint32_t isa_inl (const TestCase *test,uint16_t addr) +static uint32_t isa_inl (QTestState *qts,const TestCase *test,uint16_t addr) {uint32_t value;if (test->isa_base ==-1 ) { - value =inl (addr); + value =qtest_inl (qts, addr); }else { - value =readl (test->isa_base + addr); + value =qtest_readl (qts, test->isa_base + addr); }return test->bswap ?bswap32 (value) : value; } -static void isa_outb (const TestCase *test,uint16_t addr,uint8_t value) +static void isa_outb (QTestState *qts,const TestCase *test,uint16_t addr, +uint8_t value) {if (test->isa_base ==-1 ) { -outb (addr, value); +qtest_outb (qts, addr, value); }else { -writeb (test->isa_base + addr, value); +qtest_writeb (qts, test->isa_base + addr, value); } } -static void isa_outw (const TestCase *test,uint16_t addr,uint16_t value) +static void isa_outw (QTestState *qts,const TestCase *test,uint16_t addr, +uint16_t value) { value = test->bswap ?bswap16 (value) : value;if (test->isa_base ==-1 ) { -outw (addr, value); +qtest_outw (qts, addr, value); }else { -writew (test->isa_base + addr, value); +qtest_writew (qts, test->isa_base + addr, value); } } -static void isa_outl (const TestCase *test,uint16_t addr,uint32_t value) +static void isa_outl (QTestState *qts,const TestCase *test,uint16_t addr, +uint32_t value) { value = test->bswap ?bswap32 (value) : value;if (test->isa_base ==-1 ) { -outl (addr, value); +qtest_outl (qts, addr, value); }else { -writel (test->isa_base + addr, value); +qtest_writel (qts, test->isa_base + addr, value); } }
@@ -114,161 +117,161 @@ static void isa_outl(const TestCase *test, uint16_t addr, uint32_t value)static void test_endianness (gconstpointer data) {const TestCase *test = data; - - global_qtest =qtest_initf ("-M %s%s%s -device pc-testdev" , - test->machine, - test->superio ?" -device " :"" , - test->superio ?:"" ); -isa_outl (test,0xe0 ,0x87654321 ); - g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x87654321); - g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4321); - g_assert_cmphex(isa_inb(test, 0xe3), ==, 0x87); - g_assert_cmphex(isa_inb(test, 0xe2), ==, 0x65); - g_assert_cmphex(isa_inb(test, 0xe1), ==, 0x43); - g_assert_cmphex(isa_inb(test, 0xe0), ==, 0x21); - -isa_outw (test,0xe2 ,0x8866 ); - g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x88664321); - g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8866); - g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4321); - g_assert_cmphex(isa_inb(test, 0xe3), ==, 0x88); - g_assert_cmphex(isa_inb(test, 0xe2), ==, 0x66); - g_assert_cmphex(isa_inb(test, 0xe1), ==, 0x43); - g_assert_cmphex(isa_inb(test, 0xe0), ==, 0x21); - -isa_outw (test,0xe0 ,0x4422 ); - g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x88664422); - g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8866); - g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4422); - g_assert_cmphex(isa_inb(test, 0xe3), ==, 0x88); - g_assert_cmphex(isa_inb(test, 0xe2), ==, 0x66); - g_assert_cmphex(isa_inb(test, 0xe1), ==, 0x44); - g_assert_cmphex(isa_inb(test, 0xe0), ==, 0x22); - -isa_outb (test,0xe3 ,0x87 ); - g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x87664422); - g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8766); - g_assert_cmphex(isa_inb(test, 0xe3), ==, 0x87); - g_assert_cmphex(isa_inb(test, 0xe2), ==, 0x66); - g_assert_cmphex(isa_inb(test, 0xe1), ==, 0x44); - g_assert_cmphex(isa_inb(test, 0xe0), ==, 0x22); - -isa_outb (test,0xe2 ,0x65 ); - g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x87654422); - g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4422); - g_assert_cmphex(isa_inb(test, 0xe3), ==, 0x87); - g_assert_cmphex(isa_inb(test, 0xe2), ==, 0x65); - g_assert_cmphex(isa_inb(test, 0xe1), ==, 0x44); - g_assert_cmphex(isa_inb(test, 0xe0), ==, 0x22); - -isa_outb (test,0xe1 ,0x43 ); - g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x87654322); - g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4322); - g_assert_cmphex(isa_inb(test, 0xe3), ==, 0x87); - g_assert_cmphex(isa_inb(test, 0xe2), ==, 0x65); - g_assert_cmphex(isa_inb(test, 0xe1), ==, 0x43); - g_assert_cmphex(isa_inb(test, 0xe0), ==, 0x22); - -isa_outb (test,0xe0 ,0x21 ); - g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x87654321); - g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4321); - g_assert_cmphex(isa_inb(test, 0xe3), ==, 0x87); - g_assert_cmphex(isa_inb(test, 0xe2), ==, 0x65); - g_assert_cmphex(isa_inb(test, 0xe1), ==, 0x43); - g_assert_cmphex(isa_inb(test, 0xe0), ==, 0x21); -qtest_quit (global_qtest); +QTestState *qts; + + qts =qtest_initf ("-M %s%s%s -device pc-testdev" , test->machine, + test->superio ?" -device " :"" , + test->superio ?:"" ); +isa_outl (qts, test,0xe0 ,0x87654321 ); + g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x87654321); + g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4321); + g_assert_cmphex(isa_inb(qts, test, 0xe3), ==, 0x87); + g_assert_cmphex(isa_inb(qts, test, 0xe2), ==, 0x65); + g_assert_cmphex(isa_inb(qts, test, 0xe1), ==, 0x43); + g_assert_cmphex(isa_inb(qts, test, 0xe0), ==, 0x21); + +isa_outw (qts, test,0xe2 ,0x8866 ); + g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x88664321); + g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8866); + g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4321); + g_assert_cmphex(isa_inb(qts, test, 0xe3), ==, 0x88); + g_assert_cmphex(isa_inb(qts, test, 0xe2), ==, 0x66); + g_assert_cmphex(isa_inb(qts, test, 0xe1), ==, 0x43); + g_assert_cmphex(isa_inb(qts, test, 0xe0), ==, 0x21); + +isa_outw (qts, test,0xe0 ,0x4422 ); + g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x88664422); + g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8866); + g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4422); + g_assert_cmphex(isa_inb(qts, test, 0xe3), ==, 0x88); + g_assert_cmphex(isa_inb(qts, test, 0xe2), ==, 0x66); + g_assert_cmphex(isa_inb(qts, test, 0xe1), ==, 0x44); + g_assert_cmphex(isa_inb(qts, test, 0xe0), ==, 0x22); + +isa_outb (qts, test,0xe3 ,0x87 ); + g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x87664422); + g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8766); + g_assert_cmphex(isa_inb(qts, test, 0xe3), ==, 0x87); + g_assert_cmphex(isa_inb(qts, test, 0xe2), ==, 0x66); + g_assert_cmphex(isa_inb(qts, test, 0xe1), ==, 0x44); + g_assert_cmphex(isa_inb(qts, test, 0xe0), ==, 0x22); + +isa_outb (qts, test,0xe2 ,0x65 ); + g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x87654422); + g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4422); + g_assert_cmphex(isa_inb(qts, test, 0xe3), ==, 0x87); + g_assert_cmphex(isa_inb(qts, test, 0xe2), ==, 0x65); + g_assert_cmphex(isa_inb(qts, test, 0xe1), ==, 0x44); + g_assert_cmphex(isa_inb(qts, test, 0xe0), ==, 0x22); + +isa_outb (qts, test,0xe1 ,0x43 ); + g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x87654322); + g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4322); + g_assert_cmphex(isa_inb(qts, test, 0xe3), ==, 0x87); + g_assert_cmphex(isa_inb(qts, test, 0xe2), ==, 0x65); + g_assert_cmphex(isa_inb(qts, test, 0xe1), ==, 0x43); + g_assert_cmphex(isa_inb(qts, test, 0xe0), ==, 0x22); + +isa_outb (qts, test,0xe0 ,0x21 ); + g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x87654321); + g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4321); + g_assert_cmphex(isa_inb(qts, test, 0xe3), ==, 0x87); + g_assert_cmphex(isa_inb(qts, test, 0xe2), ==, 0x65); + g_assert_cmphex(isa_inb(qts, test, 0xe1), ==, 0x43); + g_assert_cmphex(isa_inb(qts, test, 0xe0), ==, 0x21); +qtest_quit (qts); }static void test_endianness_split (gconstpointer data) {const TestCase *test = data; - - global_qtest =qtest_initf ("-M %s%s%s -device pc-testdev" , - test->machine, - test->superio ?" -device " :"" , - test->superio ?:"" ); -isa_outl (test,0xe8 ,0x87654321 ); - g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x87654321); - g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4321); - -isa_outw (test,0xea ,0x8866 ); - g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x88664321); - g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8866); - g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4321); - -isa_outw (test,0xe8 ,0x4422 ); - g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x88664422); - g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8866); - g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4422); - -isa_outb (test,0xeb ,0x87 ); - g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x87664422); - g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8766); - -isa_outb (test,0xea ,0x65 ); - g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x87654422); - g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4422); - -isa_outb (test,0xe9 ,0x43 ); - g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x87654322); - g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4322); - -isa_outb (test,0xe8 ,0x21 ); - g_assert_cmphex(isa_inl(test, 0xe0), ==, 0x87654321); - g_assert_cmphex(isa_inw(test, 0xe2), ==, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe0), ==, 0x4321); -qtest_quit (global_qtest); +QTestState *qts; + + qts =qtest_initf ("-M %s%s%s -device pc-testdev" , test->machine, + test->superio ?" -device " :"" , + test->superio ?:"" ); +isa_outl (qts, test,0xe8 ,0x87654321 ); + g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x87654321); + g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4321); + +isa_outw (qts, test,0xea ,0x8866 ); + g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x88664321); + g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8866); + g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4321); + +isa_outw (qts, test,0xe8 ,0x4422 ); + g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x88664422); + g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8866); + g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4422); + +isa_outb (qts, test,0xeb ,0x87 ); + g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x87664422); + g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8766); + +isa_outb (qts, test,0xea ,0x65 ); + g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x87654422); + g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4422); + +isa_outb (qts, test,0xe9 ,0x43 ); + g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x87654322); + g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4322); + +isa_outb (qts, test,0xe8 ,0x21 ); + g_assert_cmphex(isa_inl(qts, test, 0xe0), ==, 0x87654321); + g_assert_cmphex(isa_inw(qts, test, 0xe2), ==, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe0), ==, 0x4321); +qtest_quit (qts); }static void test_endianness_combine (gconstpointer data) {const TestCase *test = data; - - global_qtest =qtest_initf ("-M %s%s%s -device pc-testdev" , - test->machine, - test->superio ?" -device " :"" , - test->superio ?:"" ); -isa_outl (test,0xe0 ,0x87654321 ); - g_assert_cmphex(isa_inl(test, 0xe8), ==, 0x87654321); - g_assert_cmphex(isa_inw(test, 0xea), ==, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe8), ==, 0x4321); - -isa_outw (test,0xe2 ,0x8866 ); - g_assert_cmphex(isa_inl(test, 0xe8), ==, 0x88664321); - g_assert_cmphex(isa_inw(test, 0xea), ==, 0x8866); - g_assert_cmphex(isa_inw(test, 0xe8), ==, 0x4321); - -isa_outw (test,0xe0 ,0x4422 ); - g_assert_cmphex(isa_inl(test, 0xe8), ==, 0x88664422); - g_assert_cmphex(isa_inw(test, 0xea), ==, 0x8866); - g_assert_cmphex(isa_inw(test, 0xe8), ==, 0x4422); - -isa_outb (test,0xe3 ,0x87 ); - g_assert_cmphex(isa_inl(test, 0xe8), ==, 0x87664422); - g_assert_cmphex(isa_inw(test, 0xea), ==, 0x8766); - -isa_outb (test,0xe2 ,0x65 ); - g_assert_cmphex(isa_inl(test, 0xe8), ==, 0x87654422); - g_assert_cmphex(isa_inw(test, 0xea), ==, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe8), ==, 0x4422); - -isa_outb (test,0xe1 ,0x43 ); - g_assert_cmphex(isa_inl(test, 0xe8), ==, 0x87654322); - g_assert_cmphex(isa_inw(test, 0xea), ==, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe8), ==, 0x4322); - -isa_outb (test,0xe0 ,0x21 ); - g_assert_cmphex(isa_inl(test, 0xe8), ==, 0x87654321); - g_assert_cmphex(isa_inw(test, 0xea), ==, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe8), ==, 0x4321); -qtest_quit (global_qtest); +QTestState *qts; + + qts =qtest_initf ("-M %s%s%s -device pc-testdev" , test->machine, + test->superio ?" -device " :"" , + test->superio ?:"" ); +isa_outl (qts, test,0xe0 ,0x87654321 ); + g_assert_cmphex(isa_inl(qts, test, 0xe8), ==, 0x87654321); + g_assert_cmphex(isa_inw(qts, test, 0xea), ==, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe8), ==, 0x4321); + +isa_outw (qts, test,0xe2 ,0x8866 ); + g_assert_cmphex(isa_inl(qts, test, 0xe8), ==, 0x88664321); + g_assert_cmphex(isa_inw(qts, test, 0xea), ==, 0x8866); + g_assert_cmphex(isa_inw(qts, test, 0xe8), ==, 0x4321); + +isa_outw (qts, test,0xe0 ,0x4422 ); + g_assert_cmphex(isa_inl(qts, test, 0xe8), ==, 0x88664422); + g_assert_cmphex(isa_inw(qts, test, 0xea), ==, 0x8866); + g_assert_cmphex(isa_inw(qts, test, 0xe8), ==, 0x4422); + +isa_outb (qts, test,0xe3 ,0x87 ); + g_assert_cmphex(isa_inl(qts, test, 0xe8), ==, 0x87664422); + g_assert_cmphex(isa_inw(qts, test, 0xea), ==, 0x8766); + +isa_outb (qts, test,0xe2 ,0x65 ); + g_assert_cmphex(isa_inl(qts, test, 0xe8), ==, 0x87654422); + g_assert_cmphex(isa_inw(qts, test, 0xea), ==, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe8), ==, 0x4422); + +isa_outb (qts, test,0xe1 ,0x43 ); + g_assert_cmphex(isa_inl(qts, test, 0xe8), ==, 0x87654322); + g_assert_cmphex(isa_inw(qts, test, 0xea), ==, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe8), ==, 0x4322); + +isa_outb (qts, test,0xe0 ,0x21 ); + g_assert_cmphex(isa_inl(qts, test, 0xe8), ==, 0x87654321); + g_assert_cmphex(isa_inw(qts, test, 0xea), ==, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe8), ==, 0x4321); +qtest_quit (qts); }int main (int argc,char **argv)
Signature · 1 line
1.8.3.1
PATCH 2/3 tests/boot-order: Make test independent of global_qtest
In reply to Thomas HuthPass around the QTestState from function to function, so that we can finally get rid of the out-of-favor global_qtest variable in this file, too.
--- tests/boot-order-test.c | 59 ++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 30 deletions(-)
tests/boot-order-test.c +29 -30
@@ -17,7 +17,7 @@#include "standard-headers/linux/qemu_fw_cfg.h" /* TODO actually test the results and get rid of this */ -#define qmp_discard_response (...) qobject_unref(qmp(__VA_ARGS__)) +#define qmp_discard_response (qs, ...) qobject_unref(qtest_qmp(qs, __VA_ARGS__)) typedef struct { const char *args;
@@ -27,31 +27,30 @@ typedef struct {static void test_a_boot_order (const char *machine,const char *test_args, -uint64_t (*read_boot_order)(void ), +uint64_t (*read_boot_order)(QTestState *),uint64_t expected_boot,uint64_t expected_reboot) {uint64_t actual; +QTestState *qts; - global_qtest =qtest_initf ("-nodefaults%s%s %s" , - machine ?" -M " :"" , - machine ?:"" , - test_args); - actual =read_boot_order (); + qts =qtest_initf ("-nodefaults%s%s %s" , machine ?" -M " :"" , + machine ?:"" , test_args); + actual =read_boot_order (qts); g_assert_cmphex(actual, ==, expected_boot); -qmp_discard_response ("{ 'execute': 'system_reset' }" ); +qmp_discard_response (qts,"{ 'execute': 'system_reset' }" );/* * system_reset only requests reset. We get a RESET event after * the actual reset completes. Need to wait for that. */ -qmp_eventwait ("RESET" ); - actual =read_boot_order (); +qtest_qmp_eventwait (qts,"RESET" ); + actual =read_boot_order (qts); g_assert_cmphex(actual, ==, expected_reboot); -qtest_quit (global_qtest); +qtest_quit (qts); }static void test_boot_orders (const char *machine, -uint64_t (*read_boot_order)(void ), +uint64_t (*read_boot_order)(QTestState *),const boot_order_test *tests) {int i;
@@ -64,16 +63,16 @@ static void test_boot_orders(const char *machine, } } -static uint8_t read_mc146818 (uint16_t port,uint8_t reg) +static uint8_t read_mc146818 (QTestState *qts,uint16_t port,uint8_t reg) { -outb (port, reg); -return inb (port +1 ); +qtest_outb (qts, port, reg); +return qtest_inb (qts, port +1 ); } -static uint64_t read_boot_order_pc (void ) +static uint64_t read_boot_order_pc (QTestState *qts) { -uint8_t b1 =read_mc146818 (0x70 ,0x38 ); -uint8_t b2 =read_mc146818 (0x70 ,0x3d ); +uint8_t b1 =read_mc146818 (qts,0x70 ,0x38 ); +uint8_t b2 =read_mc146818 (qts,0x70 ,0x3d );return b1 | (b2 <<8 ); }
@@ -109,16 +108,16 @@ static void test_pc_boot_order(void)test_boot_orders (NULL , read_boot_order_pc, test_cases_pc); } -static uint8_t read_m48t59 (uint64_t addr,uint16_t reg) +static uint8_t read_m48t59 (QTestState *qts,uint64_t addr,uint16_t reg) { -writeb (addr, reg &0xff ); -writeb (addr +1 , reg >>8 ); -return readb (addr +3 ); +qtest_writeb (qts, addr, reg &0xff ); +qtest_writeb (qts, addr +1 , reg >>8 ); +return qtest_readb (qts, addr +3 ); } -static uint64_t read_boot_order_prep (void ) +static uint64_t read_boot_order_prep (QTestState *qts) { -return read_m48t59 (0x80000000 +0x74 ,0x34 ); +return read_m48t59 (qts,0x80000000 +0x74 ,0x34 ); }static const boot_order_test test_cases_prep[] = {
@@ -133,9 +132,9 @@ static void test_prep_boot_order(void)test_boot_orders ("prep" , read_boot_order_prep, test_cases_prep); } -static uint64_t read_boot_order_pmac (void ) +static uint64_t read_boot_order_pmac (QTestState *qts) { -QFWCFG *fw_cfg =mm_fw_cfg_init (global_qtest,0xf0000510 ); +QFWCFG *fw_cfg =mm_fw_cfg_init (qts,0xf0000510 );return qfw_cfg_get_u16 (fw_cfg,FW_CFG_BOOT_DEVICE ); }
@@ -158,9 +157,9 @@ static void test_pmac_newworld_boot_order(void)test_boot_orders ("mac99" , read_boot_order_pmac, test_cases_fw_cfg); } -static uint64_t read_boot_order_sun4m (void ) +static uint64_t read_boot_order_sun4m (QTestState *qts) { -QFWCFG *fw_cfg =mm_fw_cfg_init (global_qtest,0xd00000510ULL ); +QFWCFG *fw_cfg =mm_fw_cfg_init (qts,0xd00000510ULL );return qfw_cfg_get_u16 (fw_cfg,FW_CFG_BOOT_DEVICE ); }
@@ -170,9 +169,9 @@ static void test_sun4m_boot_order(void)test_boot_orders ("SS-5" , read_boot_order_sun4m, test_cases_fw_cfg); } -static uint64_t read_boot_order_sun4u (void ) +static uint64_t read_boot_order_sun4u (QTestState *qts) { -QFWCFG *fw_cfg =io_fw_cfg_init (global_qtest,0x510 ); +QFWCFG *fw_cfg =io_fw_cfg_init (qts,0x510 );return qfw_cfg_get_u16 (fw_cfg,FW_CFG_BOOT_DEVICE ); }
Signature · 1 line
1.8.3.1
PATCH 3/3 tests/pnv-xscom: Make test independent of global_qtest
In reply to Thomas HuthPass around the QTestState, so that we can finally get rid of the out-of-favor global_qtest variable in this file, too.
--- tests/pnv-xscom-test.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-)
tests/pnv-xscom-test.c +15 -14
@@ -63,14 +63,15 @@ static uint64_t pnv_xscom_addr(const PnvChip *chip, uint32_t pcba)return addr; } -static uint64_t pnv_xscom_read (const PnvChip *chip,uint32_t pcba) +static uint64_t pnv_xscom_read (QTestState *qts,const PnvChip *chip, +uint32_t pcba) { -return readq (pnv_xscom_addr (chip, pcba)); +return qtest_readq (qts,pnv_xscom_addr (chip, pcba)); } -static void test_xscom_cfam_id (const PnvChip *chip) +static void test_xscom_cfam_id (QTestState *qts,const PnvChip *chip) { -uint64_t f000f =pnv_xscom_read (chip,0xf000f ); +uint64_t f000f =pnv_xscom_read (qts, chip,0xf000f ); g_assert_cmphex(f000f, ==, chip->cfam_id); }
@@ -78,11 +79,11 @@ static void test_xscom_cfam_id(const PnvChip *chip)static void test_cfam_id (const void *data) {const PnvChip *chip = data; +QTestState *qts; - global_qtest =qtest_initf ("-M powernv,accel=tcg -cpu %s" , - chip->cpu_model); -test_xscom_cfam_id (chip); -qtest_quit (global_qtest); + qts =qtest_initf ("-M powernv,accel=tcg -cpu %s" , chip->cpu_model); +test_xscom_cfam_id (qts, chip); +qtest_quit (qts); }
@@ -94,7 +95,7 @@ static void test_cfam_id(const void *data)#define PNV_XSCOM_EX_DTS_RESULT0 0x50000 -static void test_xscom_core (const PnvChip *chip) +static void test_xscom_core (QTestState *qts,const PnvChip *chip) {uint32_t first_core_dts0 =PNV_XSCOM_EX_DTS_RESULT0 ;uint64_t dts0;
@@ -105,7 +106,7 @@ static void test_xscom_core(const PnvChip *chip) first_core_dts0 |=PNV_XSCOM_P9_EC_BASE (chip->first_core); } - dts0 =pnv_xscom_read (chip, first_core_dts0); + dts0 =pnv_xscom_read (qts, chip, first_core_dts0); g_assert_cmphex(dts0, ==, 0x26f024f023f0000ull); }
@@ -113,11 +114,11 @@ static void test_xscom_core(const PnvChip *chip)static void test_core (const void *data) {const PnvChip *chip = data; +QTestState *qts; - global_qtest =qtest_initf ("-M powernv,accel=tcg -cpu %s" , - chip->cpu_model); -test_xscom_core (chip); -qtest_quit (global_qtest); + qts =qtest_initf ("-M powernv,accel=tcg -cpu %s" , chip->cpu_model); +test_xscom_core (qts, chip); +qtest_quit (qts); }static void add_test (const char *name,void (*test)(const void *data))
Signature · 1 line
1.8.3.1