From nobody Fri Nov 7 03:35:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=listsout.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from listsout.gnu.org (listsout.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1546513926342619.3733851487351; Thu, 3 Jan 2019 03:12:06 -0800 (PST) Received: from localhost ([127.0.0.1]:52199 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gf0uu-0004tS-0A for importer@patchew.org; Thu, 03 Jan 2019 06:12:00 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39591) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gf0t2-0003Ie-2X for qemu-devel@nongnu.org; Thu, 03 Jan 2019 06:10:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gf0sx-0001xi-Rw for qemu-devel@nongnu.org; Thu, 03 Jan 2019 06:10:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46134) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gf0sx-0001wY-Bg for qemu-devel@nongnu.org; Thu, 03 Jan 2019 06:09:59 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F2415C047B69; Thu, 3 Jan 2019 11:09:57 +0000 (UTC) Received: from thuth.com (dhcp-200-199.str.redhat.com [10.33.200.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id D5A9260BEC; Thu, 3 Jan 2019 11:09:56 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Laurent Vivier Date: Thu, 3 Jan 2019 12:09:50 +0100 Message-Id: <1546513792-17773-2-git-send-email-thuth@redhat.com> In-Reply-To: <1546513792-17773-1-git-send-email-thuth@redhat.com> References: <1546513792-17773-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 03 Jan 2019 11:09:58 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/3] tests/endianesss: Make test independent of global_qtest X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Pass around the test state explicitly, to be able to use the qtest_in*() and qtest_out*() function in this test. Signed-off-by: Thomas Huth --- tests/endianness-test.c | 329 ++++++++++++++++++++++++--------------------= ---- 1 file changed, 166 insertions(+), 163 deletions(-) diff --git a/tests/endianness-test.c b/tests/endianness-test.c index 48680cd..5852795 100644 --- a/tests/endianness-test.c +++ b/tests/endianness-test.c @@ -48,65 +48,68 @@ static const TestCase test_cases[] =3D { {} }; =20 -static uint8_t isa_inb(const TestCase *test, uint16_t addr) +static uint8_t isa_inb(QTestState *qts, const TestCase *test, uint16_t add= r) { uint8_t value; if (test->isa_base =3D=3D -1) { - value =3D inb(addr); + value =3D qtest_inb(qts, addr); } else { - value =3D readb(test->isa_base + addr); + value =3D qtest_readb(qts, test->isa_base + addr); } return value; } =20 -static uint16_t isa_inw(const TestCase *test, uint16_t addr) +static uint16_t isa_inw(QTestState *qts, const TestCase *test, uint16_t ad= dr) { uint16_t value; if (test->isa_base =3D=3D -1) { - value =3D inw(addr); + value =3D qtest_inw(qts, addr); } else { - value =3D readw(test->isa_base + addr); + value =3D qtest_readw(qts, test->isa_base + addr); } return test->bswap ? bswap16(value) : value; } =20 -static uint32_t isa_inl(const TestCase *test, uint16_t addr) +static uint32_t isa_inl(QTestState *qts, const TestCase *test, uint16_t ad= dr) { uint32_t value; if (test->isa_base =3D=3D -1) { - value =3D inl(addr); + value =3D qtest_inl(qts, addr); } else { - value =3D readl(test->isa_base + addr); + value =3D qtest_readl(qts, test->isa_base + addr); } return test->bswap ? bswap32(value) : value; } =20 -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 =3D=3D -1) { - outb(addr, value); + qtest_outb(qts, addr, value); } else { - writeb(test->isa_base + addr, value); + qtest_writeb(qts, test->isa_base + addr, value); } } =20 -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 =3D test->bswap ? bswap16(value) : value; if (test->isa_base =3D=3D -1) { - outw(addr, value); + qtest_outw(qts, addr, value); } else { - writew(test->isa_base + addr, value); + qtest_writew(qts, test->isa_base + addr, value); } } =20 -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 =3D test->bswap ? bswap32(value) : value; if (test->isa_base =3D=3D -1) { - outl(addr, value); + qtest_outl(qts, addr, value); } else { - writel(test->isa_base + addr, value); + qtest_writel(qts, test->isa_base + addr, value); } } =20 @@ -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 =3D data; - - global_qtest =3D 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), =3D=3D, 0x87654321); - g_assert_cmphex(isa_inw(test, 0xe2), =3D=3D, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe0), =3D=3D, 0x4321); - g_assert_cmphex(isa_inb(test, 0xe3), =3D=3D, 0x87); - g_assert_cmphex(isa_inb(test, 0xe2), =3D=3D, 0x65); - g_assert_cmphex(isa_inb(test, 0xe1), =3D=3D, 0x43); - g_assert_cmphex(isa_inb(test, 0xe0), =3D=3D, 0x21); - - isa_outw(test, 0xe2, 0x8866); - g_assert_cmphex(isa_inl(test, 0xe0), =3D=3D, 0x88664321); - g_assert_cmphex(isa_inw(test, 0xe2), =3D=3D, 0x8866); - g_assert_cmphex(isa_inw(test, 0xe0), =3D=3D, 0x4321); - g_assert_cmphex(isa_inb(test, 0xe3), =3D=3D, 0x88); - g_assert_cmphex(isa_inb(test, 0xe2), =3D=3D, 0x66); - g_assert_cmphex(isa_inb(test, 0xe1), =3D=3D, 0x43); - g_assert_cmphex(isa_inb(test, 0xe0), =3D=3D, 0x21); - - isa_outw(test, 0xe0, 0x4422); - g_assert_cmphex(isa_inl(test, 0xe0), =3D=3D, 0x88664422); - g_assert_cmphex(isa_inw(test, 0xe2), =3D=3D, 0x8866); - g_assert_cmphex(isa_inw(test, 0xe0), =3D=3D, 0x4422); - g_assert_cmphex(isa_inb(test, 0xe3), =3D=3D, 0x88); - g_assert_cmphex(isa_inb(test, 0xe2), =3D=3D, 0x66); - g_assert_cmphex(isa_inb(test, 0xe1), =3D=3D, 0x44); - g_assert_cmphex(isa_inb(test, 0xe0), =3D=3D, 0x22); - - isa_outb(test, 0xe3, 0x87); - g_assert_cmphex(isa_inl(test, 0xe0), =3D=3D, 0x87664422); - g_assert_cmphex(isa_inw(test, 0xe2), =3D=3D, 0x8766); - g_assert_cmphex(isa_inb(test, 0xe3), =3D=3D, 0x87); - g_assert_cmphex(isa_inb(test, 0xe2), =3D=3D, 0x66); - g_assert_cmphex(isa_inb(test, 0xe1), =3D=3D, 0x44); - g_assert_cmphex(isa_inb(test, 0xe0), =3D=3D, 0x22); - - isa_outb(test, 0xe2, 0x65); - g_assert_cmphex(isa_inl(test, 0xe0), =3D=3D, 0x87654422); - g_assert_cmphex(isa_inw(test, 0xe2), =3D=3D, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe0), =3D=3D, 0x4422); - g_assert_cmphex(isa_inb(test, 0xe3), =3D=3D, 0x87); - g_assert_cmphex(isa_inb(test, 0xe2), =3D=3D, 0x65); - g_assert_cmphex(isa_inb(test, 0xe1), =3D=3D, 0x44); - g_assert_cmphex(isa_inb(test, 0xe0), =3D=3D, 0x22); - - isa_outb(test, 0xe1, 0x43); - g_assert_cmphex(isa_inl(test, 0xe0), =3D=3D, 0x87654322); - g_assert_cmphex(isa_inw(test, 0xe2), =3D=3D, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe0), =3D=3D, 0x4322); - g_assert_cmphex(isa_inb(test, 0xe3), =3D=3D, 0x87); - g_assert_cmphex(isa_inb(test, 0xe2), =3D=3D, 0x65); - g_assert_cmphex(isa_inb(test, 0xe1), =3D=3D, 0x43); - g_assert_cmphex(isa_inb(test, 0xe0), =3D=3D, 0x22); - - isa_outb(test, 0xe0, 0x21); - g_assert_cmphex(isa_inl(test, 0xe0), =3D=3D, 0x87654321); - g_assert_cmphex(isa_inw(test, 0xe2), =3D=3D, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe0), =3D=3D, 0x4321); - g_assert_cmphex(isa_inb(test, 0xe3), =3D=3D, 0x87); - g_assert_cmphex(isa_inb(test, 0xe2), =3D=3D, 0x65); - g_assert_cmphex(isa_inb(test, 0xe1), =3D=3D, 0x43); - g_assert_cmphex(isa_inb(test, 0xe0), =3D=3D, 0x21); - qtest_quit(global_qtest); + QTestState *qts; + + qts =3D 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), =3D=3D, 0x87654321); + g_assert_cmphex(isa_inw(qts, test, 0xe2), =3D=3D, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe0), =3D=3D, 0x4321); + g_assert_cmphex(isa_inb(qts, test, 0xe3), =3D=3D, 0x87); + g_assert_cmphex(isa_inb(qts, test, 0xe2), =3D=3D, 0x65); + g_assert_cmphex(isa_inb(qts, test, 0xe1), =3D=3D, 0x43); + g_assert_cmphex(isa_inb(qts, test, 0xe0), =3D=3D, 0x21); + + isa_outw(qts, test, 0xe2, 0x8866); + g_assert_cmphex(isa_inl(qts, test, 0xe0), =3D=3D, 0x88664321); + g_assert_cmphex(isa_inw(qts, test, 0xe2), =3D=3D, 0x8866); + g_assert_cmphex(isa_inw(qts, test, 0xe0), =3D=3D, 0x4321); + g_assert_cmphex(isa_inb(qts, test, 0xe3), =3D=3D, 0x88); + g_assert_cmphex(isa_inb(qts, test, 0xe2), =3D=3D, 0x66); + g_assert_cmphex(isa_inb(qts, test, 0xe1), =3D=3D, 0x43); + g_assert_cmphex(isa_inb(qts, test, 0xe0), =3D=3D, 0x21); + + isa_outw(qts, test, 0xe0, 0x4422); + g_assert_cmphex(isa_inl(qts, test, 0xe0), =3D=3D, 0x88664422); + g_assert_cmphex(isa_inw(qts, test, 0xe2), =3D=3D, 0x8866); + g_assert_cmphex(isa_inw(qts, test, 0xe0), =3D=3D, 0x4422); + g_assert_cmphex(isa_inb(qts, test, 0xe3), =3D=3D, 0x88); + g_assert_cmphex(isa_inb(qts, test, 0xe2), =3D=3D, 0x66); + g_assert_cmphex(isa_inb(qts, test, 0xe1), =3D=3D, 0x44); + g_assert_cmphex(isa_inb(qts, test, 0xe0), =3D=3D, 0x22); + + isa_outb(qts, test, 0xe3, 0x87); + g_assert_cmphex(isa_inl(qts, test, 0xe0), =3D=3D, 0x87664422); + g_assert_cmphex(isa_inw(qts, test, 0xe2), =3D=3D, 0x8766); + g_assert_cmphex(isa_inb(qts, test, 0xe3), =3D=3D, 0x87); + g_assert_cmphex(isa_inb(qts, test, 0xe2), =3D=3D, 0x66); + g_assert_cmphex(isa_inb(qts, test, 0xe1), =3D=3D, 0x44); + g_assert_cmphex(isa_inb(qts, test, 0xe0), =3D=3D, 0x22); + + isa_outb(qts, test, 0xe2, 0x65); + g_assert_cmphex(isa_inl(qts, test, 0xe0), =3D=3D, 0x87654422); + g_assert_cmphex(isa_inw(qts, test, 0xe2), =3D=3D, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe0), =3D=3D, 0x4422); + g_assert_cmphex(isa_inb(qts, test, 0xe3), =3D=3D, 0x87); + g_assert_cmphex(isa_inb(qts, test, 0xe2), =3D=3D, 0x65); + g_assert_cmphex(isa_inb(qts, test, 0xe1), =3D=3D, 0x44); + g_assert_cmphex(isa_inb(qts, test, 0xe0), =3D=3D, 0x22); + + isa_outb(qts, test, 0xe1, 0x43); + g_assert_cmphex(isa_inl(qts, test, 0xe0), =3D=3D, 0x87654322); + g_assert_cmphex(isa_inw(qts, test, 0xe2), =3D=3D, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe0), =3D=3D, 0x4322); + g_assert_cmphex(isa_inb(qts, test, 0xe3), =3D=3D, 0x87); + g_assert_cmphex(isa_inb(qts, test, 0xe2), =3D=3D, 0x65); + g_assert_cmphex(isa_inb(qts, test, 0xe1), =3D=3D, 0x43); + g_assert_cmphex(isa_inb(qts, test, 0xe0), =3D=3D, 0x22); + + isa_outb(qts, test, 0xe0, 0x21); + g_assert_cmphex(isa_inl(qts, test, 0xe0), =3D=3D, 0x87654321); + g_assert_cmphex(isa_inw(qts, test, 0xe2), =3D=3D, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe0), =3D=3D, 0x4321); + g_assert_cmphex(isa_inb(qts, test, 0xe3), =3D=3D, 0x87); + g_assert_cmphex(isa_inb(qts, test, 0xe2), =3D=3D, 0x65); + g_assert_cmphex(isa_inb(qts, test, 0xe1), =3D=3D, 0x43); + g_assert_cmphex(isa_inb(qts, test, 0xe0), =3D=3D, 0x21); + qtest_quit(qts); } =20 static void test_endianness_split(gconstpointer data) { const TestCase *test =3D data; - - global_qtest =3D 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), =3D=3D, 0x87654321); - g_assert_cmphex(isa_inw(test, 0xe2), =3D=3D, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe0), =3D=3D, 0x4321); - - isa_outw(test, 0xea, 0x8866); - g_assert_cmphex(isa_inl(test, 0xe0), =3D=3D, 0x88664321); - g_assert_cmphex(isa_inw(test, 0xe2), =3D=3D, 0x8866); - g_assert_cmphex(isa_inw(test, 0xe0), =3D=3D, 0x4321); - - isa_outw(test, 0xe8, 0x4422); - g_assert_cmphex(isa_inl(test, 0xe0), =3D=3D, 0x88664422); - g_assert_cmphex(isa_inw(test, 0xe2), =3D=3D, 0x8866); - g_assert_cmphex(isa_inw(test, 0xe0), =3D=3D, 0x4422); - - isa_outb(test, 0xeb, 0x87); - g_assert_cmphex(isa_inl(test, 0xe0), =3D=3D, 0x87664422); - g_assert_cmphex(isa_inw(test, 0xe2), =3D=3D, 0x8766); - - isa_outb(test, 0xea, 0x65); - g_assert_cmphex(isa_inl(test, 0xe0), =3D=3D, 0x87654422); - g_assert_cmphex(isa_inw(test, 0xe2), =3D=3D, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe0), =3D=3D, 0x4422); - - isa_outb(test, 0xe9, 0x43); - g_assert_cmphex(isa_inl(test, 0xe0), =3D=3D, 0x87654322); - g_assert_cmphex(isa_inw(test, 0xe2), =3D=3D, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe0), =3D=3D, 0x4322); - - isa_outb(test, 0xe8, 0x21); - g_assert_cmphex(isa_inl(test, 0xe0), =3D=3D, 0x87654321); - g_assert_cmphex(isa_inw(test, 0xe2), =3D=3D, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe0), =3D=3D, 0x4321); - qtest_quit(global_qtest); + QTestState *qts; + + qts =3D 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), =3D=3D, 0x87654321); + g_assert_cmphex(isa_inw(qts, test, 0xe2), =3D=3D, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe0), =3D=3D, 0x4321); + + isa_outw(qts, test, 0xea, 0x8866); + g_assert_cmphex(isa_inl(qts, test, 0xe0), =3D=3D, 0x88664321); + g_assert_cmphex(isa_inw(qts, test, 0xe2), =3D=3D, 0x8866); + g_assert_cmphex(isa_inw(qts, test, 0xe0), =3D=3D, 0x4321); + + isa_outw(qts, test, 0xe8, 0x4422); + g_assert_cmphex(isa_inl(qts, test, 0xe0), =3D=3D, 0x88664422); + g_assert_cmphex(isa_inw(qts, test, 0xe2), =3D=3D, 0x8866); + g_assert_cmphex(isa_inw(qts, test, 0xe0), =3D=3D, 0x4422); + + isa_outb(qts, test, 0xeb, 0x87); + g_assert_cmphex(isa_inl(qts, test, 0xe0), =3D=3D, 0x87664422); + g_assert_cmphex(isa_inw(qts, test, 0xe2), =3D=3D, 0x8766); + + isa_outb(qts, test, 0xea, 0x65); + g_assert_cmphex(isa_inl(qts, test, 0xe0), =3D=3D, 0x87654422); + g_assert_cmphex(isa_inw(qts, test, 0xe2), =3D=3D, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe0), =3D=3D, 0x4422); + + isa_outb(qts, test, 0xe9, 0x43); + g_assert_cmphex(isa_inl(qts, test, 0xe0), =3D=3D, 0x87654322); + g_assert_cmphex(isa_inw(qts, test, 0xe2), =3D=3D, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe0), =3D=3D, 0x4322); + + isa_outb(qts, test, 0xe8, 0x21); + g_assert_cmphex(isa_inl(qts, test, 0xe0), =3D=3D, 0x87654321); + g_assert_cmphex(isa_inw(qts, test, 0xe2), =3D=3D, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe0), =3D=3D, 0x4321); + qtest_quit(qts); } =20 static void test_endianness_combine(gconstpointer data) { const TestCase *test =3D data; - - global_qtest =3D 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), =3D=3D, 0x87654321); - g_assert_cmphex(isa_inw(test, 0xea), =3D=3D, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe8), =3D=3D, 0x4321); - - isa_outw(test, 0xe2, 0x8866); - g_assert_cmphex(isa_inl(test, 0xe8), =3D=3D, 0x88664321); - g_assert_cmphex(isa_inw(test, 0xea), =3D=3D, 0x8866); - g_assert_cmphex(isa_inw(test, 0xe8), =3D=3D, 0x4321); - - isa_outw(test, 0xe0, 0x4422); - g_assert_cmphex(isa_inl(test, 0xe8), =3D=3D, 0x88664422); - g_assert_cmphex(isa_inw(test, 0xea), =3D=3D, 0x8866); - g_assert_cmphex(isa_inw(test, 0xe8), =3D=3D, 0x4422); - - isa_outb(test, 0xe3, 0x87); - g_assert_cmphex(isa_inl(test, 0xe8), =3D=3D, 0x87664422); - g_assert_cmphex(isa_inw(test, 0xea), =3D=3D, 0x8766); - - isa_outb(test, 0xe2, 0x65); - g_assert_cmphex(isa_inl(test, 0xe8), =3D=3D, 0x87654422); - g_assert_cmphex(isa_inw(test, 0xea), =3D=3D, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe8), =3D=3D, 0x4422); - - isa_outb(test, 0xe1, 0x43); - g_assert_cmphex(isa_inl(test, 0xe8), =3D=3D, 0x87654322); - g_assert_cmphex(isa_inw(test, 0xea), =3D=3D, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe8), =3D=3D, 0x4322); - - isa_outb(test, 0xe0, 0x21); - g_assert_cmphex(isa_inl(test, 0xe8), =3D=3D, 0x87654321); - g_assert_cmphex(isa_inw(test, 0xea), =3D=3D, 0x8765); - g_assert_cmphex(isa_inw(test, 0xe8), =3D=3D, 0x4321); - qtest_quit(global_qtest); + QTestState *qts; + + qts =3D 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), =3D=3D, 0x87654321); + g_assert_cmphex(isa_inw(qts, test, 0xea), =3D=3D, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe8), =3D=3D, 0x4321); + + isa_outw(qts, test, 0xe2, 0x8866); + g_assert_cmphex(isa_inl(qts, test, 0xe8), =3D=3D, 0x88664321); + g_assert_cmphex(isa_inw(qts, test, 0xea), =3D=3D, 0x8866); + g_assert_cmphex(isa_inw(qts, test, 0xe8), =3D=3D, 0x4321); + + isa_outw(qts, test, 0xe0, 0x4422); + g_assert_cmphex(isa_inl(qts, test, 0xe8), =3D=3D, 0x88664422); + g_assert_cmphex(isa_inw(qts, test, 0xea), =3D=3D, 0x8866); + g_assert_cmphex(isa_inw(qts, test, 0xe8), =3D=3D, 0x4422); + + isa_outb(qts, test, 0xe3, 0x87); + g_assert_cmphex(isa_inl(qts, test, 0xe8), =3D=3D, 0x87664422); + g_assert_cmphex(isa_inw(qts, test, 0xea), =3D=3D, 0x8766); + + isa_outb(qts, test, 0xe2, 0x65); + g_assert_cmphex(isa_inl(qts, test, 0xe8), =3D=3D, 0x87654422); + g_assert_cmphex(isa_inw(qts, test, 0xea), =3D=3D, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe8), =3D=3D, 0x4422); + + isa_outb(qts, test, 0xe1, 0x43); + g_assert_cmphex(isa_inl(qts, test, 0xe8), =3D=3D, 0x87654322); + g_assert_cmphex(isa_inw(qts, test, 0xea), =3D=3D, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe8), =3D=3D, 0x4322); + + isa_outb(qts, test, 0xe0, 0x21); + g_assert_cmphex(isa_inl(qts, test, 0xe8), =3D=3D, 0x87654321); + g_assert_cmphex(isa_inw(qts, test, 0xea), =3D=3D, 0x8765); + g_assert_cmphex(isa_inw(qts, test, 0xe8), =3D=3D, 0x4321); + qtest_quit(qts); } =20 int main(int argc, char **argv) --=20 1.8.3.1 From nobody Fri Nov 7 03:35:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=listsout.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from listsout.gnu.org (listsout.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1546513926254478.9996679321448; Thu, 3 Jan 2019 03:12:06 -0800 (PST) Received: from localhost ([127.0.0.1]:52202 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gf0uu-0004uK-LU for importer@patchew.org; Thu, 03 Jan 2019 06:12:00 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39612) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gf0t4-0003Kz-Be for qemu-devel@nongnu.org; Thu, 03 Jan 2019 06:10:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gf0t2-000211-9m for qemu-devel@nongnu.org; Thu, 03 Jan 2019 06:10:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53444) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gf0t1-00020J-UN for qemu-devel@nongnu.org; Thu, 03 Jan 2019 06:10:04 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A15534E90E; Thu, 3 Jan 2019 11:10:02 +0000 (UTC) Received: from thuth.com (dhcp-200-199.str.redhat.com [10.33.200.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A0F260BEC; Thu, 3 Jan 2019 11:09:58 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Laurent Vivier Date: Thu, 3 Jan 2019 12:09:51 +0100 Message-Id: <1546513792-17773-3-git-send-email-thuth@redhat.com> In-Reply-To: <1546513792-17773-1-git-send-email-thuth@redhat.com> References: <1546513792-17773-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 03 Jan 2019 11:10:02 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/3] tests/boot-order: Make test independent of global_qtest X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Pass 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. Signed-off-by: Thomas Huth --- tests/boot-order-test.c | 59 ++++++++++++++++++++++++---------------------= ---- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c index c60ebcf..a725bce 100644 --- a/tests/boot-order-test.c +++ b/tests/boot-order-test.c @@ -17,7 +17,7 @@ #include "standard-headers/linux/qemu_fw_cfg.h" =20 /* 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_ARG= S__)) =20 typedef struct { const char *args; @@ -27,31 +27,30 @@ typedef struct { =20 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; =20 - global_qtest =3D qtest_initf("-nodefaults%s%s %s", - machine ? " -M " : "", - machine ?: "", - test_args); - actual =3D read_boot_order(); + qts =3D qtest_initf("-nodefaults%s%s %s", machine ? " -M " : "", + machine ?: "", test_args); + actual =3D read_boot_order(qts); g_assert_cmphex(actual, =3D=3D, 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 =3D read_boot_order(); + qtest_qmp_eventwait(qts, "RESET"); + actual =3D read_boot_order(qts); g_assert_cmphex(actual, =3D=3D, expected_reboot); - qtest_quit(global_qtest); + qtest_quit(qts); } =20 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, } } =20 -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); } =20 -static uint64_t read_boot_order_pc(void) +static uint64_t read_boot_order_pc(QTestState *qts) { - uint8_t b1 =3D read_mc146818(0x70, 0x38); - uint8_t b2 =3D read_mc146818(0x70, 0x3d); + uint8_t b1 =3D read_mc146818(qts, 0x70, 0x38); + uint8_t b2 =3D read_mc146818(qts, 0x70, 0x3d); =20 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); } =20 -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); } =20 -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); } =20 static const boot_order_test test_cases_prep[] =3D { @@ -133,9 +132,9 @@ static void test_prep_boot_order(void) test_boot_orders("prep", read_boot_order_prep, test_cases_prep); } =20 -static uint64_t read_boot_order_pmac(void) +static uint64_t read_boot_order_pmac(QTestState *qts) { - QFWCFG *fw_cfg =3D mm_fw_cfg_init(global_qtest, 0xf0000510); + QFWCFG *fw_cfg =3D mm_fw_cfg_init(qts, 0xf0000510); =20 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); } =20 -static uint64_t read_boot_order_sun4m(void) +static uint64_t read_boot_order_sun4m(QTestState *qts) { - QFWCFG *fw_cfg =3D mm_fw_cfg_init(global_qtest, 0xd00000510ULL); + QFWCFG *fw_cfg =3D mm_fw_cfg_init(qts, 0xd00000510ULL); =20 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); } =20 -static uint64_t read_boot_order_sun4u(void) +static uint64_t read_boot_order_sun4u(QTestState *qts) { - QFWCFG *fw_cfg =3D io_fw_cfg_init(global_qtest, 0x510); + QFWCFG *fw_cfg =3D io_fw_cfg_init(qts, 0x510); =20 return qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_DEVICE); } --=20 1.8.3.1 From nobody Fri Nov 7 03:35:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=listsout.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from listsout.gnu.org (listsout.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1546514025541451.416780885314; Thu, 3 Jan 2019 03:13:45 -0800 (PST) Received: from localhost ([127.0.0.1]:52417 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gf0wa-00070C-Fp for importer@patchew.org; Thu, 03 Jan 2019 06:13:44 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39659) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gf0tA-0003TT-8B for qemu-devel@nongnu.org; Thu, 03 Jan 2019 06:10:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gf0t7-00024H-68 for qemu-devel@nongnu.org; Thu, 03 Jan 2019 06:10:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46202) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gf0t6-00022t-Ua for qemu-devel@nongnu.org; Thu, 03 Jan 2019 06:10:09 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BC238C057E00; Thu, 3 Jan 2019 11:10:07 +0000 (UTC) Received: from thuth.com (dhcp-200-199.str.redhat.com [10.33.200.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id D61F060BEC; Thu, 3 Jan 2019 11:10:02 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Laurent Vivier Date: Thu, 3 Jan 2019 12:09:52 +0100 Message-Id: <1546513792-17773-4-git-send-email-thuth@redhat.com> In-Reply-To: <1546513792-17773-1-git-send-email-thuth@redhat.com> References: <1546513792-17773-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 03 Jan 2019 11:10:07 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/3] tests/pnv-xscom: Make test independent of global_qtest X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Pass around the QTestState, so that we can finally get rid of the out-of-favor global_qtest variable in this file, too. Signed-off-by: Thomas Huth --- tests/pnv-xscom-test.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/tests/pnv-xscom-test.c b/tests/pnv-xscom-test.c index 70f4c84..974f8da 100644 --- a/tests/pnv-xscom-test.c +++ b/tests/pnv-xscom-test.c @@ -63,14 +63,15 @@ static uint64_t pnv_xscom_addr(const PnvChip *chip, uin= t32_t pcba) return addr; } =20 -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)); } =20 -static void test_xscom_cfam_id(const PnvChip *chip) +static void test_xscom_cfam_id(QTestState *qts, const PnvChip *chip) { - uint64_t f000f =3D pnv_xscom_read(chip, 0xf000f); + uint64_t f000f =3D pnv_xscom_read(qts, chip, 0xf000f); =20 g_assert_cmphex(f000f, =3D=3D, 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 =3D data; + QTestState *qts; =20 - global_qtest =3D qtest_initf("-M powernv,accel=3Dtcg -cpu %s", - chip->cpu_model); - test_xscom_cfam_id(chip); - qtest_quit(global_qtest); + qts =3D qtest_initf("-M powernv,accel=3Dtcg -cpu %s", chip->cpu_model); + test_xscom_cfam_id(qts, chip); + qtest_quit(qts); } =20 =20 @@ -94,7 +95,7 @@ static void test_cfam_id(const void *data) =20 #define PNV_XSCOM_EX_DTS_RESULT0 0x50000 =20 -static void test_xscom_core(const PnvChip *chip) +static void test_xscom_core(QTestState *qts, const PnvChip *chip) { uint32_t first_core_dts0 =3D PNV_XSCOM_EX_DTS_RESULT0; uint64_t dts0; @@ -105,7 +106,7 @@ static void test_xscom_core(const PnvChip *chip) first_core_dts0 |=3D PNV_XSCOM_P9_EC_BASE(chip->first_core); } =20 - dts0 =3D pnv_xscom_read(chip, first_core_dts0); + dts0 =3D pnv_xscom_read(qts, chip, first_core_dts0); =20 g_assert_cmphex(dts0, =3D=3D, 0x26f024f023f0000ull); } @@ -113,11 +114,11 @@ static void test_xscom_core(const PnvChip *chip) static void test_core(const void *data) { const PnvChip *chip =3D data; + QTestState *qts; =20 - global_qtest =3D qtest_initf("-M powernv,accel=3Dtcg -cpu %s", - chip->cpu_model); - test_xscom_core(chip); - qtest_quit(global_qtest); + qts =3D qtest_initf("-M powernv,accel=3Dtcg -cpu %s", chip->cpu_model); + test_xscom_core(qts, chip); + qtest_quit(qts); } =20 static void add_test(const char *name, void (*test)(const void *data)) --=20 1.8.3.1