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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 2B3F1C38A29 for ; Wed, 15 Apr 2020 01:01:44 +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 02C3D2072D for ; Wed, 15 Apr 2020 01:01:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 02C3D2072D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bitdefender.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOWQx-00038F-3U for qemu-devel@archiver.kernel.org; Tue, 14 Apr 2020 21:01:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58396) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOWP1-000114-Ts for qemu-devel@nongnu.org; Tue, 14 Apr 2020 20:59:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOWOw-00050W-1Q for qemu-devel@nongnu.org; Tue, 14 Apr 2020 20:59:43 -0400 Received: from mx01.bbu.dsd.mx.bitdefender.com ([91.199.104.161]:48986) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jOWOv-0004xw-L1 for qemu-devel@nongnu.org; Tue, 14 Apr 2020 20:59:37 -0400 Received: from smtp.bitdefender.com (smtp02.buh.bitdefender.net [10.17.80.76]) by mx01.bbu.dsd.mx.bitdefender.com (Postfix) with ESMTPS id 2AEFD30747BF; Wed, 15 Apr 2020 03:59:34 +0300 (EEST) Received: from localhost.localdomain (unknown [91.199.104.27]) by smtp.bitdefender.com (Postfix) with ESMTPSA id 08CCB305B7A1; Wed, 15 Apr 2020 03:59:34 +0300 (EEST) From: =?UTF-8?q?Adalbert=20Laz=C4=83r?= To: qemu-devel@nongnu.org Subject: [RFC PATCH v1 02/26] char-socket: allow vsock parameters (cid, port) Date: Wed, 15 Apr 2020 03:59:14 +0300 Message-Id: <20200415005938.23895-3-alazar@bitdefender.com> In-Reply-To: <20200415005938.23895-1-alazar@bitdefender.com> References: <20200415005938.23895-1-alazar@bitdefender.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 91.199.104.161 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: =?UTF-8?q?Adalbert=20Laz=C4=83r?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The introspection tool can run in a separate VM and the introspected VM will establish a connection using a virtual socket. CC: "Marc-Andr=C3=A9 Lureau" CC: Paolo Bonzini Signed-off-by: Adalbert Laz=C4=83r --- chardev/char-socket.c | 27 ++++++++++++++++++++++++--- chardev/char.c | 3 +++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index bd966aace1..9b2deb0125 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -23,6 +23,11 @@ */ =20 #include "qemu/osdep.h" + +#ifdef CONFIG_AF_VSOCK +#include +#endif /* CONFIG_AF_VSOCK */ + #include "chardev/char.h" #include "io/channel-socket.h" #include "io/channel-tls.h" @@ -590,6 +595,14 @@ static char *qemu_chr_compute_filename(SocketChardev= *s) s->is_listen ? ",server" : "", left, phost, right, pserv); =20 +#ifdef CONFIG_AF_VSOCK + case AF_VSOCK: + return g_strdup_printf("vsock:%d:%d%s", + ((struct sockaddr_vm *)(ss))->svm_cid, + ((struct sockaddr_vm *)(ss))->svm_port, + s->is_listen ? ",server" : ""); +#endif + default: return g_strdup_printf("unknown"); } @@ -1378,18 +1391,19 @@ static void qemu_chr_parse_socket(QemuOpts *opts,= ChardevBackend *backend, { const char *path =3D qemu_opt_get(opts, "path"); const char *host =3D qemu_opt_get(opts, "host"); + const char *cid =3D qemu_opt_get(opts, "cid"); const char *port =3D qemu_opt_get(opts, "port"); const char *fd =3D qemu_opt_get(opts, "fd"); SocketAddressLegacy *addr; ChardevSocket *sock; =20 - if ((!!path + !!fd + !!host) !=3D 1) { + if ((!!path + !!fd + !!host + !!cid) !=3D 1) { error_setg(errp, - "Exactly one of 'path', 'fd' or 'host' required"); + "Exactly one of 'path', 'fd', 'cid' or 'host' require= d"); return; } =20 - if (host && !port) { + if ((host || cid) && !port) { error_setg(errp, "chardev: socket: no port given"); return; } @@ -1444,6 +1458,13 @@ static void qemu_chr_parse_socket(QemuOpts *opts, = ChardevBackend *backend, .has_ipv6 =3D qemu_opt_get(opts, "ipv6"), .ipv6 =3D qemu_opt_get_bool(opts, "ipv6", 0), }; + } else if (cid) { + addr->type =3D SOCKET_ADDRESS_LEGACY_KIND_VSOCK; + addr->u.vsock.data =3D g_new0(VsockSocketAddress, 1); + *addr->u.vsock.data =3D (VsockSocketAddress) { + .cid =3D g_strdup(cid), + .port =3D g_strdup(port), + }; } else if (fd) { addr->type =3D SOCKET_ADDRESS_LEGACY_KIND_FD; addr->u.fd.data =3D g_new(String, 1); diff --git a/chardev/char.c b/chardev/char.c index e77564060d..39e36ceb97 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -852,6 +852,9 @@ QemuOptsList qemu_chardev_opts =3D { },{ .name =3D "host", .type =3D QEMU_OPT_STRING, + },{ + .name =3D "cid", + .type =3D QEMU_OPT_STRING, },{ .name =3D "port", .type =3D QEMU_OPT_STRING,