From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43645) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elv7Y-0006Yy-Vy for qemu-devel@nongnu.org; Wed, 14 Feb 2018 06:21:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elv7Y-0007GW-0v for qemu-devel@nongnu.org; Wed, 14 Feb 2018 06:21:04 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:57186 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 1elv7X-0007GO-SK for qemu-devel@nongnu.org; Wed, 14 Feb 2018 06:21:03 -0500 From: Thomas Huth Date: Wed, 14 Feb 2018 12:20:34 +0100 Message-Id: <1518607234-17739-19-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> Subject: [Qemu-devel] [PULL 18/18] tests/m48t59: Use the m48t59 test on ppc, too List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , qemu-devel@nongnu.org The ref405ep machine has a memory-mapped m48t59 device, so we can run the m48t59 test on this machine, too. Signed-off-by: Thomas Huth --- tests/Makefile.include | 2 ++ tests/m48t59-test.c | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 95ce99e..a1bcbff 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -319,6 +319,8 @@ check-qtest-ppc-y += tests/boot-order-test$(EXESUF) check-qtest-ppc-y += tests/prom-env-test$(EXESUF) check-qtest-ppc-y += tests/drive_del-test$(EXESUF) check-qtest-ppc-y += tests/boot-serial-test$(EXESUF) +check-qtest-ppc-y += tests/m48t59-test$(EXESUF) +gcov-files-ppc-y += hw/timer/m48t59.c check-qtest-ppc64-y = $(check-qtest-ppc-y) gcov-files-ppc64-y = $(subst ppc-softmmu/,ppc64-softmmu/,$(gcov-files-ppc-y)) diff --git a/tests/m48t59-test.c b/tests/m48t59-test.c index 8c25467..26af7d6 100644 --- a/tests/m48t59-test.c +++ b/tests/m48t59-test.c @@ -28,6 +28,7 @@ static uint32_t base; static uint16_t reg_base = 0x1ff0; /* 0x7f0 for m48t02 */ static int base_year; +static const char *base_machine; static bool use_mmio; static uint8_t cmos_read_mmio(QTestState *s, uint8_t reg) @@ -145,7 +146,7 @@ static void cmos_get_date_time(QTestState *s, struct tm *date) static QTestState *m48t59_qtest_start(void) { - return qtest_init("-rtc clock=vm"); + return qtest_startf("-M %s -rtc clock=vm", base_machine); } static void bcd_check_time(void) @@ -241,6 +242,12 @@ static void base_setup(void) /* Note: For sparc64, we'd need to map-in the PCI bridge memory first */ base = 0x71200000; base_year = 1968; + base_machine = "SS-5"; + use_mmio = true; + } else if (g_str_equal(arch, "ppc") || g_str_equal(arch, "ppc64")) { + base = 0xF0000000; + base_year = 1968; + base_machine = "ref405ep"; use_mmio = true; } else { g_assert_not_reached(); -- 1.8.3.1