From nobody Tue Feb 10 11:14:41 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=bu.edu) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1580276468879697.5147955306763; Tue, 28 Jan 2020 21:41:08 -0800 (PST) Received: from localhost ([::1]:41442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwg67-0002wz-CM for importer@patchew.org; Wed, 29 Jan 2020 00:41:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44790) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iwfzb-0007rL-5Y for qemu-devel@nongnu.org; Wed, 29 Jan 2020 00:34:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iwfzZ-0001wH-UV for qemu-devel@nongnu.org; Wed, 29 Jan 2020 00:34:23 -0500 Received: from mail-mw2nam10on2110.outbound.protection.outlook.com ([40.107.94.110]:45280 helo=NAM10-MW2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iwfzZ-0001tn-O1 for qemu-devel@nongnu.org; Wed, 29 Jan 2020 00:34:21 -0500 Received: from SN6PR03MB3871.namprd03.prod.outlook.com (52.135.102.32) by SN6PR03MB4206.namprd03.prod.outlook.com (52.135.110.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2665.20; Wed, 29 Jan 2020 05:34:20 +0000 Received: from SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::9c11:10cd:6e97:bbe8]) by SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::9c11:10cd:6e97:bbe8%7]) with mapi id 15.20.2665.026; Wed, 29 Jan 2020 05:34:20 +0000 Received: from mozz.bu.edu (128.197.127.33) by MN2PR05CA0029.namprd05.prod.outlook.com (2603:10b6:208:c0::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2686.19 via Frontend Transport; Wed, 29 Jan 2020 05:34:17 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SvWP7TTxO6O6aGmtM+Oy4rhr/urXdM5DaYLr9qPyVHF2OOPN41lDX0kFPnyk7CFZMCYek2krqw7xgB6/yWl5C0gAx2DYCHYOlIqMs3rWUB7wD2jTmp+uZhTsJP3TACYcr2RFR5cgvUO95n1MZqqaEMJG4jloxDFfcGuaI18Tj77DK0wT6EnoXYqrTnMWBCMYVcPF4JLH8LiK8BcZRYTLtW3uziJzfYebdsS8rfeO8wpGFivVqS5h/6Pd9fH6n02TaKx7c/zuAzlXThteSQsEGQBp2u4K7PW9k6R+f6F2XAXM5/L4Thzs7FJGBeEo2+KcttyImxIGoFSQspgmrKDYHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=t5mnk3e1ZGtlIjME4MaJ9YJ8gCqwJraw8SK866ibAro=; b=h9P2qDqQfoi2C/DuXPhiv5jKi4Is1gjtGuoWktUWA5H6TwwXk//MLOzPRTgISERiXFDq8V86bJJ63BvWJJGrz0CVRaIfxFUXd0y6Drwhpx614ym1dpcw7t2k2HWWPwte4HjgGtyV361XLV/AuRQCCUKNyFIUT4tSCPDoZSt7mq6s4c+Tn62ZAVslNhHU7jAHrEI4/bDmp0kU+/G2zVckUZJljyEgDKVl9YLAhdQrCUATrANzVucMx86ZSprQgJ++GDz0xIZrjjPNaP+U0qkAHF6oQ+pYNRDcenA9m/IxhChoORQKt/ut5dblc3OSgCpSc02WzCQ4nNE8TMoaqOF0HQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bu.edu; dmarc=pass action=none header.from=bu.edu; dkim=pass header.d=bu.edu; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bushare.onmicrosoft.com; s=selector2-bushare-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=t5mnk3e1ZGtlIjME4MaJ9YJ8gCqwJraw8SK866ibAro=; b=7WuWq6I0DCYg5T8lvxgFGmFRMXagK/cOEkdKpgIVA8xEqI8eu2L09jdKpSMsOI4JyF72NPDEQVU6OLuoQ2ZYSB0CzmD+L81FeEN7AmotDZ7ak5T+DyCx9gdhb+UNqz5Yi7u+Ja0sDBd3pyI13/va58JzzkZUFvLMGSa2yJ0f2Io= From: "Bulekov, Alexander" To: "qemu-devel@nongnu.org" Subject: [PATCH v8 08/21] libqos: rename i2c_send and i2c_recv Thread-Topic: [PATCH v8 08/21] libqos: rename i2c_send and i2c_recv Thread-Index: AQHV1mXA9OiKkf3e90WaPrlX2yGbuQ== Date: Wed, 29 Jan 2020 05:34:18 +0000 Message-ID: <20200129053357.27454-9-alxndr@bu.edu> References: <20200129053357.27454-1-alxndr@bu.edu> In-Reply-To: <20200129053357.27454-1-alxndr@bu.edu> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.23.0 x-originating-ip: [128.197.127.33] x-clientproxiedby: MN2PR05CA0029.namprd05.prod.outlook.com (2603:10b6:208:c0::42) To SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) authentication-results: spf=none (sender IP is ) smtp.mailfrom=alxndr@bu.edu; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 9dc1ef48-5eea-4b1f-5e47-08d7a47ce27f x-ms-traffictypediagnostic: SN6PR03MB4206: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3173; x-forefront-prvs: 02973C87BC x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(376002)(136003)(366004)(346002)(396003)(39860400002)(189003)(199004)(478600001)(75432002)(36756003)(316002)(6916009)(2906002)(786003)(4326008)(54906003)(26005)(186003)(956004)(2616005)(6486002)(7696005)(52116002)(16526019)(1076003)(5660300002)(71200400001)(86362001)(66446008)(66556008)(66946007)(66476007)(8936002)(81156014)(81166006)(64756008)(8676002); DIR:OUT; SFP:1102; SCL:1; SRVR:SN6PR03MB4206; H:SN6PR03MB3871.namprd03.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; received-spf: None (protection.outlook.com: bu.edu does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: IGAfQU30oaF+9fp5U/yX8K6Zo4a5aDzQGN3xsesGt+Uzproh7kXN8jdzDly9iu3T3H1zbem/zGJAqAPYdBBWFXHHjshqKro9s8VFavR/aYgrVzgx9TAbCYELPSXhAZrMfInE9JcrwtFxOILKX5qm+j4HAK1s3PzSYiI2AmdKWNOM30B2zoKosSAmVqg5WVb9CDx3cjskn0+a3kO/34uKTxA86sisVzGvOgA9lOyFtHi1SdrFuw1qR1SlFb/JsELYoe1C3CEAtXl+LoKNEoF+3CZT0NjRj+R7FfEdmdRNTf6cjV/h8a9kT3W77Qk5ze03Qb3reI9NG9KMSbopBbrr67hihQnyMr35eozCYmtLkSePIaYoNwrID4EK41kTwIYcEs/tQrqtC9GJeOmEChp5Aow+jsRuEQrsAtIrKe2B8F9Gn/Rfz7XYw6Qr42uVsnZP x-ms-exchange-antispam-messagedata: +0EBVXjFtcs1Smyvqjy6z74LuAz3cy+7gmUDxURnzAj0DaVlAUWnVznG6sudPJY6Dj5JPAeD8vKgm0oWnt2hV5HDEulYyPD6OoCayEOzCYFjTa2pOrqfLMFSB1lVRGMAGcbRgF3P82d/rKHOOXFoRg== Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: bu.edu X-MS-Exchange-CrossTenant-Network-Message-Id: 9dc1ef48-5eea-4b1f-5e47-08d7a47ce27f X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Jan 2020 05:34:18.1141 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: d57d32cc-c121-488f-b07b-dfe705680c71 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: S+YcEYXYas8l495C1pucKTOOVhxM2tSouIeIHEKA6UyPlMHKB1xPDz7/gOspHlTV X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR03MB4206 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.94.110 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , "Bulekov, Alexander" , "bsd@redhat.com" , "stefanha@redhat.com" , "pbonzini@redhat.com" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @bushare.onmicrosoft.com) Content-Type: text/plain; charset="utf-8" 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 Acked-by: Thomas Huth Reviewed-by: Stefan Hajnoczi Reviewed-by: Darren Kenny --- 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" =20 -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); } =20 -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); } =20 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 =3D g_malloc(len + 1); cmd[0] =3D reg; memcpy(&cmd[1], buf, len); - i2c_send(i2cdev, cmd, len + 1); + qi2c_send(i2cdev, cmd, len + 1); g_free(cmd); } =20 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); =20 -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); =20 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, QGue= stAllocator *alloc) =20 pca9552_init(i2cdev); =20 - i2c_send(i2cdev, ®, 1); + qi2c_send(i2cdev, ®, 1); =20 /* PCA9552_LS0 */ - i2c_recv(i2cdev, &resp, 1); + qi2c_recv(i2cdev, &resp, 1); g_assert_cmphex(resp, =3D=3D, 0x54); =20 /* PCA9552_LS1 */ - i2c_recv(i2cdev, &resp, 1); + qi2c_recv(i2cdev, &resp, 1); g_assert_cmphex(resp, =3D=3D, 0x55); =20 /* PCA9552_LS2 */ - i2c_recv(i2cdev, &resp, 1); + qi2c_recv(i2cdev, &resp, 1); g_assert_cmphex(resp, =3D=3D, 0x55); =20 /* PCA9552_LS3 */ - i2c_recv(i2cdev, &resp, 1); + qi2c_recv(i2cdev, &resp, 1); g_assert_cmphex(resp, =3D=3D, 0x54); } =20 --=20 2.23.0