diff options
| author | Paolo Bonzini | 2019-03-18 15:56:23 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2019-06-03 14:03:02 +0200 |
| commit | c4f00daa5b390a74f13a271e7237e173c527bbce (patch) | |
| tree | e655493add50166fcb766581895d5cc6187503f2 | |
| parent | pca9552-test: do not rely on state across tests (diff) | |
| download | qemu-c4f00daa5b390a74f13a271e7237e173c527bbce.tar.gz qemu-c4f00daa5b390a74f13a271e7237e173c527bbce.tar.xz qemu-c4f00daa5b390a74f13a271e7237e173c527bbce.zip | |
imx25-pdk: create ds1338 for qtest inside the test
There is no need to have a test device created by the board.
Instead, create it in the qtest so that we will be able to run
it on other boards too.
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | hw/arm/imx25_pdk.c | 9 | ||||
| -rw-r--r-- | tests/ds1338-test.c | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c index eef1b184b0..a0423ffb67 100644 --- a/hw/arm/imx25_pdk.c +++ b/hw/arm/imx25_pdk.c @@ -131,15 +131,6 @@ static void imx25_pdk_init(MachineState *machine) */ if (!qtest_enabled()) { arm_load_kernel(&s->soc.cpu, &imx25_pdk_binfo); - } else { - /* - * This I2C device doesn't exist on the real board. - * We add it here (only on qtest usage) to be able to do a bit - * of simple qtest. See "make check" for details. - */ - i2c_create_slave((I2CBus *)qdev_get_child_bus(DEVICE(&s->soc.i2c[0]), - "i2c-bus.0"), - "ds1338", 0x68); } } diff --git a/tests/ds1338-test.c b/tests/ds1338-test.c index 88f829f241..bd72a159cb 100644 --- a/tests/ds1338-test.c +++ b/tests/ds1338-test.c @@ -54,7 +54,7 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); - s = qtest_start("-display none -machine imx25-pdk"); + s = qtest_start("-display none -machine imx25-pdk -device ds1338,address=0x68"); i2c = imx_i2c_create(s, IMX25_I2C_0_BASE); addr = DS1338_ADDR; |