From patchwork Thu Jan 3 21:06:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Neves X-Patchwork-Id: 10747797 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 20B3E746 for ; Thu, 3 Jan 2019 21:07:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1117F204BF for ; Thu, 3 Jan 2019 21:07:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0573A209CD; Thu, 3 Jan 2019 21:07:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_WEB autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 72BA020881 for ; Thu, 3 Jan 2019 21:07:55 +0000 (UTC) Received: from localhost ([127.0.0.1]:57841 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gfADa-0004I3-Fo for patchwork-qemu-devel@patchwork.kernel.org; Thu, 03 Jan 2019 16:07:54 -0500 Received: from eggs.gnu.org ([208.118.235.92]:48144) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gfACQ-0002zB-97 for qemu-devel@nongnu.org; Thu, 03 Jan 2019 16:06:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gfACN-00085L-4b for qemu-devel@nongnu.org; Thu, 03 Jan 2019 16:06:42 -0500 Received: from mail-lf1-x141.google.com ([2a00:1450:4864:20::141]:46637) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gfACM-00081W-RD for qemu-devel@nongnu.org; Thu, 03 Jan 2019 16:06:39 -0500 Received: by mail-lf1-x141.google.com with SMTP id y14so5139358lfg.13 for ; Thu, 03 Jan 2019 13:06:32 -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=oYYThHr5ebIjLpjIQbzGjbtC6C0TtGnUNZkfCPCpYVA=; b=sKg8lve5IcX2B5ZJ+DoHryQdRRcmN6T/ySxwozhUJNZztaCyC0CAJLUxlCc10+jtMV eP/Bkq1W29jjyJXRk9ndTU9UWtdDNoBsSzsDkiKlXpQ1TLNGrrA9tsxC4cR7mZmU9CSj rLt9Nx7dpvBXzz7kdOUdCUPERvQoSk9VWJF2q7mHRZDALNusCk70NZ5MSpqAnJPn5PW5 e9cmU70oTAmJHaMN45KF2F9Kj0W9c7Y6C+i4ibFKSowixAQdHVdWG8Y9IR39A/d2tKeu bowaktgWoCm3llhgI2XhQvqXOLNL+/YDnKpp2RXTNsZ3YjeXg/pS7lfa3K21bV2zKnEb cKgA== 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=oYYThHr5ebIjLpjIQbzGjbtC6C0TtGnUNZkfCPCpYVA=; b=uUCd1f5vMzEAQv7fLPrpLm4P/rv2JtC+igf7v435KmUg8OOkaC0uUSRTLCVMckPNme o20nSc/HMyQLmraZuGlGMhh79xmeMM5L9X44cyv9HqEjeucMnauRTckvE0u6l9ikhRvU 0A3cuT/GfOthmDxjtNVZ9/XK+1PgG0U7HM+KsVIf60gNjhKnTVfmBeLJPf4aQIiUTq8W KzOj5oWXzsAsdUqLPN4enqJ64M93H6Wr+0hA1CDv5l0VVpmhrCqFnzqZJJPKIWpXva0z QzqrrMOOdfmFES4DZXK3eX4xJLy5hYctRWjJwFzX1XbFavIqNQX8BQYGcpEMNE7KVxo9 0OPA== X-Gm-Message-State: AA+aEWbMV5YoCVNAxJgilH+nduOzya15Sg2EEcaq0piu/rTXukhc+/TB WOfyD1mnCcWjRdSc/5zaJ75roMOIfg== X-Google-Smtp-Source: AFSGD/WY/KhveiWKPuZI6P+WjNzmOfe7yISBbQ7tLI/ZNS0zUMOVbZ3ajGytQ+32nEtRXqA4emL//w== X-Received: by 2002:a19:5154:: with SMTP id f81mr25623852lfb.96.1546549590978; Thu, 03 Jan 2019 13:06:30 -0800 (PST) Received: from pneves-XPS-15-9550.emea.nsn-net.net ([176.221.120.78]) by smtp.gmail.com with ESMTPSA id t144sm10740742lff.53.2019.01.03.13.06.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 Jan 2019 13:06:29 -0800 (PST) From: Paulo Neves To: qemu-devel@nongnu.org Date: Thu, 3 Jan 2019 22:06:13 +0100 Message-Id: <1546549573-22912-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::141 Subject: [Qemu-devel] [PATCH v2] 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 | 39 ++++++++++++++++++++++++++++++++++++++- chardev/char.c | 6 +++++- qapi/char.json | 2 +- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/chardev/char-pty.c b/chardev/char-pty.c index f681d63..3bbf99e 100644 --- a/chardev/char-pty.c +++ b/chardev/char-pty.c @@ -34,6 +34,7 @@ typedef struct { Chardev parent; QIOChannel *ioc; + char *link_name; int read_bytes; /* Protected by the Chardev chr_write_lock. */ @@ -234,6 +235,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 +251,9 @@ static void char_pty_open(Chardev *chr, bool *be_opened, Error **errp) { + ChardevHostdev *opts = 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; @@ -256,6 +264,17 @@ static void char_pty_open(Chardev *chr, } close(slave_fd); + + s = PTY_CHARDEV(chr); + s->link_name = g_strdup(opts->device); + symlink_ret = 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); chr->filename = g_strdup_printf("pty:%s", pty_name); @@ -271,6 +290,23 @@ static void char_pty_open(Chardev *chr, *be_opened = false; } +static void char_pty_parse(QemuOpts *opts, ChardevBackend *backend, + Error **errp) +{ + const char *symlink_path = qemu_opt_get(opts, "path"); + if(symlink_path == NULL) { + error_setg(errp, "chardev: pty symlink: no device path given"); + return; + + } + ChardevHostdev *dev; + + backend->type = CHARDEV_BACKEND_KIND_PTY; + dev = backend->u.pipe.data = g_new0(ChardevHostdev, 1); + qemu_chr_parse_common(opts, qapi_ChardevHostdev_base(dev)); + dev->device = g_strdup(symlink_path); +} + static void char_pty_class_init(ObjectClass *oc, void *data) { ChardevClass *cc = CHARDEV_CLASS(oc); @@ -279,6 +315,7 @@ static void char_pty_class_init(ObjectClass *oc, void *data) cc->chr_write = char_pty_chr_write; cc->chr_update_read_handler = pty_chr_update_read_handler; cc->chr_add_watch = pty_chr_add_watch; + cc->parse = char_pty_parse; } static const TypeInfo char_pty_type_info = { 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, const char *filename, } if (strcmp(filename, "null") == 0 || - strcmp(filename, "pty") == 0 || strcmp(filename, "msmouse") == 0 || strcmp(filename, "wctablet") == 0 || strcmp(filename, "braille") == 0 || @@ -418,6 +417,11 @@ QemuOpts *qemu_chr_parse_compat(const char *label, const 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..3fd5b07 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