[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v10 09/22] libqos: rename i2c_send and i2c_recv
From: |
Alexander Bulekov |
Subject: |
[PATCH v10 09/22] libqos: rename i2c_send and i2c_recv |
Date: |
Wed, 19 Feb 2020 23:11:05 -0500 |
The names i2c_send and i2c_recv collide with functions defined in
hw/i2c/core.c. This causes an error when linking against libqos and
softmmu simultaneously (for example when using qtest inproc). Rename the
libqos functions to avoid this.
Signed-off-by: Alexander Bulekov <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Darren Kenny <address@hidden>
Acked-by: Thomas Huth <address@hidden>
---
tests/qtest/libqos/i2c.c | 10 +++++-----
tests/qtest/libqos/i2c.h | 4 ++--
tests/qtest/pca9552-test.c | 10 +++++-----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/tests/qtest/libqos/i2c.c b/tests/qtest/libqos/i2c.c
index 156114e745..38f800dbab 100644
--- a/tests/qtest/libqos/i2c.c
+++ b/tests/qtest/libqos/i2c.c
@@ -10,12 +10,12 @@
#include "libqos/i2c.h"
#include "libqtest.h"
-void i2c_send(QI2CDevice *i2cdev, const uint8_t *buf, uint16_t len)
+void qi2c_send(QI2CDevice *i2cdev, const uint8_t *buf, uint16_t len)
{
i2cdev->bus->send(i2cdev->bus, i2cdev->addr, buf, len);
}
-void i2c_recv(QI2CDevice *i2cdev, uint8_t *buf, uint16_t len)
+void qi2c_recv(QI2CDevice *i2cdev, uint8_t *buf, uint16_t len)
{
i2cdev->bus->recv(i2cdev->bus, i2cdev->addr, buf, len);
}
@@ -23,8 +23,8 @@ void i2c_recv(QI2CDevice *i2cdev, uint8_t *buf, uint16_t len)
void i2c_read_block(QI2CDevice *i2cdev, uint8_t reg,
uint8_t *buf, uint16_t len)
{
- i2c_send(i2cdev, ®, 1);
- i2c_recv(i2cdev, buf, len);
+ qi2c_send(i2cdev, ®, 1);
+ qi2c_recv(i2cdev, buf, len);
}
void i2c_write_block(QI2CDevice *i2cdev, uint8_t reg,
@@ -33,7 +33,7 @@ void i2c_write_block(QI2CDevice *i2cdev, uint8_t reg,
uint8_t *cmd = g_malloc(len + 1);
cmd[0] = reg;
memcpy(&cmd[1], buf, len);
- i2c_send(i2cdev, cmd, len + 1);
+ qi2c_send(i2cdev, cmd, len + 1);
g_free(cmd);
}
diff --git a/tests/qtest/libqos/i2c.h b/tests/qtest/libqos/i2c.h
index 945b65b34c..c65f087834 100644
--- a/tests/qtest/libqos/i2c.h
+++ b/tests/qtest/libqos/i2c.h
@@ -47,8 +47,8 @@ struct QI2CDevice {
void *i2c_device_create(void *i2c_bus, QGuestAllocator *alloc, void *addr);
void add_qi2c_address(QOSGraphEdgeOptions *opts, QI2CAddress *addr);
-void i2c_send(QI2CDevice *dev, const uint8_t *buf, uint16_t len);
-void i2c_recv(QI2CDevice *dev, uint8_t *buf, uint16_t len);
+void qi2c_send(QI2CDevice *dev, const uint8_t *buf, uint16_t len);
+void qi2c_recv(QI2CDevice *dev, uint8_t *buf, uint16_t len);
void i2c_read_block(QI2CDevice *dev, uint8_t reg,
uint8_t *buf, uint16_t len);
diff --git a/tests/qtest/pca9552-test.c b/tests/qtest/pca9552-test.c
index 4b800d3c3e..d80ed93cd3 100644
--- a/tests/qtest/pca9552-test.c
+++ b/tests/qtest/pca9552-test.c
@@ -32,22 +32,22 @@ static void receive_autoinc(void *obj, void *data,
QGuestAllocator *alloc)
pca9552_init(i2cdev);
- i2c_send(i2cdev, ®, 1);
+ qi2c_send(i2cdev, ®, 1);
/* PCA9552_LS0 */
- i2c_recv(i2cdev, &resp, 1);
+ qi2c_recv(i2cdev, &resp, 1);
g_assert_cmphex(resp, ==, 0x54);
/* PCA9552_LS1 */
- i2c_recv(i2cdev, &resp, 1);
+ qi2c_recv(i2cdev, &resp, 1);
g_assert_cmphex(resp, ==, 0x55);
/* PCA9552_LS2 */
- i2c_recv(i2cdev, &resp, 1);
+ qi2c_recv(i2cdev, &resp, 1);
g_assert_cmphex(resp, ==, 0x55);
/* PCA9552_LS3 */
- i2c_recv(i2cdev, &resp, 1);
+ qi2c_recv(i2cdev, &resp, 1);
g_assert_cmphex(resp, ==, 0x54);
}
--
2.25.0
- [PATCH v10 00/22] Add virtual device fuzzing support, Alexander Bulekov, 2020/02/19
- [PATCH v10 01/22] softmmu: move vl.c to softmmu/, Alexander Bulekov, 2020/02/19
- [PATCH v10 03/22] module: check module wasn't already initialized, Alexander Bulekov, 2020/02/19
- [PATCH v10 02/22] softmmu: split off vl.c:main() into main.c, Alexander Bulekov, 2020/02/19
- [PATCH v10 04/22] fuzz: add FUZZ_TARGET module type, Alexander Bulekov, 2020/02/19
- [PATCH v10 06/22] libqtest: add a layer of abstraction to send/recv, Alexander Bulekov, 2020/02/19
- [PATCH v10 07/22] libqtest: make bufwrite rely on the TransportOps, Alexander Bulekov, 2020/02/19
- [PATCH v10 08/22] qtest: add in-process incoming command handler, Alexander Bulekov, 2020/02/19
- [PATCH v10 05/22] qtest: add qtest_server_send abstraction, Alexander Bulekov, 2020/02/19
- [PATCH v10 09/22] libqos: rename i2c_send and i2c_recv,
Alexander Bulekov <=
- [PATCH v10 10/22] libqos: split qos-test and libqos makefile vars, Alexander Bulekov, 2020/02/19
- [PATCH v10 11/22] libqos: move useful qos-test funcs to qos_external, Alexander Bulekov, 2020/02/19
- [PATCH v10 13/22] exec: keep ram block across fork when using qtest, Alexander Bulekov, 2020/02/19
- [PATCH v10 12/22] fuzz: add fuzzer skeleton, Alexander Bulekov, 2020/02/19
- [PATCH v10 14/22] main: keep rcu_atfork callback enabled for qtest, Alexander Bulekov, 2020/02/19
- [PATCH v10 15/22] fuzz: support for fork-based fuzzing., Alexander Bulekov, 2020/02/19
- [PATCH v10 18/22] fuzz: add configure flag --enable-fuzzing, Alexander Bulekov, 2020/02/19
- [PATCH v10 16/22] fuzz: add support for qos-assisted fuzz targets, Alexander Bulekov, 2020/02/19