| Message ID | 20190918231846.22538-3-alxndr@bu.edu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add virtual device fuzzing support | expand |
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>
On Wed, Sep 18, 2019 at 11:19:29PM +0000, 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(-) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
On 19/09/19 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. I'd prefer "qi2c_{send,recv}" since that is consistent with "qvirtio_" functions and with the name of the "QI2CDevice" struct. Paolo
On Thu, 2019-09-19 at 13:15 +0200, Paolo Bonzini wrote: > On 19/09/19 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. > > I'd prefer "qi2c_{send,recv}" since that is consistent with > "qvirtio_" > functions and with the name of the "QI2CDevice" struct. Ok - i'll change this.
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); }
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(-)