From nobody Sat Oct 25 08:31:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.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 lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518608215304163.12122487345243; Wed, 14 Feb 2018 03:36:55 -0800 (PST) Received: from localhost ([::1]:37673 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elvMn-0003ZG-F9 for importer@patchew.org; Wed, 14 Feb 2018 06:36:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elv7X-0006We-4U for qemu-devel@nongnu.org; Wed, 14 Feb 2018 06:21:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elv7W-0007Ft-38 for qemu-devel@nongnu.org; Wed, 14 Feb 2018 06:21:03 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:57182 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1elv7V-0007FR-Tp for qemu-devel@nongnu.org; Wed, 14 Feb 2018 06:21:02 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 89602EAEA6; Wed, 14 Feb 2018 11:21:01 +0000 (UTC) Received: from thh440s.redhat.com (ovpn-116-136.ams2.redhat.com [10.36.116.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD9702024CA4; Wed, 14 Feb 2018 11:21:00 +0000 (UTC) From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Date: Wed, 14 Feb 2018 12:20:32 +0100 Message-Id: <1518607234-17739-17-git-send-email-thuth@redhat.com> In-Reply-To: <1518607234-17739-1-git-send-email-thuth@redhat.com> References: <1518607234-17739-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Wed, 14 Feb 2018 11:21:01 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Wed, 14 Feb 2018 11:21:01 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'thuth@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 16/18] tests/m48t59: Make the 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Stop using the functions that require global_qtest here and pass around the QTestState instead (global_qtest should finally get removed since this causes problems with tests running in parallel). Reviewed-by: Eric Blake Signed-off-by: Thomas Huth --- tests/m48t59-test.c | 60 ++++++++++++++++++++++++++-----------------------= ---- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/tests/m48t59-test.c b/tests/m48t59-test.c index a85f84d..8c25467 100644 --- a/tests/m48t59-test.c +++ b/tests/m48t59-test.c @@ -30,45 +30,45 @@ static uint16_t reg_base =3D 0x1ff0; /* 0x7f0 for m48t0= 2 */ static int base_year; static bool use_mmio; =20 -static uint8_t cmos_read_mmio(uint8_t reg) +static uint8_t cmos_read_mmio(QTestState *s, uint8_t reg) { - return readb(base + (uint32_t)reg_base + (uint32_t)reg); + return qtest_readb(s, base + (uint32_t)reg_base + (uint32_t)reg); } =20 -static void cmos_write_mmio(uint8_t reg, uint8_t val) +static void cmos_write_mmio(QTestState *s, uint8_t reg, uint8_t val) { uint8_t data =3D val; =20 - writeb(base + (uint32_t)reg_base + (uint32_t)reg, data); + qtest_writeb(s, base + (uint32_t)reg_base + (uint32_t)reg, data); } =20 -static uint8_t cmos_read_ioio(uint8_t reg) +static uint8_t cmos_read_ioio(QTestState *s, uint8_t reg) { - outw(base + 0, reg_base + (uint16_t)reg); - return inb(base + 3); + qtest_outw(s, base + 0, reg_base + (uint16_t)reg); + return qtest_inb(s, base + 3); } =20 -static void cmos_write_ioio(uint8_t reg, uint8_t val) +static void cmos_write_ioio(QTestState *s, uint8_t reg, uint8_t val) { - outw(base + 0, reg_base + (uint16_t)reg); - outb(base + 3, val); + qtest_outw(s, base + 0, reg_base + (uint16_t)reg); + qtest_outb(s, base + 3, val); } =20 -static uint8_t cmos_read(uint8_t reg) +static uint8_t cmos_read(QTestState *s, uint8_t reg) { if (use_mmio) { - return cmos_read_mmio(reg); + return cmos_read_mmio(s, reg); } else { - return cmos_read_ioio(reg); + return cmos_read_ioio(s, reg); } } =20 -static void cmos_write(uint8_t reg, uint8_t val) +static void cmos_write(QTestState *s, uint8_t reg, uint8_t val) { if (use_mmio) { - cmos_write_mmio(reg, val); + cmos_write_mmio(s, reg, val); } else { - cmos_write_ioio(reg, val); + cmos_write_ioio(s, reg, val); } } =20 @@ -106,18 +106,18 @@ static void print_tm(struct tm *tm) } #endif =20 -static void cmos_get_date_time(struct tm *date) +static void cmos_get_date_time(QTestState *s, struct tm *date) { int sec, min, hour, mday, mon, year; time_t ts; struct tm dummy; =20 - sec =3D cmos_read(RTC_SECONDS); - min =3D cmos_read(RTC_MINUTES); - hour =3D cmos_read(RTC_HOURS); - mday =3D cmos_read(RTC_DAY_OF_MONTH); - mon =3D cmos_read(RTC_MONTH); - year =3D cmos_read(RTC_YEAR); + sec =3D cmos_read(s, RTC_SECONDS); + min =3D cmos_read(s, RTC_MINUTES); + hour =3D cmos_read(s, RTC_HOURS); + mday =3D cmos_read(s, RTC_DAY_OF_MONTH); + mon =3D cmos_read(s, RTC_MONTH); + year =3D cmos_read(s, RTC_YEAR); =20 sec =3D bcd2dec(sec); min =3D bcd2dec(min); @@ -145,7 +145,7 @@ static void cmos_get_date_time(struct tm *date) =20 static QTestState *m48t59_qtest_start(void) { - return qtest_start("-rtc clock=3Dvm"); + return qtest_init("-rtc clock=3Dvm"); } =20 static void bcd_check_time(void) @@ -172,10 +172,10 @@ static void bcd_check_time(void) ts =3D time(NULL); gmtime_r(&ts, &start); =20 - cmos_get_date_time(&date[0]); - cmos_get_date_time(&date[1]); - cmos_get_date_time(&date[2]); - cmos_get_date_time(&date[3]); + cmos_get_date_time(s, &date[0]); + cmos_get_date_time(s, &date[1]); + cmos_get_date_time(s, &date[2]); + cmos_get_date_time(s, &date[3]); =20 ts =3D time(NULL); gmtime_r(&ts, &end); @@ -226,8 +226,8 @@ static void fuzz_registers(void) continue; } =20 - cmos_write(reg, val); - cmos_read(reg); + cmos_write(s, reg, val); + cmos_read(s, reg); } =20 qtest_quit(s); --=20 1.8.3.1