From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5AFD9C33CA0 for ; Fri, 29 Nov 2019 21:47:53 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 259672464B for ; Fri, 29 Nov 2019 21:47:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=bushare.onmicrosoft.com header.i=@bushare.onmicrosoft.com header.b="IzfED2RK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 259672464B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bu.edu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iao7E-00068l-3a for qemu-devel@archiver.kernel.org; Fri, 29 Nov 2019 16:47:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48125) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ianue-00005p-QT for qemu-devel@nongnu.org; Fri, 29 Nov 2019 16:34:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ianuc-0002rX-Nj for qemu-devel@nongnu.org; Fri, 29 Nov 2019 16:34:52 -0500 Received: from mail-eopbgr790122.outbound.protection.outlook.com ([40.107.79.122]:35989 helo=NAM03-CO1-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 1ianua-0002ny-RN for qemu-devel@nongnu.org; Fri, 29 Nov 2019 16:34:50 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KMCojlOxfrOGhMz+enL8g35hsar4hDt/16P6xQpuSQRvqVrCsop1sCLMjblOE3lEpzBbgQ7FkW+WypZiVDWOsrnafekzg0Gd4pN60o3vD30PmQjpls4Awcdn750xa7hLBcAcfZhxl0EICoIr8ApxQWlc7mPjDo0jSJ6LkUnRASYMpOiutBhYaUcd5q/m/Xn14q1FI6CTBPsVPpSPJNExby10ctNijMtqSrBmoY+KcY6kW6bZUBKMuT2zYrRALV4NJq8iZklqoXr0jiGA3pR+BtosXj9HyqFprZomFnPYkClRP27x0kbckJqstCgo+rF4UABxDuaNUWMi8WG1ijXNTw== 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=NEHhONQEfwBkh6yLTTN/LsOtu5k8ct+iEHv7rftKbGw=; b=GaKR0G5JqkWnHAGuxi3HrgW+rX9jLDuwiziyVgp0TqhHTfuShuIQB62HEeP7h4yhD2kTYdY8FmstgG/hX81imMbhMLampD/Mp4ZpRNbqC5vvGn1uJAsHeyAJM5NRcGfKZJtkQWH3uo8jlakp+CETqHXkpWml3dWaPzKGPh/CRlq7M5mFk8ARVRGexp14by0xH+BCLVIBkk70u8GsJppF7Yt1M4IAkgCvnjl8IiYcd3RG5JhTk/xRaDPENvc+IedxptFPNaiYyBwgnTAl1HMUYXhRgd35AMsDrE89xpdYyQjvXz3NuzUvqSFazq1jx6AxOqeuldmYdMCZVcmXHN45/Q== 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=NEHhONQEfwBkh6yLTTN/LsOtu5k8ct+iEHv7rftKbGw=; b=IzfED2RKNGu8xBcAOIvJhvN5NzqIXCa2uiOaSaxGmkO6vKFQHUpxzp7bz9ndczh8ciZBm+++NQroN7BrEyuAkyObg4gG7HgN71LG5aK64IKbwpRc/G/ZY5Y0YmzgjAVejsQO9zABO69iZLPMkvBEAu8IIJk7HEGv4tF4/kZvLj0= Received: from DM6PR03MB4795.namprd03.prod.outlook.com (20.179.107.22) by DM6PR03MB5050.namprd03.prod.outlook.com (10.141.161.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2495.18; Fri, 29 Nov 2019 21:34:41 +0000 Received: from DM6PR03MB4795.namprd03.prod.outlook.com ([fe80::2557:454e:205e:4d74]) by DM6PR03MB4795.namprd03.prod.outlook.com ([fe80::2557:454e:205e:4d74%2]) with mapi id 15.20.2495.014; Fri, 29 Nov 2019 21:34:41 +0000 From: "Oleinik, Alexander" To: "qemu-devel@nongnu.org" Subject: [PATCH v6 05/21] libqtest: Add a layer of abstraciton to send/recv Thread-Topic: [PATCH v6 05/21] libqtest: Add a layer of abstraciton to send/recv Thread-Index: AQHVpvzPGlfTYZB/3UWCvI/IlvXPdw== Date: Fri, 29 Nov 2019 21:34:41 +0000 Message-ID: <20191129213424.6290-6-alxndr@bu.edu> References: <20191129213424.6290-1-alxndr@bu.edu> In-Reply-To: <20191129213424.6290-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: BL0PR1501CA0025.namprd15.prod.outlook.com (2603:10b6:207:17::38) To DM6PR03MB4795.namprd03.prod.outlook.com (2603:10b6:5:18c::22) 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: ff56ab7a-f48d-45d7-c38e-08d77513f1af x-ms-traffictypediagnostic: DM6PR03MB5050: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:268; x-forefront-prvs: 0236114672 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(376002)(366004)(346002)(39860400002)(136003)(396003)(199004)(189003)(54906003)(81156014)(81166006)(66066001)(6436002)(3846002)(8936002)(66946007)(6116002)(1076003)(66446008)(64756008)(66476007)(256004)(66556008)(316002)(786003)(8676002)(6512007)(102836004)(6486002)(478600001)(71190400001)(71200400001)(2351001)(86362001)(6506007)(14454004)(2501003)(75432002)(386003)(5640700003)(2906002)(6916009)(7736002)(2616005)(25786009)(26005)(52116002)(88552002)(99286004)(5660300002)(76176011)(186003)(446003)(11346002)(305945005)(50226002)(36756003)(4326008); DIR:OUT; SFP:1102; SCL:1; SRVR:DM6PR03MB5050; H:DM6PR03MB4795.namprd03.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; 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: nz5D9FcaXJCtbWyrt564gKM0uLngQxV767kQCUFcvVtsz/OPgkNBvS6TND48pylODTQSXNzG7hftKTmIch4eZyNPIvnCBkkhOLNh1P50kgWOgEimvG3UjZ/mfNMcsLkK2IIxCxzvZKjFHn1cGfEjzHK0du2z2di2qvqMQbmA85xla4PY4/xHWNdvFZ1Xc/PR9Bef7pSHounH1H3CjZ2z4bGf2j+MZOZEewiWuMcMNSggzFX5kI/m4WoKHHMnzj3/EQDS1m4qfvq0oEFGPZQM3SxRqf9yO49Myk3DeVkRJZTKDWC8vtB9OXIsBYeO6uaMu9JXE/0OBztl6S414zEEp3B+2/PhfOvGB9+t+f7KwRAH4VuoJSyw1d0+H1HyKCKSP0L2E2rRw2BHHbQOGFS/+1Xs143J6ts+exFpn8BEcFk1Hug2gL8t6DZDqb7Jvc4P Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: bu.edu X-MS-Exchange-CrossTenant-Network-Message-Id: ff56ab7a-f48d-45d7-c38e-08d77513f1af X-MS-Exchange-CrossTenant-originalarrivaltime: 29 Nov 2019 21:34:41.7809 (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: VV4JNEr7AkB7lyIxmhnDXwLhUmWSOO6Sq8oGr8wpmwiBLMTPRmwT7nQNzwujeRoS X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR03MB5050 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.79.122 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 , "Oleinik, Alexander" , "bsd@redhat.com" , "stefanha@redhat.com" , "pbonzini@redhat.com" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This makes it simple to swap the transport functions for qtest commands to and from the qtest client. For example, now it is possible to directly pass qtest commands to a server handler that exists within the same process, without the standard way of writing to a file descriptor. Signed-off-by: Alexander Bulekov --- tests/libqtest.c | 50 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index 91e9cb220c..ac4b6ab5f0 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -35,6 +35,17 @@ #define SOCKET_TIMEOUT 50 #define SOCKET_MAX_FDS 16 =20 + +typedef void (*QTestSendFn)(QTestState *s, const char *buf); +typedef void (*ExternalSendFn)(void *s, const char *buf); +typedef GString* (*QTestRecvFn)(QTestState *); + +typedef struct QTestClientTransportOps { + QTestSendFn send; + ExternalSendFn external_send; + QTestRecvFn recv_line; +} QTestTransportOps; + struct QTestState { int fd; @@ -45,6 +56,7 @@ struct QTestState bool big_endian; bool irq_level[MAX_IRQ]; GString *rx; + QTestTransportOps ops; }; =20 static GHookList abrt_hooks; @@ -52,6 +64,14 @@ static struct sigaction sigact_old; =20 static int qtest_query_target_endianness(QTestState *s); =20 +static void qtest_client_socket_send(QTestState*, const char *buf); +static void socket_send(int fd, const char *buf, size_t size); + +static GString *qtest_client_socket_recv_line(QTestState *); + +static void qtest_client_set_tx_handler(QTestState *s, QTestSendFn send); +static void qtest_client_set_rx_handler(QTestState *s, QTestRecvFn recv); + static int init_socket(const char *socket_path) { struct sockaddr_un addr; @@ -234,6 +254,9 @@ QTestState *qtest_init_without_qmp_handshake(const char= *extra_args) sock =3D init_socket(socket_path); qmpsock =3D init_socket(qmp_socket_path); =20 + qtest_client_set_rx_handler(s, qtest_client_socket_recv_line); + qtest_client_set_tx_handler(s, qtest_client_socket_send); + qtest_add_abrt_handler(kill_qemu_hook_func, s); =20 command =3D g_strdup_printf("exec %s " @@ -379,13 +402,9 @@ static void socket_send(int fd, const char *buf, size_= t size) } } =20 -static void socket_sendf(int fd, const char *fmt, va_list ap) +static void qtest_client_socket_send(QTestState *s, const char *buf) { - gchar *str =3D g_strdup_vprintf(fmt, ap); - size_t size =3D strlen(str); - - socket_send(fd, str, size); - g_free(str); + socket_send(s->fd, buf, strlen(buf)); } =20 static void GCC_FMT_ATTR(2, 3) qtest_sendf(QTestState *s, const char *fmt,= ...) @@ -393,8 +412,11 @@ static void GCC_FMT_ATTR(2, 3) qtest_sendf(QTestState = *s, const char *fmt, ...) va_list ap; =20 va_start(ap, fmt); - socket_sendf(s->fd, fmt, ap); + gchar *str =3D g_strdup_vprintf(fmt, ap); va_end(ap); + + s->ops.send(s, str); + g_free(str); } =20 /* Sends a message and file descriptors to the socket. @@ -431,7 +453,7 @@ static void socket_send_fds(int socket_fd, int *fds, si= ze_t fds_num, g_assert_cmpint(ret, >, 0); } =20 -static GString *qtest_recv_line(QTestState *s) +static GString *qtest_client_socket_recv_line(QTestState *s) { GString *line; size_t offset; @@ -468,7 +490,7 @@ static gchar **qtest_rsp(QTestState *s, int expected_ar= gs) int i; =20 redo: - line =3D qtest_recv_line(s); + line =3D s->ops.recv_line(s); words =3D g_strsplit(line->str, " ", 0); g_string_free(line, TRUE); =20 @@ -1337,3 +1359,13 @@ void qmp_assert_error_class(QDict *rsp, const char *= class) =20 qobject_unref(rsp); } + +static void qtest_client_set_tx_handler(QTestState *s, + QTestSendFn send) +{ + s->ops.send =3D send; +} +static void qtest_client_set_rx_handler(QTestState *s, QTestRecvFn recv) +{ + s->ops.recv_line =3D recv; +} --=20 2.23.0