From nobody Wed May 15 07:23:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 154850973410328.733838115866547; Sat, 26 Jan 2019 05:35:34 -0800 (PST) Received: from localhost ([127.0.0.1]:59612 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gnO7M-0003aE-Oz for importer@patchew.org; Sat, 26 Jan 2019 08:35:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gnO62-00036p-S7 for qemu-devel@nongnu.org; Sat, 26 Jan 2019 08:34:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gnO61-0004xY-Vw for qemu-devel@nongnu.org; Sat, 26 Jan 2019 08:34:06 -0500 Received: from mail-lj1-x243.google.com ([2a00:1450:4864:20::243]:42678) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gnO61-0004x0-P4 for qemu-devel@nongnu.org; Sat, 26 Jan 2019 08:34:05 -0500 Received: by mail-lj1-x243.google.com with SMTP id l15-v6so10619914lja.9 for ; Sat, 26 Jan 2019 05:34:04 -0800 (PST) Received: from localhost.localdomain ([176.221.121.28]) by smtp.gmail.com with ESMTPSA id p21sm2091401lfj.10.2019.01.26.05.34.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 26 Jan 2019 05:34:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=xjng121pDkccg9eByeH0BwHI3F0wNhmTsCvU2nsC1dw=; b=P7MnkMWEVy0FrDqXop1f5xGc4BMtXGxauvcBp4dL9g3T/ifN6pgAYGoy5JMb7SUZ89 Qa54vlZf7wWkk60SyROUbCgNgu3uJM2KkWriUIVnZwL5N+oXXOMYZsURWSeKu4fpoBm8 DXSZBqHgFx5A4dedJogtMVaJ/9MXNyh6LP1yiSOK2gRRUdEqRJGCAEs8MbkE19SqBk94 ajPdqGmqV0S5BIKDl6zUyW74BHr/c978kqfDhtzFrB23HeaJ+0mHF7fs7MTqUYrjiTj0 Vw5eRFu5Qncf1AKrPMfthHVWZquWVgUfl49+OkkDJFXeF9KO5/YuWHkSPtAma1fBLqH8 hK+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=xjng121pDkccg9eByeH0BwHI3F0wNhmTsCvU2nsC1dw=; b=ELsBbtAKYInr95+NlPB9biHxL7+6TvnHnWuUmeARbuoVmkBIocaG0cp+cEbEFvqIfw RZNZZ98PZ0Shor51DVzsWlpPl5kpg1Uotgck1Vz/Z1YpCHz9BLEBqEz+1PdOKThi4UBc KbYhK4KxgsrxT+BzDXi/3gMeQNFRCHgkjPu7odnxog7Kb65x4+6i4KgWJNqQ0wt/4qQS mXPECk/s7aPLLBvGbtVJuoyrIpCHB+QV1Z9mBLbqRnc11ip5cltyBx4q8jBEOVrPi7Ca 9VSlFFEdxbz7PNmG8vVwX9fx4tcskXzNZWpBW+xDksVFiczQaRofBLLtYTEF6/Zk+7yd SWYw== X-Gm-Message-State: AHQUAubh7pWM80wXG2l8pAEkyYrWFA3USDu3JUqsviRi4mv8BheAr//C MJMju+lp41cqMWohAy4NqHm90qM= X-Google-Smtp-Source: AHgI3IZXGSC8vDMatIGWZ37FxB5bXp81tIRGvWLd5ZqE1K7QZOR01DFO+X7mrZLMEI6PHqn6Eoarhw== X-Received: by 2002:a2e:8446:: with SMTP id u6-v6mr314811ljh.74.1548509643183; Sat, 26 Jan 2019 05:34:03 -0800 (PST) From: Paulo Neves To: qemu-devel@nongnu.org Date: Sat, 26 Jan 2019 14:33:55 +0100 Message-Id: <1548509635-15776-1-git-send-email-ptsneves@gmail.com> X-Mailer: git-send-email 2.7.4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::243 Subject: [Qemu-devel] [PATCH v3] chardev: Allow for pty path passing. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paulo Neves Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" If a user requires a virtual serial device like provided by the pty char device, the user needs to accept the returned device name. This makes the program need to have smarts to parse or communicate with qemu to get the pty device. With this patch the program can pass the path where a symlink to the pty device will be, removing the need for 2 way communication or smarts. Signed-off-by: Paulo Neves --- chardev/char-pty.c | 41 ++++++++++++++++++++++++++++++++++++++++- chardev/char.c | 6 +++++- qapi/char.json | 4 ++-- 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/chardev/char-pty.c b/chardev/char-pty.c index f681d63..5c312ce 100644 --- a/chardev/char-pty.c +++ b/chardev/char-pty.c @@ -28,12 +28,14 @@ #include "io/channel-file.h" #include "qemu/sockets.h" #include "qemu/error-report.h" +#include "qemu/option.h" =20 #include "chardev/char-io.h" =20 typedef struct { Chardev parent; QIOChannel *ioc; + char *link_name; int read_bytes; =20 /* Protected by the Chardev chr_write_lock. */ @@ -234,6 +236,12 @@ static void char_pty_finalize(Object *obj) qemu_mutex_lock(&chr->chr_write_lock); pty_chr_state(chr, 0); object_unref(OBJECT(s->ioc)); + + if (s->link_name) { + unlink(s->link_name); + g_free(s->link_name); + } + pty_chr_timer_cancel(s); qemu_mutex_unlock(&chr->chr_write_lock); qemu_chr_be_event(chr, CHR_EVENT_CLOSED); @@ -244,8 +252,9 @@ static void char_pty_open(Chardev *chr, bool *be_opened, Error **errp) { + ChardevHostdev *opts =3D backend->u.pty.data; PtyChardev *s; - int master_fd, slave_fd; + int master_fd, slave_fd, symlink_ret; char pty_name[PATH_MAX]; char *name; =20 @@ -256,6 +265,17 @@ static void char_pty_open(Chardev *chr, } =20 close(slave_fd); + + s =3D PTY_CHARDEV(chr); + s->link_name =3D g_strdup(opts->device); + symlink_ret =3D symlink(pty_name, s->link_name); + + if (symlink_ret < 0) { + close(master_fd); + error_setg_errno(errp, errno, "Failed to create symlink to PTY"); + return; + } + qemu_set_nonblock(master_fd); =20 chr->filename =3D g_strdup_printf("pty:%s", pty_name); @@ -271,6 +291,24 @@ static void char_pty_open(Chardev *chr, *be_opened =3D false; } =20 +static void char_pty_parse(QemuOpts *opts, ChardevBackend *backend, + Error **errp) +{ + const char *symlink_path =3D qemu_opt_get(opts, "path"); + if (symlink_path =3D=3D NULL) { + error_setg(errp, "chardev: pty symlink: no device path given"); + return; + + } + + ChardevHostdev *dev; + + backend->type =3D CHARDEV_BACKEND_KIND_PTY; + dev =3D backend->u.pipe.data =3D g_new0(ChardevHostdev, 1); + qemu_chr_parse_common(opts, qapi_ChardevHostdev_base(dev)); + dev->device =3D g_strdup(symlink_path); +} + static void char_pty_class_init(ObjectClass *oc, void *data) { ChardevClass *cc =3D CHARDEV_CLASS(oc); @@ -279,6 +317,7 @@ static void char_pty_class_init(ObjectClass *oc, void *= data) cc->chr_write =3D char_pty_chr_write; cc->chr_update_read_handler =3D pty_chr_update_read_handler; cc->chr_add_watch =3D pty_chr_add_watch; + cc->parse =3D char_pty_parse; } =20 static const TypeInfo char_pty_type_info =3D { diff --git a/chardev/char.c b/chardev/char.c index ccba36b..43fce4a 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -373,7 +373,6 @@ QemuOpts *qemu_chr_parse_compat(const char *label, cons= t char *filename, } =20 if (strcmp(filename, "null") =3D=3D 0 || - strcmp(filename, "pty") =3D=3D 0 || strcmp(filename, "msmouse") =3D=3D 0 || strcmp(filename, "wctablet") =3D=3D 0 || strcmp(filename, "braille") =3D=3D 0 || @@ -418,6 +417,11 @@ QemuOpts *qemu_chr_parse_compat(const char *label, con= st char *filename, qemu_opt_set(opts, "path", p, &error_abort); return opts; } + if (strstart(filename, "pty:", &p)) { + qemu_opt_set(opts, "backend", "pty", &error_abort); + qemu_opt_set(opts, "path", p, &error_abort); + return opts; + } if (strstart(filename, "tcp:", &p) || strstart(filename, "telnet:", &p) || strstart(filename, "tn3270:", &p) || diff --git a/qapi/char.json b/qapi/char.json index 77ed847..88c62bd 100644 --- a/qapi/char.json +++ b/qapi/char.json @@ -229,7 +229,7 @@ ## # @ChardevHostdev: # -# Configuration info for device and pipe chardevs. +# Configuration info for device, pty and pipe chardevs. # # @device: The name of the special file for the device, # i.e. /dev/ttyS0 on Unix or COM1: on Windows @@ -395,7 +395,7 @@ 'pipe': 'ChardevHostdev', 'socket': 'ChardevSocket', 'udp': 'ChardevUdp', - 'pty': 'ChardevCommon', + 'pty': 'ChardevHostdev', 'null': 'ChardevCommon', 'mux': 'ChardevMux', 'msmouse': 'ChardevCommon', --=20 2.7.4