From nobody Sun May 19 17:58:01 2024 Delivered-To: importer@patchew.org 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; 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584961512; cv=none; d=zohomail.com; s=zohoarc; b=jq3j1MlnedjQH8aN6Tffx/V9d1kef1sQm9wuhVqM6FLrTjVtcSgnbxzx/0fkViqg/nuE4UdHEnGSwNvgmLhv2n3K2aDetFpDyOwFFiMZYzxCUuBvj6Isxo2KPimLfOqztPj6zjCmJyCGINU3afsLjRReJ2Ip9zwak6f54AMdFRA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584961512; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=g3uwfbKDinLA38zhP4GvF+8jCkS7cHxIlQnECXnV6oA=; b=aAcbCXdRcKa4UbAszoncTws3hq9rlvp1l+m5VLSAmq3C1YYvle9oEUiD3dKXFgqNDMrgOh/WLBTKt4Key65IC9b8Yd34ducdFvgGHcrB+NZPz5fmxLXuQAkHsLj/CqXR69wInjCAs4rFQKlo6dnY3QBhY6Ox/O924/y3EVMX5Gw= ARC-Authentication-Results: i=1; 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; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1584961512195496.592090209032; Mon, 23 Mar 2020 04:05:12 -0700 (PDT) Received: from localhost ([::1]:60198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGKtJ-0003Sf-S6 for importer@patchew.org; Mon, 23 Mar 2020 07:05:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39405) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGKsU-0002vb-L0 for qemu-devel@nongnu.org; Mon, 23 Mar 2020 07:04:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGKsT-0004A2-58 for qemu-devel@nongnu.org; Mon, 23 Mar 2020 07:04:18 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:20822) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jGKsT-00049M-1n for qemu-devel@nongnu.org; Mon, 23 Mar 2020 07:04:17 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-131-Yj8Je4DlNFaIvmMl2782Ig-1; Mon, 23 Mar 2020 07:04:14 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 519DC801E7A; Mon, 23 Mar 2020 11:04:13 +0000 (UTC) Received: from localhost (ovpn-115-37.ams2.redhat.com [10.36.115.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2251060BE2; Mon, 23 Mar 2020 11:04:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584961455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g3uwfbKDinLA38zhP4GvF+8jCkS7cHxIlQnECXnV6oA=; b=W8HADWxkXDqd/hrZoFBeTJFhx99ilzW36oPCc/yHtAN08OcgYdyvwdEtbNuJ364GzyCErA Gc+9JbzPE/fz24goF07jEgWyH6TSISxcej97oGzuYvIVUsNSnCbxyOpDCJ8i5UHeGWkERp RY7C4H395FmZcdTiEni58IRRi1wze4M= X-MC-Unique: Yj8Je4DlNFaIvmMl2782Ig-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH] qemu-ga: document vsock-listen in the man page Date: Mon, 23 Mar 2020 11:04:08 +0000 Message-Id: <20200323110408.309111-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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: 216.205.24.74 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: Michael Roth , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Although qemu-ga has supported vsock since 2016 it was not documented on the man page. Also add the socket address representation to the qga --help output. Fixes: 586ef5dee77180fc32e33bc08051600030630239 ("qga: add vsock-listen method") Signed-off-by: Stefan Hajnoczi Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Stefano Garzarella --- docs/interop/qemu-ga.rst | 5 +++-- qga/main.c | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/interop/qemu-ga.rst b/docs/interop/qemu-ga.rst index 1313a4ae1c..3063357bb5 100644 --- a/docs/interop/qemu-ga.rst +++ b/docs/interop/qemu-ga.rst @@ -36,13 +36,14 @@ Options .. option:: -m, --method=3DMETHOD =20 Transport method: one of ``unix-listen``, ``virtio-serial``, or - ``isa-serial`` (``virtio-serial`` is the default). + ``isa-serial``, or ``vsock-listen`` (``virtio-serial`` is the default). =20 .. option:: -p, --path=3DPATH =20 Device/socket path (the default for virtio-serial is ``/dev/virtio-ports/org.qemu.guest_agent.0``, - the default for isa-serial is ``/dev/ttyS0``) + the default for isa-serial is ``/dev/ttyS0``). Socket addresses for + vsock-listen are written as ``:``. =20 .. option:: -l, --logfile=3DPATH =20 diff --git a/qga/main.c b/qga/main.c index 8ee2736f8e..f0e454f28d 100644 --- a/qga/main.c +++ b/qga/main.c @@ -234,7 +234,9 @@ QEMU_COPYRIGHT "\n" " -p, --path device/socket path (the default for virtio-serial is:= \n" " %s,\n" " the default for isa-serial is:\n" -" %s)\n" +" %s).\n" +" Socket addresses for vsock-listen are written as\n" +" :.\n" " -l, --logfile set logfile path, logs to stderr by default\n" " -f, --pidfile specify pidfile (default is %s)\n" #ifdef CONFIG_FSFREEZE --=20 2.24.1