From nobody Fri Nov 14 15:21:07 2025 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) ARC-Seal: i=2; a=rsa-sha256; t=1588832799; cv=pass; d=zohomail.com; s=zohoarc; b=bMD14sbC4AfFpRsQYfBJVusZfVAA0S9zRZZSYI4ULqjoVPKryPbNw68o0l0dU0rkmaMwbLSe/ffZB4foB5TbBjPMWbINjQTGvo83ram1mOey7JykRPlZSAvV3JdLLQ5nWCUoIHoIoV7JfemjooqOd/XCdgreCwvgM+MgxrCkkm4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588832799; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=28o2N1cLnh6R4oKLC2EdwvxWzWU5Sjt6kB74tupUqmU=; b=H5ZLeTLq2IAg6MZ2p15sq23dpsS8K8GMn9vYvXF/TYwi5XT43A/CKyzBxsrNzaXNeM65UnyyeKmqu571l6u3+pwpEsoyi2nJrBvb+LHMLSXrFHBkX0q8O6G/fRAaE1eBsnytFQXFqaj5geLkc6qhk7M8g8MdXeZDlX9ashcqwC4= ARC-Authentication-Results: i=2; 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 1588832799761967.8373960952983; Wed, 6 May 2020 23:26:39 -0700 (PDT) Received: from localhost ([::1]:54462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWZzR-0008LI-PC for importer@patchew.org; Thu, 07 May 2020 02:26:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWZyV-0007RL-4v for qemu-devel@nongnu.org; Thu, 07 May 2020 02:25:39 -0400 Received: from mail-eopbgr680113.outbound.protection.outlook.com ([40.107.68.113]:50820 helo=NAM04-BN3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWZyR-0003wQ-GS for qemu-devel@nongnu.org; Thu, 07 May 2020 02:25:38 -0400 Received: from SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) by SN6PR03MB4591.namprd03.prod.outlook.com (2603:10b6:805:f6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26; Thu, 7 May 2020 06:24:58 +0000 Received: from SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::640a:1123:37c1:42db]) by SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::640a:1123:37c1:42db%3]) with mapi id 15.20.2979.028; Thu, 7 May 2020 06:24:58 +0000 Received: from mozz.bu.edu (128.197.127.33) by BL0PR02CA0125.namprd02.prod.outlook.com (2603:10b6:208:35::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.28 via Frontend Transport; Thu, 7 May 2020 06:24:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R5NL2JlfUFpOdnejq3KD77FfZ1jtsFTQJTm7DnVn9L2Uj0xmlv+oqGnbAaS/+itPbZ1MDHMc0xxGwUdNU18vRMjY1kN0aI9m8/s48rvcZKgt76WJqhGRXtd5I7bPEfyidRih0eeFzcXOZrifb99P5CWEDnYf1cs+GDJdgKjlBsOE5yF8v2PWE+Kj2ot9I0hbUuU7Miuo7WHopq7k91N/lraQxGDVXt6sP/GRfA8nUAYAZ74DLHlXSz9elywcHjRL/cS3baOQUxckon/OLM6dQA+PleoHz1VqesVL8yk4GZw3MXnqn+b6myclWKtcR4kqVCkkmW8nTCfzMn6EW1yUzQ== 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=28o2N1cLnh6R4oKLC2EdwvxWzWU5Sjt6kB74tupUqmU=; b=MeEWNLVxqNQe2xlq8mmPbh9A40r4CHwJHfOHOXF1f4OBLOfW0NcWEp4boS6Ec/vUcDNJbtrtrPhGNr/epYDOmW9fDsNLQoOoKVsRpDMNEyazzbv6fhAqAE2nNaaKpcRLrLKJFjJKrX1BjtO2y1/QOVkax64K09/PU9NAf6e+MC75zBRHBALCwLrzHKhJnRdO3DCd2lBehuH7+9/QZHcRJ2fMsT6KdE1Au3KsQjzXO+GVdF2dM6eWXImnGtCjr4ZeA/qsdmoCh35a9hqcNLhSENe7J9iHp0O3M9RrcqTuo9szuU5DFaTceZIcXpmZCJXDab3jB70rQn3YNvLXSIkHZQ== 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=28o2N1cLnh6R4oKLC2EdwvxWzWU5Sjt6kB74tupUqmU=; b=MM6FI8v3I7uozAj6QUFiMSy2UInETN20oHwWjiItcaudgXTH5s/RIYlL3sqnD9KrwoMRknWy1P/fpayFLecPqEWCVGlF2s7vOeRapVuAxpvc3Um7z7LckG/H9tmPCmkBlih6Adte5QhCTLHTguJnRGr/+CxcyUoqXyLtQzOFtfQ= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=bu.edu; From: Alexander Bulekov To: qemu-devel@nongnu.org Subject: [PATCH v2 1/2] chardev: enable distinct input for -chardev file Date: Thu, 7 May 2020 02:24:41 -0400 Message-Id: <20200507062442.15215-2-alxndr@bu.edu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200507062442.15215-1-alxndr@bu.edu> References: <20200507062442.15215-1-alxndr@bu.edu> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BL0PR02CA0125.namprd02.prod.outlook.com (2603:10b6:208:35::30) To SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [128.197.127.33] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 24978b55-ffa8-4ba7-349f-08d7f24f5d6c X-MS-TrafficTypeDiagnostic: SN6PR03MB4591: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-Forefront-PRVS: 03965EFC76 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l3XhmBPUNb1VncfH/i3USSbVpZ5r0MX2MJEZtbVg0W1Cg4e2CUum0ruAzzuvrBdHfrpkKryftPXZl00TUXYRg5zq7bvrR/6EZWK4kR+KKHnCNhugmGvUs1Fuxi3t3orwtBSM3SZQ0rKsFQ791wFx4TQF5umP/fJK5oNk8MwlWtAs6ZMzrlNOWeX/KtWRThe5HuNKMoFezxo7v1bftw1+IUV2q9SfQI+2UMFtNEcy+OY3LLJCmyYNnq1/saCtqpidvKcMR/EGHHYRpZBrwvNOjkb+CbDaIQWbV8Vbj7XCJ4dcdJVLc37SeeKlUl8p/vA2UmtWjdSPNNyFQ8ualjuwzvUWqnakHQ2v2NKYI1LQWAlq63TFWFMZM17WOLY1KKCK0QZZ7GAGuSgl5f9HlRwF4+z1slYi/k/aBnEuJjHeMxXXQzHlp8HYFzMD4YMeYEhvWu9zlRistEdkYd964S0/mRJDsEDpXWP3z/z1/lbFSCexMrv6gBkKGuNojOmNsjpuA7apJm15pdT7t+1mA2biUA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR03MB3871.namprd03.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(396003)(376002)(366004)(346002)(136003)(39860400002)(33430700001)(33440700001)(5660300002)(2616005)(478600001)(66946007)(1076003)(83280400001)(8936002)(83300400001)(83310400001)(83290400001)(83320400001)(186003)(4326008)(956004)(6486002)(26005)(16526019)(66476007)(66556008)(54906003)(36756003)(8676002)(6666004)(86362001)(6916009)(75432002)(7696005)(316002)(2906002)(786003)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: FJwd3dPy8tr0F2pZhgD5MxPOLpGufLy67Ehdn+gwEGce5sBM4e3GEXJ5iN9NTMBI7nORcB31c95oog8QF2X0TB4/MnS3ePCB8W0I+yizX4CJ1cu+2vEQzIU3rglLeT5LAhv+gb6jc5IRnXdXC2vgy3AeobKoaTvDUR8pnUETaxnGJcrBnhJvPXZ8ljuyLBjB38WzY8W4mQYGBadeGSkh13AnLVRtNMohlO1y0Dda1FTrIAd0PA9dj+5kvxmfdqTVCHA5YpQ6yOMr4l+LBaI4s27u4i9s5NbcJItQNDlH2NBwOMTk0Q5Md6Vj9/t68cv56tMjP4P330/+cjwXEjj+Gfa3TUbPqEs3MFpYKXag5jxrxzo9y2Vo5dqrOYOxD+Xu7JRWlxUSsO9ql6+03UMILHx5QbutdPgfFdlCMY6Df4i0/+NDcwE6j6vO/htht6w5RvgQqIo9xaXfVt1dk+pUTUdwuBZzr7XbJxInxV+2EzDI+P9MKEfdy0l7tEd4B/zt1t+EYI/p6cUFo5imn0yDItvWP+nekWH7NRsmkguJXy0MjUtpYXFl9cT7WpNP1rHARoNCf6jCVArsXbP0tViEp4gZYHMFzWqDNSc1papCFdIDJGZMTd8KCbDXEiGc8x8GBQ5BVogehJ95OeALZTcscIRPt6eyzXVB7EwNGsQI61wt/CvVQtvsuxylfBSCNqaKgB0mLTWw+hMTHJ7bOREjFahbxqE9Zv8hwJwyvkASNG9w9ndxXsH+IrNF6Njyq5OKClZl+q84yz6WKofpftpqCCzXjoaLx5ULX6d2Y0g747U= X-OriginatorOrg: bu.edu X-MS-Exchange-CrossTenant-Network-Message-Id: 24978b55-ffa8-4ba7-349f-08d7f24f5d6c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2020 06:24:58.1384 (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: Hv08U1ekOEu35Hz5tcS/a4KyRSXGUgK0+ki9cDHi4pj7NDreo7xRVAUWgsPSmD7H X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR03MB4591 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: pass client-ip=40.107.68.113; envelope-from=alxndr@bu.edu; helo=NAM04-BN3-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/07 02:25:32 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HK_RANDOM_ENVFROM=0.001, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: berrange@redhat.com, Alexander Bulekov , marcandre.lureau@gmail.com, stefanha@redhat.com, Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= 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" char-file already supports distinct paths for input/output but it was only possible to specify a distinct input through QMP. With this change, we can also specify a distinct input with the -chardev file argument: qemu -chardev file,id=3Dchar1,path=3D/out/file,pathin=3D/in/file Signed-off-by: Alexander Bulekov Reviewed-by: Stefan Hajnoczi Reviewed-by: Darren Kenny --- chardev/char-file.c | 5 +++++ chardev/char.c | 3 +++ qemu-options.hx | 7 +++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/chardev/char-file.c b/chardev/char-file.c index 2fd80707e5..031f2aa7d7 100644 --- a/chardev/char-file.c +++ b/chardev/char-file.c @@ -100,6 +100,7 @@ static void qemu_chr_parse_file_out(QemuOpts *opts, Cha= rdevBackend *backend, Error **errp) { const char *path =3D qemu_opt_get(opts, "path"); + const char *pathin =3D qemu_opt_get(opts, "pathin"); ChardevFile *file; =20 backend->type =3D CHARDEV_BACKEND_KIND_FILE; @@ -110,6 +111,10 @@ static void qemu_chr_parse_file_out(QemuOpts *opts, Ch= ardevBackend *backend, file =3D backend->u.file.data =3D g_new0(ChardevFile, 1); qemu_chr_parse_common(opts, qapi_ChardevFile_base(file)); file->out =3D g_strdup(path); + if (pathin) { + file->has_in =3D true; + file->in =3D g_strdup(pathin); + } =20 file->has_append =3D true; file->append =3D qemu_opt_get_bool(opts, "append", false); diff --git a/chardev/char.c b/chardev/char.c index e77564060d..97e03a8e48 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -849,6 +849,9 @@ QemuOptsList qemu_chardev_opts =3D { },{ .name =3D "path", .type =3D QEMU_OPT_STRING, + },{ + .name =3D "pathin", + .type =3D QEMU_OPT_STRING, },{ .name =3D "host", .type =3D QEMU_OPT_STRING, diff --git a/qemu-options.hx b/qemu-options.hx index 292d4e7c0c..488961099b 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2938,7 +2938,7 @@ DEF("chardev", HAS_ARG, QEMU_OPTION_chardev, "-chardev vc,id=3Did[[,width=3Dwidth][,height=3Dheight]][[,cols=3Dcols= ][,rows=3Drows]]\n" " [,mux=3Don|off][,logfile=3DPATH][,logappend=3Don|off]\n" "-chardev ringbuf,id=3Did[,size=3Dsize][,logfile=3DPATH][,logappend=3D= on|off]\n" - "-chardev file,id=3Did,path=3Dpath[,mux=3Don|off][,logfile=3DPATH][,lo= gappend=3Don|off]\n" + "-chardev file,id=3Did,path=3Dpath[,pathin=3DPATH][,mux=3Don|off][,log= file=3DPATH][,logappend=3Don|off]\n" "-chardev pipe,id=3Did,path=3Dpath[,mux=3Don|off][,logfile=3DPATH][,lo= gappend=3Don|off]\n" #ifdef _WIN32 "-chardev console,id=3Did[,mux=3Don|off][,logfile=3DPATH][,logappend= =3Don|off]\n" @@ -3137,13 +3137,16 @@ The available backends are: Create a ring buffer with fixed size ``size``. size must be a power of two and defaults to ``64K``. =20 -``-chardev file,id=3Did,path=3Dpath`` +``-chardev file,id=3Did,path=3Dpath[,pathin=3Dpathin]`` Log all traffic received from the guest to a file. =20 ``path`` specifies the path of the file to be opened. This file will be created if it does not already exist, and overwritten if it does. ``path`` is required. =20 + ``pathin`` specifies a separate file as the input to the chardev. If + ``pathin`` is omitted, ``path`` is used for both input and output + ``-chardev pipe,id=3Did,path=3Dpath`` Create a two-way connection to the guest. The behaviour differs slightly between Windows hosts and other hosts: --=20 2.26.2 From nobody Fri Nov 14 15:21:07 2025 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) ARC-Seal: i=2; a=rsa-sha256; t=1588832800; cv=pass; d=zohomail.com; s=zohoarc; b=g9PjxVUUetIgqR17uDYZS8f9SmotEKAfI91JETsXVh+MSPzKtXQ/mtDONhIfCBJwIATxT/lHlLN3qYz8RPODVXaeyjKKLln4y433y9zpf9wFwB4ju869FJbQPCrvhYNHKzOZCf1UH2e2Dk9oIatJVoucHBQZObJbtFD3w1qc2R0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588832800; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=P/fcKKS8BTR7zBVJiQLnJqk4l0RfdmKf1n1EIVwhEM8=; b=DuBfgBS0mUSc4EebcsgENRvY3T4XUnWbovHZ9LGb+DNoQYKeSyZm2JbQfj8bk+OJgljqtXu4qesnf7sh9DvFRxEFAPDRzvV0yoSYU/SDJN1OsAaMjSPaUor5BiOQnZoSHHzErzzr9KkeQrCtyW5MfkZFVaDmahR7fWiKPlS0i9M= ARC-Authentication-Results: i=2; 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 1588832800083145.98228496790375; Wed, 6 May 2020 23:26:40 -0700 (PDT) Received: from localhost ([::1]:54500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWZzS-0008M5-I6 for importer@patchew.org; Thu, 07 May 2020 02:26:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWZyX-0007RS-1Z for qemu-devel@nongnu.org; Thu, 07 May 2020 02:25:41 -0400 Received: from mail-eopbgr680113.outbound.protection.outlook.com ([40.107.68.113]:50820 helo=NAM04-BN3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWZyW-0003wQ-55 for qemu-devel@nongnu.org; Thu, 07 May 2020 02:25:40 -0400 Received: from SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) by SN6PR03MB4591.namprd03.prod.outlook.com (2603:10b6:805:f6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26; Thu, 7 May 2020 06:24:59 +0000 Received: from SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::640a:1123:37c1:42db]) by SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::640a:1123:37c1:42db%3]) with mapi id 15.20.2979.028; Thu, 7 May 2020 06:24:59 +0000 Received: from mozz.bu.edu (128.197.127.33) by BL0PR02CA0125.namprd02.prod.outlook.com (2603:10b6:208:35::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.28 via Frontend Transport; Thu, 7 May 2020 06:24:58 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lh0ghTEs0sv8qTimlMQCzKR4vFyILg6xIM6RMcWq6eym7VWi7AV6jDyBLnRbP+PewN1PW0dlpcxR1WHEtXeqb8JAsW2tbTy3N/TERYZ+wR4un1uehWENUIrNSec9YDkJevhFPpZAIY1nMXPaCX2D7RZDJ+3t9nT4H4tRgbeUws/fqjN3typdHjNJtwEazPRX3HJPEmBEV4TVlRQh6V+qIALlgMkEuu3U/LqOwSdUXYK5/2ZyUdCeM+TnpTFEfroQx1V0CT+7NhXkM8nbc0FQTG2V/yUSBF8lzAgJZdDwKeVfr4NTU7f+M5IGYB5VAgsnGOJcy5yTp/Qfve6oYYhl7A== 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=P/fcKKS8BTR7zBVJiQLnJqk4l0RfdmKf1n1EIVwhEM8=; b=nDloH4+tYhBxSCWZlMZ5Il4Y9Ie27sSjyaK25MHwQ+Gk+EaEZRJQRgoThNNTS21ZdA6uxl9EHU1SNckHG9oZn3GN1uKK9n65KqF7lW1vGc65fNFcJ4ZTa0Zeh5tnkATsGGkvr+EmuZbX5sZ4273UJVCggJ7gerEcWWk0fQTsYJPnn2Up2fQ0s23uUNAKlQ0rDsvwlYUszqUHuWBA+7V9X3ELN45WzMB5C7sHBmlYElWxSIqfnOdHV8IrKNNuqab1aEASUtLOiXxuvXPD8/toD2SYYNshPskIbv8RFKb9uj19lzD8jFQocZACM3qUNGoyPuz7msp86vqWKRxH3SS/mQ== 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=P/fcKKS8BTR7zBVJiQLnJqk4l0RfdmKf1n1EIVwhEM8=; b=jHQ/4j8wOjDBd+aBN08PH9ZHd3DvXMBSj0Ve4hs0gGY5GMamOT9PKIow0MKO7RBjQs0Z6mlcE+iGZpvZGOxW0H4RtKm9YdJXd0W3I8camBNC6U+b+N7nClF0QFFde+MzqO9RLUgZlfBU/GgJhYcIwfz6WhdsbE21aemTbTBi8po= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=bu.edu; From: Alexander Bulekov To: qemu-devel@nongnu.org Subject: [PATCH v2 2/2] char-file: add test for distinct path= and pathin= Date: Thu, 7 May 2020 02:24:42 -0400 Message-Id: <20200507062442.15215-3-alxndr@bu.edu> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200507062442.15215-1-alxndr@bu.edu> References: <20200507062442.15215-1-alxndr@bu.edu> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: BL0PR02CA0125.namprd02.prod.outlook.com (2603:10b6:208:35::30) To SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.26.2 X-Originating-IP: [128.197.127.33] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7e92c92f-4e17-4413-4a8c-08d7f24f5de5 X-MS-TrafficTypeDiagnostic: SN6PR03MB4591: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:288; X-Forefront-PRVS: 03965EFC76 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ANp/hQcw0wZgaMPc3gLicNnsspw8Y6oBx1hr5h3jee6Xxx+UsVl5ZHDbbuYThvHBlMu+w48BmDZcCXzAuf9HsbLP023QYGHlnlQqClNb2EngJmmvLlcCHIAtANgXJTEPfVw2M1RrtkaBJCJVBYYl7PcKvJKh7PaqEy7nNu9KsMtYyYmgDlelkeKqUysPIaKAxPlI5WdmMGpu8EdTqcYRSY2CERkxvUnPvEhFQtwcA4tOZpOqOkrnfz3RHAaympZsVrMhpuzKQHJnAhp9b/+hS2LbTRNXE+OAnbWMk5AYzKVkrBwiuhAqBfoozjPyopMgYEBiJfCLlJiTINQknfeGLlU0RSlPjrTXYHZG1LD77ge/FKJBBDy88+OUWcQmKX+Tad3cYTxhGgUIi2uN9FvohkSdosdRG0v4PRIIkumjajjNTzt2NpaS9lXK72vvjVETRNpX/CHclqDmuQzAy60s3cpMeTX4v4gvNryhXW64g2gtaPAglxVV9XM9RIerSacOXPAGDSA04Vo+Y2aLYVmdJQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR03MB3871.namprd03.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(396003)(376002)(366004)(346002)(136003)(39860400002)(33430700001)(33440700001)(5660300002)(2616005)(478600001)(66946007)(1076003)(83280400001)(8936002)(83300400001)(83310400001)(83290400001)(83320400001)(186003)(4326008)(956004)(6486002)(26005)(16526019)(66476007)(66556008)(36756003)(8676002)(6666004)(86362001)(6916009)(75432002)(7696005)(316002)(2906002)(786003)(52116002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 01/gY8Yn+rBYcUrn+Rna5Ds58HS8hO7ABYfosnRZUM+Pn5TCNbUhlL8xobl0wcEntYKuyUCURscZzUsep0rSVLPCcmA6XOGg2Bh28F7v6SVAl0Vd/qLVxS84WfIyXqNmGUMVVnr0+IVrVnbnyn5eU/IOkCba20fv4d92+HInOGVeY9ouf+gK5Jqcl0KaD5HUFdAYeG52UkhnMKUmJv5bizvmaL8i9iCGvQLpaaz5ilX2yN0mlG52vxrKNd6A7EeN9vrwhAls9JV7f4O8yoINbUXzBnLj/tM9iH0SbBfYlpGDXKlnhXhL2w0a52CXIaP5U/JbmoUm77ADOlpmkeDyDL4to/qea5hrspfZOIGIaGUqIyzAdqJsVcBid2oSmfx7hpIyeX+maKA2FQS9oq0b1X3ikpSfxITz244quaOQqeBjRSBthd/A2925ppeLm9iHHgwK6akOYLIf40/SxVMQqLWtryFAPvmAT7u5GRVAKWu9AIqdNxJNqYwtWe+Jp/YF0V37xwzmW1Z8uyKpAAHBoBMSqt5rkBKO4nwyKavcuiewQrjSPbUSmHm0jK1SQgZgcLcG4HNfOn5Z7IoDV4y9pSQY99sc67F6+PbMr9AvsJYUw+6TLAc0jE7ceMfauevuDXKcBUSS77ARDIk0K9yL4ZhtLcuXsWyN8VFsFaLKrPk3gSDhJjPT1M5bGRPg1jBGJZsxhNio9ASm15ag/xM7TrQ/MrM4ro1yMm7QhNivpucVRU5vxLJMQatRpUbSqB7UVfljcWC2XuOLYIyVNznXtj0fYvx70UNmmpVtk/Zuel0= X-OriginatorOrg: bu.edu X-MS-Exchange-CrossTenant-Network-Message-Id: 7e92c92f-4e17-4413-4a8c-08d7f24f5de5 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2020 06:24:58.9719 (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: Ok/heLd6oIO+tu11HYEUOV2XJHOMrcHMRLwjP+3D7/xsPOQ3sD3LSvr1IzoMouXE X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR03MB4591 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: pass client-ip=40.107.68.113; envelope-from=alxndr@bu.edu; helo=NAM04-BN3-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/07 02:25:32 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HK_RANDOM_ENVFROM=0.001, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: marcandre.lureau@gmail.com, berrange@redhat.com, stefanha@redhat.com, Alexander Bulekov 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" Signed-off-by: Alexander Bulekov --- tests/test-char.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/tests/test-char.c b/tests/test-char.c index 3afc9b1b8d..9b3e1e2a9b 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -1228,6 +1228,88 @@ static void char_file_test_internal(Chardev *ext_chr= , const char *filepath) g_free(out); } =20 +static int file_can_read(void *opaque) +{ + return 4096; +} + +static void file_read(void *opaque, const uint8_t *buf, int size) +{ + int ret; + Chardev *chr =3D *(Chardev **)opaque; + g_assert_cmpint(size, <=3D, file_can_read(opaque)); + + g_assert_cmpint(size, =3D=3D, 6); + g_assert(strncmp((const char *)buf, "hello!", 6) =3D=3D 0); + ret =3D qemu_chr_write_all(chr, buf, size); + g_assert_cmpint(ret, =3D=3D, 6); + quit =3D true; +} + +static void char_file_separate_input_file(void) +{ + char *tmp_path =3D g_dir_make_tmp("qemu-test-char.XXXXXX", NULL); + char *in; + char *out; + QemuOpts *opts; + Chardev *chr; + ChardevFile file =3D {}; + CharBackend be; + ChardevBackend backend =3D { .type =3D CHARDEV_BACKEND_KIND_FILE, + .u.file.data =3D &file }; + char *contents =3D NULL; + gsize length; + int ret; + + in =3D g_build_filename(tmp_path, "in", NULL); + out =3D g_build_filename(tmp_path, "out", NULL); + + ret =3D g_file_set_contents(in, "hello!", 6, NULL); + + opts =3D qemu_opts_create(qemu_find_opts("chardev"), "serial-id", + 1, &error_abort); + qemu_opt_set(opts, "backend", "file", &error_abort); + qemu_opt_set(opts, "pathin", in, &error_abort); + qemu_opt_set(opts, "path", out, &error_abort); + + chr =3D qemu_chr_new_from_opts(opts, NULL, NULL); + qemu_chr_fe_init(&be, chr, &error_abort); + + file.has_in =3D true; + file.in =3D in; + file.out =3D out; + + + qemu_chr_fe_set_handlers(&be, file_can_read, + file_read, + NULL, NULL, &chr, NULL, true); + + chr =3D qemu_chardev_new(NULL, TYPE_CHARDEV_FILE, &backend, + NULL, &error_abort); + main_loop(); /* should call file_read, and copy contents of in to out = */ + + qemu_chr_fe_deinit(&be, true); + + /* Check that contents of in were copied to out */ + ret =3D g_file_get_contents(out, &contents, &length, NULL); + g_assert(ret =3D=3D TRUE); + g_assert_cmpint(length, =3D=3D, 6); + g_assert(strncmp(contents, "hello!", 6) =3D=3D 0); + g_free(contents); + + /* Check that in hasn't changed */ + ret =3D g_file_get_contents(in, &contents, &length, NULL); + g_assert(ret =3D=3D TRUE); + g_assert_cmpint(length, =3D=3D, 6); + g_assert(strncmp(contents, "hello!", 6) =3D=3D 0); + + g_free(contents); + g_rmdir(tmp_path); + g_free(tmp_path); + g_free(in); + g_free(out); +} + static void char_file_test(void) { char_file_test_internal(NULL, NULL); @@ -1398,6 +1480,7 @@ int main(int argc, char **argv) g_test_add_func("/char/pipe", char_pipe_test); #endif g_test_add_func("/char/file", char_file_test); + g_test_add_func("/char/file/pathin", char_file_separate_input_file); #ifndef _WIN32 g_test_add_func("/char/file-fifo", char_file_fifo_test); #endif --=20 2.26.2