david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests/m48t59: Use the m48t59 test on ppc, too

Browse Source 
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 <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2018-02-12 13:35:41 +01:00
parent 9697ce405f
commit 02f4fbecb9
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Makefile.include
View File

@ -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))

9
tests/m48t59-test.c
View File

@ -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();