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=-9.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 A8CA2C2D0A3 for ; Tue, 3 Nov 2020 15:24:27 +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 1137E22370 for ; Tue, 3 Nov 2020 15:24:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YI3qhroW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1137E22370 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kZyAc-00044o-09 for qemu-devel@archiver.kernel.org; Tue, 03 Nov 2020 10:24:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZy8N-0001mD-Nr for qemu-devel@nongnu.org; Tue, 03 Nov 2020 10:22:07 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:38041) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kZy8I-0005R3-Jn for qemu-devel@nongnu.org; Tue, 03 Nov 2020 10:22:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604416918; 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: in-reply-to:in-reply-to:references:references; bh=1535lTPYDr0w41/hF1/zYUrcunKb1JN/pb0dtQR5l68=; b=YI3qhroWNb/oC9mu7HIoevV1FH0XsnV+Cn7dJMkeyF2Cx6gyTlJR1DBjH9e3VKZ+SGru6U PRFQ5xWSA1FiA9AH53WlLtk39YOWKyirSjXg+QS6cllFtzTAICHp+sbOV1OaCA5CdcDjfx p6Cju5UBgj8lFltYPXchuEXTOFC+w48= 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-105-QHT2zNfrO8uvWCVHZGo-4w-1; Tue, 03 Nov 2020 10:21:57 -0500 X-MC-Unique: QHT2zNfrO8uvWCVHZGo-4w-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 084A65F9C5; Tue, 3 Nov 2020 15:21:56 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D4F016EF46; Tue, 3 Nov 2020 15:21:49 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 599AA1132BD6; Tue, 3 Nov 2020 16:21:48 +0100 (CET) From: Markus Armbruster To: Daniel P. =?utf-8?Q?Berrang=C3=A9?= Subject: Re: [PATCH v2 09/11] char-socket: Fix qemu_chr_socket_address() for abstract sockets References: <20201102094422.173975-1-armbru@redhat.com> <20201102094422.173975-10-armbru@redhat.com> <9f594cfb-2138-c12d-f6f7-6a4653e78087@redhat.com> <87r1pbosxn.fsf@dusky.pond.sub.org> <20201103131733.GL205187@redhat.com> Date: Tue, 03 Nov 2020 16:21:48 +0100 In-Reply-To: <20201103131733.GL205187@redhat.com> ("Daniel P. =?utf-8?Q?Be?= =?utf-8?Q?rrang=C3=A9=22's?= message of "Tue, 3 Nov 2020 13:17:33 +0000") Message-ID: <87r1pajwj7.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 00:03:41 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: kwolf@redhat.com, zxq_yx_007@163.com, qemu-devel@nongnu.org, kraxel@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Daniel P. Berrang=C3=A9 writes: > On Tue, Nov 03, 2020 at 07:28:20AM +0100, Markus Armbruster wrote: >> Eric Blake writes: >>=20 >> > On 11/2/20 3:44 AM, Markus Armbruster wrote: >> >> Commit 776b97d360 "qemu-sockets: add abstract UNIX domain socket >> >> support" neglected to update qemu_chr_socket_address(). It shows >> >> shows neither @abstract nor @tight. Fix that. >> >>=20 >> >> Reviewed-by: Paolo Bonzini >> >> Signed-off-by: Markus Armbruster >> >> --- >> >> chardev/char-socket.c | 10 +++++++++- >> >> 1 file changed, 9 insertions(+), 1 deletion(-) >> >>=20 >> >> diff --git a/chardev/char-socket.c b/chardev/char-socket.c >> >> index 1ee5a8c295..dc1cf86ecf 100644 >> >> --- a/chardev/char-socket.c >> >> +++ b/chardev/char-socket.c >> >> @@ -443,10 +443,18 @@ static char *qemu_chr_socket_address(SocketChar= dev *s, const char *prefix) >> >> s->is_listen ? ",server" : ""); >> >> break; >> >> case SOCKET_ADDRESS_TYPE_UNIX: >> >> - return g_strdup_printf("%sunix:%s%s", prefix, >> >> + { >> >> + UnixSocketAddress *sa =3D &s->addr->u.q_unix; >> >> + >> >> + return g_strdup_printf("%sunix:%s%s%s%s", prefix, >> >> s->addr->u.q_unix.path, >> >> + sa->has_abstract && sa->abstract >> >> + ? ",abstract" : "", >> >> + sa->has_tight && sa->tight >> >> + ? ",tight" : "", >> >> s->is_listen ? ",server" : ""); >> > >> > Gets modified again in 11/11, so I can accept this as a strict >> > improvement, even if it is not the final form. >>=20 >> You're right, PATCH 11's change is better done here already. Will tidy >> up if I need to respin for some other reason. > > I can squash in the following part of patch 11: > > @@ -444,14 +444,20 @@ static char *qemu_chr_socket_address(SocketChardev = *s, const char *prefix) > break; > case SOCKET_ADDRESS_TYPE_UNIX: > { > + const char *tight =3D "", *abstract =3D ""; > UnixSocketAddress *sa =3D &s->addr->u.q_unix; > > - return g_strdup_printf("%sunix:%s%s%s%s", prefix, > - s->addr->u.q_unix.path, > - sa->has_abstract && sa->abstract > - ? ",abstract" : "", > - sa->has_tight && sa->tight > - ? ",tight" : "", > +#ifdef CONFIG_LINUX > + if (sa->has_abstract && sa->abstract) { > + abstract =3D ",abstract"; > + if (sa->has_tight && sa->tight) { > + tight =3D ",tight"; > + } > + } > +#endif > + > + return g_strdup_printf("%sunix:%s%s%s%s", prefix, sa->path, > + abstract, tight, > s->is_listen ? ",server" : ""); > break; > } > > but leaving out the CONFIG_LINUX ifdef until Patch 11 Appreciated!