From nobody Fri Nov 7 02:19:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.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 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1546079764165351.6548384240589; Sat, 29 Dec 2018 02:36:04 -0800 (PST) Received: from localhost ([127.0.0.1]:35710 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdByM-0000c4-Mc for importer@patchew.org; Sat, 29 Dec 2018 05:36:02 -0500 Received: from eggs.gnu.org ([208.118.235.92]:42417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gdBwF-0006Ek-SK for qemu-devel@nongnu.org; Sat, 29 Dec 2018 05:33:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gdBf4-0007zG-M5 for qemu-devel@nongnu.org; Sat, 29 Dec 2018 05:16:07 -0500 Received: from mail-lj1-x244.google.com ([2a00:1450:4864:20::244]:43100) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gdBf4-0007yp-EA for qemu-devel@nongnu.org; Sat, 29 Dec 2018 05:16:06 -0500 Received: by mail-lj1-x244.google.com with SMTP id q2-v6so20459975lji.10 for ; Sat, 29 Dec 2018 02:16:06 -0800 (PST) Received: from localhost.localdomain (user-5-173-160-150.play-internet.pl. [5.173.160.150]) by smtp.gmail.com with ESMTPSA id c203sm8364209lfe.95.2018.12.29.02.16.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 29 Dec 2018 02:16:04 -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:in-reply-to:references; bh=QuW+GuhDbtcKtX+usYxX0vEDryv550UAXgF+i3pdUig=; b=HorriUW1I6GJQOd4VVlG4zrGMHBQnRHnAIoRyFgLMjL1v4m7/YXPwqLBQVMfo+uy+d gpwrgwQyNcCZB/Z3eEWi+/WbgqZWrhvksrRMHSvD7+on6sBbGmLQ06oYmb5rmsDluzHh pHSdWvOAwiGrtDUp9Miu0PgbTNcP4y4frWG1ehcERQA/GJrOlqFC3C3XpqYGuynq7fMm VcHnzv+9U+iuqGLCPbBrscOugUZEqMiZnCF9YJ90h6yIrbIMr+fl8HrZXv3E2U6K5YB1 j1TAAwpf2N0+xh7BxNifflTmx20QVr2kI3pkxCe09GlWwSF+r2ZpbcElyPXVtjAhwqTa 5QuA== 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:in-reply-to :references; bh=QuW+GuhDbtcKtX+usYxX0vEDryv550UAXgF+i3pdUig=; b=E1r/PoRtACUxBIm5Sdru90OqSqOLVFB7eN0fr1AFDpiuiJ4vYO5Zhp4s6g9PmdGN/M 5/GApzmJPC+mbf0UjlO84TOC4+m2fSiIhSC9+pmkd4HzERS+0WMbaTWXfH3d4XqyIUxF bXIsG0xI8DBYKVzHNXO/zfMATG6fRSpIACZpqDQS/F3ECw4PXm6lWkAzHZWYeHQKjFC9 GI8m5IWOQbnT+lznvW5gxJbydH8Wc2Z01Vpj23ANVUq+e/q+VwdHLQ2u+O/bPcV/bSOQ EoaxqfwGI4G8tUfxMWLqUrZcmYGpnaHTuHRQu+eATcjUcp2qr/7wKeShC+Mj25EnUXHS twng== X-Gm-Message-State: AJcUukc5Ja/ORjq9vtt0jyvCuPDogA+VA5NqCxyGYA7r3shoNAUKsyes krhE/Cyz67vUAdwOl13WjOjFKxKuIA== X-Google-Smtp-Source: ALg8bN4HsZCalshNu/VeebHEZYCXjXdk65UEKI06VlbzYYMaITWQknryLzEv9JJje8b8TTy+JEGF/A== X-Received: by 2002:a2e:750a:: with SMTP id q10-v6mr12815540ljc.39.1546078565028; Sat, 29 Dec 2018 02:16:05 -0800 (PST) From: Paulo Neves To: qemu-devel@nongnu.org Date: Sat, 29 Dec 2018 11:15:51 +0100 Message-Id: <1546078551-6109-2-git-send-email-ptsneves@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1546078551-6109-1-git-send-email-ptsneves@gmail.com> References: <1546078551-6109-1-git-send-email-ptsneves@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::244 Subject: [Qemu-devel] [PATCH] 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. --- chardev/char-pty.c | 38 ++++++++++++++++++++++++++++++++++++-- chardev/char.c | 6 +++++- qapi/char.json | 4 ++-- 3 files changed, 43 insertions(+), 5 deletions(-) diff --git a/chardev/char-pty.c b/chardev/char-pty.c index 761ae6d..b465263 100644 --- a/chardev/char-pty.c +++ b/chardev/char-pty.c @@ -38,6 +38,7 @@ typedef struct { Chardev parent; QIOChannel *ioc; + char *link_name; int read_bytes; =20 /* Protected by the Chardev chr_write_lock. */ @@ -231,6 +232,11 @@ 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); + } + if (s->timer_tag) { g_source_remove(s->timer_tag); s->timer_tag =3D 0; @@ -244,8 +250,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,13 +263,23 @@ static void char_pty_open(Chardev *chr, } =20 close(slave_fd); + + s =3D PTY_CHARDEV(chr); + s->link_name =3D 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); error_report("char device redirected to %s (label %s)", pty_name, chr->label); =20 - s =3D PTY_CHARDEV(chr); s->ioc =3D QIO_CHANNEL(qio_channel_file_new_fd(master_fd)); name =3D g_strdup_printf("chardev-pty-%s", chr->label); qio_channel_set_name(QIO_CHANNEL(s->ioc), name); @@ -271,6 +288,22 @@ 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 +312,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 5d52cd5..e4c5371 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -357,7 +357,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 || @@ -402,6 +401,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 6de0f29..dae4231 100644 --- a/qapi/char.json +++ b/qapi/char.json @@ -224,7 +224,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 @@ -380,7 +380,7 @@ 'pipe' : 'ChardevHostdev', 'socket' : 'ChardevSocket', 'udp' : 'ChardevUdp', - 'pty' : 'ChardevCommon', + 'pty' : 'ChardevHostdev', 'null' : 'ChardevCommon', 'mux' : 'ChardevMux', 'msmouse': 'ChardevCommon', --=20 2.7.4