[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/13] tests: convert ds1338-test to qtest
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 12/13] tests: convert ds1338-test to qtest |
Date: |
Mon, 18 Mar 2019 18:15:20 +0100 |
This way, ds1338-test will run for every machine that exposes
an i2c-bus.
Signed-off-by: Paolo Bonzini <address@hidden>
---
tests/Makefile.include | 8 ++++----
tests/ds1338-test.c | 37 +++++++++++++------------------------
tests/libqos/i2c-imx.c | 19 -------------------
tests/libqos/i2c.h | 2 --
4 files changed, 17 insertions(+), 49 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 54c1ecd668..67cf89bed8 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -695,7 +695,7 @@ libqgraph-obj-y = tests/libqos/qgraph.o
libqos-obj-y = $(libqgraph-obj-y) tests/libqos/pci.o tests/libqos/fw_cfg.o
libqos-obj-y += tests/libqos/malloc.o
-libqos-obj-y += tests/libqos/i2c.o tests/libqos/libqos.o
+libqos-obj-y += tests/libqos/libqos.o
libqos-spapr-obj-y = $(libqos-obj-y) tests/libqos/malloc-spapr.o
libqos-spapr-obj-y += tests/libqos/libqos-spapr.o
libqos-spapr-obj-y += tests/libqos/rtas.o
@@ -703,14 +703,14 @@ libqos-spapr-obj-y += tests/libqos/pci-spapr.o
libqos-pc-obj-y = $(libqos-obj-y) tests/libqos/pci-pc.o
libqos-pc-obj-y += tests/libqos/malloc-pc.o tests/libqos/libqos-pc.o
libqos-pc-obj-y += tests/libqos/ahci.o
-libqos-imx-obj-y = $(libqos-obj-y) tests/libqos/i2c-imx.o
libqos-usb-obj-y = $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/libqos/usb.o
# Devices
qos-test-obj-y = tests/qos-test.o $(libqgraph-obj-y)
qos-test-obj-y += $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
qos-test-obj-y += tests/libqos/e1000e.o
-qos-test-obj-y += $(libqos-imx-obj-y)
+qos-test-obj-y += tests/libqos/i2c.o
+qos-test-obj-y += tests/libqos/i2c-imx.o
qos-test-obj-y += tests/libqos/i2c-omap.o
qos-test-obj-y += tests/libqos/sdhci.o
qos-test-obj-y += tests/libqos/tpci200.o
@@ -739,6 +739,7 @@ qos-test-obj-y += tests/libqos/x86_64_pc-machine.o
# Tests
qos-test-obj-y += tests/ac97-test.o
+qos-test-obj-y += tests/ds1338-test.o
qos-test-obj-y += tests/e1000-test.o
qos-test-obj-y += tests/e1000e-test.o
qos-test-obj-y += tests/eepro100-test.o
@@ -790,7 +791,6 @@ tests/boot-serial-test$(EXESUF): tests/boot-serial-test.o
$(libqos-obj-y)
tests/bios-tables-test$(EXESUF): tests/bios-tables-test.o \
tests/boot-sector.o tests/acpi-utils.o $(libqos-obj-y)
tests/pxe-test$(EXESUF): tests/pxe-test.o tests/boot-sector.o $(libqos-obj-y)
-tests/ds1338-test$(EXESUF): tests/ds1338-test.o $(libqos-imx-obj-y)
tests/microbit-test$(EXESUF): tests/microbit-test.o
tests/m25p80-test$(EXESUF): tests/m25p80-test.o
tests/i440fx-test$(EXESUF): tests/i440fx-test.o $(libqos-pc-obj-y)
diff --git a/tests/ds1338-test.c b/tests/ds1338-test.c
index bd72a159cb..fd8fbad533 100644
--- a/tests/ds1338-test.c
+++ b/tests/ds1338-test.c
@@ -21,25 +21,23 @@
#include "libqtest.h"
#include "libqos/i2c.h"
-#define IMX25_I2C_0_BASE 0x43F80000
-
#define DS1338_ADDR 0x68
-static I2CAdapter *i2c;
-static uint8_t addr;
-
static inline uint8_t bcd2bin(uint8_t x)
{
return ((x) & 0x0f) + ((x) >> 4) * 10;
}
-static void send_and_receive(void)
+static void send_and_receive(void *obj, void *data, QGuestAllocator *alloc)
{
+ QI2CDevice *i2cdev = (QI2CDevice *)obj;
+ I2CAdapter *i2c = i2cdev->bus;
+
uint8_t resp[7];
time_t now = time(NULL);
struct tm *tm_ptr = gmtime(&now);
- i2c_read_block(i2c, addr, 0, resp, sizeof(resp));
+ i2c_read_block(i2c, DS1338_ADDR, 0, resp, sizeof(resp));
/* check retrieved time againt local time */
g_assert_cmpuint(bcd2bin(resp[4]), == , tm_ptr->tm_mday);
@@ -47,23 +45,14 @@ static void send_and_receive(void)
g_assert_cmpuint(2000 + bcd2bin(resp[6]), == , 1900 + tm_ptr->tm_year);
}
-int main(int argc, char **argv)
+static void ds1338_register_nodes(void)
{
- QTestState *s = NULL;
- int ret;
-
- g_test_init(&argc, &argv, NULL);
-
- s = qtest_start("-display none -machine imx25-pdk -device
ds1338,address=0x68");
- i2c = imx_i2c_create(s, IMX25_I2C_0_BASE);
- addr = DS1338_ADDR;
-
- qtest_add_func("/ds1338/tx-rx", send_and_receive);
-
- ret = g_test_run();
-
- qtest_quit(s);
- g_free(i2c);
+ QOSGraphEdgeOptions opts = {
+ .extra_device_opts = "address=0x68"
+ };
- return ret;
+ qos_node_create_driver("ds1338", i2c_device_create);
+ qos_node_consumes("ds1338", "i2c-bus", &opts);
+ qos_add_test("tx-rx", "ds1338", send_and_receive, NULL);
}
+libqos_init(ds1338_register_nodes);
diff --git a/tests/libqos/i2c-imx.c b/tests/libqos/i2c-imx.c
index 86d84a79e6..f33ece55a3 100644
--- a/tests/libqos/i2c-imx.c
+++ b/tests/libqos/i2c-imx.c
@@ -207,25 +207,6 @@ void imx_i2c_init(IMXI2C *s, QTestState *qts, uint64_t
addr)
s->parent.qts = qts;
}
-I2CAdapter *imx_i2c_create(QTestState *qts, uint64_t addr)
-{
- IMXI2C *s = g_malloc0(sizeof(*s));
-
- imx_i2c_init(s, qts, addr);
- return &s->parent;
-}
-
-void imx_i2c_free(I2CAdapter *i2c)
-{
- IMXI2C *s;
-
- if (!i2c) {
- return;
- }
- s = container_of(i2c, IMXI2C, parent);
- g_free(s);
-}
-
static void imx_i2c_register_nodes(void)
{
qos_node_create_driver("imx.i2c", NULL);
diff --git a/tests/libqos/i2c.h b/tests/libqos/i2c.h
index 66b0e0d06e..2c8cc3eab5 100644
--- a/tests/libqos/i2c.h
+++ b/tests/libqos/i2c.h
@@ -75,7 +75,5 @@ typedef struct IMXI2C {
} IMXI2C;
void imx_i2c_init(IMXI2C *s, QTestState *qts, uint64_t addr);
-I2CAdapter *imx_i2c_create(QTestState *qts, uint64_t addr);
-void imx_i2c_free(I2CAdapter *i2c);
#endif
--
2.20.1
- [Qemu-devel] [PATCH 08/13] libqos: convert I2C to qgraph, (continued)
- [Qemu-devel] [PATCH 08/13] libqos: convert I2C to qgraph, Paolo Bonzini, 2019/03/18
- [Qemu-devel] [PATCH 09/13] libqos: add ARM n800 machine object, Paolo Bonzini, 2019/03/18
- [Qemu-devel] [PATCH 01/13] qgraph: allow extra_device_opts on bus nodes, Paolo Bonzini, 2019/03/18
- [Qemu-devel] [PATCH 03/13] libqos: move common i2c code to libqos, Paolo Bonzini, 2019/03/18
- [Qemu-devel] [PATCH 13/13] libqos: i2c: move address into QI2CDevice, Paolo Bonzini, 2019/03/18
- [Qemu-devel] [PATCH 11/13] tests: convert OMAP i2c tests to qgraph, Paolo Bonzini, 2019/03/18
- [Qemu-devel] [PATCH 10/13] libqos: add ARM imx25-pdk machine object, Paolo Bonzini, 2019/03/18
- [Qemu-devel] [PATCH 05/13] pca9552-test: do not rely on state across tests, Paolo Bonzini, 2019/03/18
- [Qemu-devel] [PATCH 04/13] libqos: fix omap-i2c receiving more than 4 bytes, Paolo Bonzini, 2019/03/18
- [Qemu-devel] [PATCH 02/13] qgraph: fix qos_node_contains with options, Paolo Bonzini, 2019/03/18
- [Qemu-devel] [PATCH 12/13] tests: convert ds1338-test to qtest,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 06/13] imx25-pdk: create ds1338 for qtest inside the test, Paolo Bonzini, 2019/03/18
- [Qemu-devel] [PATCH 07/13] libqos: split I2CAdapter initialization and allocation, Paolo Bonzini, 2019/03/18
- Re: [Qemu-devel] [PATCH preliminary for 4.1 00/13] Convert I2C tests to qgraph, no-reply, 2019/03/18