From: Thomas Huth <thuth@redhat.com>
To: "Oleinik, Alexander" <alxndr@bu.edu>,
"qemu-devel@nongnu.org" <qemu-devel@nongnu.org>
Cc: Laurent Vivier <lvivier@redhat.com>,
"pbonzini@redhat.com" <pbonzini@redhat.com>,
"bsd@redhat.com" <bsd@redhat.com>,
"stefanha@redhat.com" <stefanha@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v3 02/22] libqos: Rename i2c_send and i2c_recv
Date: Thu, 19 Sep 2019 08:01:29 +0200 [thread overview]
Message-ID: <adef69da-6966-33c1-9c52-6c4c4c98fe35@redhat.com> (raw)
In-Reply-To: <20190918231846.22538-3-alxndr@bu.edu>
On 19/09/2019 01.19, Oleinik, Alexander wrote:
> 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 Oleinik <alxndr@bu.edu>
> ---
> tests/libqos/i2c-imx.c | 8 ++++----
> tests/libqos/i2c-omap.c | 8 ++++----
> tests/libqos/i2c.c | 10 +++++-----
> tests/libqos/i2c.h | 4 ++--
> tests/pca9552-test.c | 10 +++++-----
> 5 files changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/tests/libqos/i2c-imx.c b/tests/libqos/i2c-imx.c
> index f33ece55a3..c1dcc9fb1d 100644
> --- a/tests/libqos/i2c-imx.c
> +++ b/tests/libqos/i2c-imx.c
> @@ -37,7 +37,7 @@ static void imx_i2c_set_slave_addr(IMXI2C *s, uint8_t addr,
> (addr << 1) | (direction == IMX_I2C_READ ? 1 : 0));
> }
>
> -static void imx_i2c_send(I2CAdapter *i2c, uint8_t addr,
> +static void imx_i2c_test_send(I2CAdapter *i2c, uint8_t addr,
> const uint8_t *buf, uint16_t len)
> {
> IMXI2C *s = container_of(i2c, IMXI2C, parent);
> @@ -97,7 +97,7 @@ static void imx_i2c_send(I2CAdapter *i2c, uint8_t addr,
> g_assert((status & I2SR_IBB) == 0);
> }
>
> -static void imx_i2c_recv(I2CAdapter *i2c, uint8_t addr,
> +static void imx_i2c_test_recv(I2CAdapter *i2c, uint8_t addr,
> uint8_t *buf, uint16_t len)
> {
> IMXI2C *s = container_of(i2c, IMXI2C, parent);
> @@ -202,8 +202,8 @@ void imx_i2c_init(IMXI2C *s, QTestState *qts, uint64_t addr)
>
> s->obj.get_driver = imx_i2c_get_driver;
>
> - s->parent.send = imx_i2c_send;
> - s->parent.recv = imx_i2c_recv;
> + s->parent.send = imx_i2c_test_send;
> + s->parent.recv = imx_i2c_test_recv;
> s->parent.qts = qts;
> }
>
> diff --git a/tests/libqos/i2c-omap.c b/tests/libqos/i2c-omap.c
> index 9ae8214fa8..284f765a3b 100644
> --- a/tests/libqos/i2c-omap.c
> +++ b/tests/libqos/i2c-omap.c
> @@ -50,7 +50,7 @@ static void omap_i2c_set_slave_addr(OMAPI2C *s, uint8_t addr)
> g_assert_cmphex(data, ==, addr);
> }
>
> -static void omap_i2c_send(I2CAdapter *i2c, uint8_t addr,
> +static void omap_i2c_test_send(I2CAdapter *i2c, uint8_t addr,
> const uint8_t *buf, uint16_t len)
> {
> OMAPI2C *s = container_of(i2c, OMAPI2C, parent);
> @@ -94,7 +94,7 @@ static void omap_i2c_send(I2CAdapter *i2c, uint8_t addr,
> g_assert((data & OMAP_I2C_CON_STP) == 0);
> }
>
> -static void omap_i2c_recv(I2CAdapter *i2c, uint8_t addr,
> +static void omap_i2c_test_recv(I2CAdapter *i2c, uint8_t addr,
> uint8_t *buf, uint16_t len)
> {
> OMAPI2C *s = container_of(i2c, OMAPI2C, parent);
> @@ -182,8 +182,8 @@ void omap_i2c_init(OMAPI2C *s, QTestState *qts, uint64_t addr)
> s->obj.get_driver = omap_i2c_get_driver;
> s->obj.start_hw = omap_i2c_start_hw;
>
> - s->parent.send = omap_i2c_send;
> - s->parent.recv = omap_i2c_recv;
> + s->parent.send = omap_i2c_test_send;
> + s->parent.recv = omap_i2c_test_recv;
> s->parent.qts = qts;
> }
>
> diff --git a/tests/libqos/i2c.c b/tests/libqos/i2c.c
> index 156114e745..b96a37b69b 100644
> --- a/tests/libqos/i2c.c
> +++ b/tests/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 i2c_test_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 i2c_test_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);
> + i2c_test_send(i2cdev, ®, 1);
> + i2c_test_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);
> + i2c_test_send(i2cdev, cmd, len + 1);
> g_free(cmd);
> }
>
> diff --git a/tests/libqos/i2c.h b/tests/libqos/i2c.h
> index 945b65b34c..9a4d6579a2 100644
> --- a/tests/libqos/i2c.h
> +++ b/tests/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 i2c_test_send(QI2CDevice *dev, const uint8_t *buf, uint16_t len);
> +void i2c_test_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/pca9552-test.c b/tests/pca9552-test.c
> index 4b800d3c3e..9844177d79 100644
> --- a/tests/pca9552-test.c
> +++ b/tests/pca9552-test.c
> @@ -32,22 +32,22 @@ static void receive_autoinc(void *obj, void *data, QGuestAllocator *alloc)
>
> pca9552_init(i2cdev);
>
> - i2c_send(i2cdev, ®, 1);
> + i2c_test_send(i2cdev, ®, 1);
>
> /* PCA9552_LS0 */
> - i2c_recv(i2cdev, &resp, 1);
> + i2c_test_recv(i2cdev, &resp, 1);
> g_assert_cmphex(resp, ==, 0x54);
>
> /* PCA9552_LS1 */
> - i2c_recv(i2cdev, &resp, 1);
> + i2c_test_recv(i2cdev, &resp, 1);
> g_assert_cmphex(resp, ==, 0x55);
>
> /* PCA9552_LS2 */
> - i2c_recv(i2cdev, &resp, 1);
> + i2c_test_recv(i2cdev, &resp, 1);
> g_assert_cmphex(resp, ==, 0x55);
>
> /* PCA9552_LS3 */
> - i2c_recv(i2cdev, &resp, 1);
> + i2c_test_recv(i2cdev, &resp, 1);
> g_assert_cmphex(resp, ==, 0x54);
> }
Acked-by: Thomas Huth <thuth@redhat.com>
next prev parent reply other threads:[~2019-09-19 6:17 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-18 23:19 [Qemu-devel] [PATCH v3 00/22] Add virtual device fuzzing support Oleinik, Alexander
2019-09-18 23:19 ` [Qemu-devel] [PATCH v3 01/22] softmmu: split off vl.c:main() into main.c Oleinik, Alexander
2019-09-19 10:03 ` Stefan Hajnoczi
2019-09-19 13:01 ` Oleinik, Alexander
2019-09-18 23:19 ` [Qemu-devel] [PATCH v3 02/22] libqos: Rename i2c_send and i2c_recv Oleinik, Alexander
2019-09-19 6:01 ` Thomas Huth [this message]
2019-09-19 10:05 ` Stefan Hajnoczi
2019-09-19 11:15 ` Paolo Bonzini
2019-09-19 13:23 ` Oleinik, Alexander
2019-09-18 23:19 ` [Qemu-devel] [PATCH v3 03/22] fuzz: Add FUZZ_TARGET module type Oleinik, Alexander
2019-09-19 10:06 ` Stefan Hajnoczi
2019-09-18 23:19 ` [Qemu-devel] [PATCH v3 04/22] qtest: add qtest_server_send abstraction Oleinik, Alexander
2019-09-19 10:10 ` Stefan Hajnoczi
2019-09-18 23:19 ` [Qemu-devel] [PATCH v3 05/22] libqtest: Add a layer of abstraciton to send/recv Oleinik, Alexander
2019-09-19 10:24 ` Stefan Hajnoczi
2019-09-19 11:18 ` Paolo Bonzini
2019-09-19 13:27 ` Oleinik, Alexander
2019-09-19 14:27 ` Paolo Bonzini
2019-09-18 23:19 ` [Qemu-devel] [PATCH v3 06/22] fuzz: add configure flag --enable-fuzzing Oleinik, Alexander
2019-09-19 10:28 ` Stefan Hajnoczi
2019-09-19 13:07 ` Oleinik, Alexander
2019-09-18 23:19 ` [Qemu-devel] [PATCH v3 07/22] fuzz: Add target/fuzz makefile rules Oleinik, Alexander
2019-09-18 23:19 ` [Qemu-devel] [PATCH v3 08/22] module: check module wasn't already initialized Oleinik, Alexander
2019-09-19 10:30 ` Stefan Hajnoczi
2019-09-18 23:19 ` [Qemu-devel] [PATCH v3 09/22] qtest: add in-process incoming command handler Oleinik, Alexander
2019-09-19 10:31 ` Stefan Hajnoczi
2019-09-18 23:19 ` [Qemu-devel] [PATCH v3 10/22] tests: provide test variables to other targets Oleinik, Alexander
2019-09-18 23:19 ` [Qemu-devel] [PATCH v3 11/22] libqos: split qos-test and libqos makefile vars Oleinik, Alexander
2019-09-26 12:04 ` Thomas Huth
2019-09-18 23:19 ` [Qemu-devel] [PATCH v3 12/22] libqos: move useful qos-test funcs to qos_external Oleinik, Alexander
2019-09-19 10:34 ` Stefan Hajnoczi
2019-09-18 23:19 ` [Qemu-devel] [PATCH v3 13/22] libqtest: make qtest_bufwrite send "atomic" Oleinik, Alexander
2019-09-19 10:37 ` Stefan Hajnoczi
2019-09-19 18:56 ` John Snow
2019-09-19 19:36 ` Oleinik, Alexander
2019-09-20 0:49 ` John Snow
2019-09-19 19:50 ` Alexander Oleinik
2019-09-18 23:19 ` [Qemu-devel] [PATCH v3 14/22] libqtest: add in-process qtest.c tx/rx handlers Oleinik, Alexander
2019-09-19 10:42 ` Stefan Hajnoczi
2019-09-19 13:22 ` Oleinik, Alexander
2019-09-18 23:19 ` [Qemu-devel] [PATCH v3 15/22] fuzz: Add target/fuzz makefile rules Oleinik, Alexander
2019-09-18 23:19 ` [Qemu-devel] [PATCH v3 16/22] fuzz: add fuzzer skeleton Oleinik, Alexander
2019-09-19 12:48 ` Stefan Hajnoczi
2019-09-19 13:49 ` Oleinik, Alexander
2019-09-20 9:30 ` Stefan Hajnoczi
2019-09-23 14:55 ` Darren Kenny
2019-09-18 23:19 ` [Qemu-devel] [PATCH v3 17/22] fuzz: add support for fork-based fuzzing Oleinik, Alexander
2019-09-19 12:54 ` Stefan Hajnoczi
2019-09-19 14:01 ` Oleinik, Alexander
2019-09-20 9:33 ` Stefan Hajnoczi
2019-09-30 15:17 ` Alexander Oleinik
2019-09-18 23:19 ` [Qemu-devel] [PATCH v3 18/22] fuzz: expose fuzz target name Oleinik, Alexander
2019-09-24 7:49 ` Darren Kenny
2019-09-18 23:19 ` [Qemu-devel] [PATCH v3 19/22] fuzz: add support for qos-assisted fuzz targets Oleinik, Alexander
2019-09-18 23:19 ` [Qemu-devel] [PATCH v3 20/22] fuzz: add i440fx " Oleinik, Alexander
2019-09-19 13:08 ` Stefan Hajnoczi
2019-09-18 23:19 ` [Qemu-devel] [PATCH v3 21/22] fuzz: add virtio-net fuzz target Oleinik, Alexander
2019-09-18 23:19 ` [Qemu-devel] [PATCH v3 22/22] fuzz: add documentation to docs/devel/ Oleinik, Alexander
2019-09-23 14:54 ` Darren Kenny
2019-09-19 10:33 ` [Qemu-devel] [PATCH v3 00/22] Add virtual device fuzzing support Stefan Hajnoczi
2019-09-19 13:10 ` Stefan Hajnoczi
2019-09-20 0:19 ` no-reply
2019-09-20 0:19 ` no-reply
2019-09-20 0:21 ` no-reply
2019-09-20 0:24 ` no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=adef69da-6966-33c1-9c52-6c4c4c98fe35@redhat.com \
--to=thuth@redhat.com \
--cc=alxndr@bu.edu \
--cc=bsd@redhat.com \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).