From mboxrd@z Thu Jan 1 00:00:00 1970 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=-11.0 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 C39FDC2D0A3 for ; Tue, 3 Nov 2020 13:19:12 +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 1D494206B2 for ; Tue, 3 Nov 2020 13:19:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="IuZirBdt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1D494206B2 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]:40706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kZwDP-0002Fn-3v for qemu-devel@archiver.kernel.org; Tue, 03 Nov 2020 08:19:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39634) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZwCR-0001R3-DM for qemu-devel@nongnu.org; Tue, 03 Nov 2020 08:18:11 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:44617) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kZwCN-0004JP-9n for qemu-devel@nongnu.org; Tue, 03 Nov 2020 08:18:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604409485; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=lPXvCK3K90d0+AgyyB2SYHr8XRWKSO19NhZcHkTJ/Y0=; b=IuZirBdtiyDjm3YaUi+8piRTiVfGG/5rtB5B0pE8NEBKtC0NCIoOQmn6Wdjbus7LEFfExL nCbFmZX8gHHXjPRuqCGrCspxD9FMF/c0OmAKvZVAwC+KSROwlhK7cJsk/OKIzuv1d/ob64 /eEZArgpxzY6Bm1DsUCGz1sumVNyV0w= 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-172-Z0cb3dGWOnq9UeMYAs8eSg-1; Tue, 03 Nov 2020 08:17:45 -0500 X-MC-Unique: Z0cb3dGWOnq9UeMYAs8eSg-1 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 9EB708058AB; Tue, 3 Nov 2020 13:17:44 +0000 (UTC) Received: from redhat.com (ovpn-115-87.ams2.redhat.com [10.36.115.87]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 841A46198E; Tue, 3 Nov 2020 13:17:36 +0000 (UTC) Date: Tue, 3 Nov 2020 13:17:33 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Markus Armbruster Subject: Re: [PATCH v2 09/11] char-socket: Fix qemu_chr_socket_address() for abstract sockets Message-ID: <20201103131733.GL205187@redhat.com> 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> MIME-Version: 1.0 In-Reply-To: <87r1pbosxn.fsf@dusky.pond.sub.org> User-Agent: Mutt/1.14.6 (2020-07-11) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Received-SPF: pass client-ip=63.128.21.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 01:02:05 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_H5=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: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= 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" On Tue, Nov 03, 2020 at 07:28:20AM +0100, Markus Armbruster wrote: > Eric Blake writes: > > > 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. > >> > >> Reviewed-by: Paolo Bonzini > >> Signed-off-by: Markus Armbruster > >> --- > >> chardev/char-socket.c | 10 +++++++++- > >> 1 file changed, 9 insertions(+), 1 deletion(-) > >> > >> 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(SocketChardev *s, const char *prefix) > >> s->is_listen ? ",server" : ""); > >> break; > >> case SOCKET_ADDRESS_TYPE_UNIX: > >> - return g_strdup_printf("%sunix:%s%s", prefix, > >> + { > >> + UnixSocketAddress *sa = &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. > > 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 = "", *abstract = ""; UnixSocketAddress *sa = &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 = ",abstract"; + if (sa->has_tight && sa->tight) { + tight = ",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 Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|