From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39369) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coY86-0001FY-K7 for qemu-devel@nongnu.org; Thu, 16 Mar 2017 12:19:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1coY82-0007H0-QR for qemu-devel@nongnu.org; Thu, 16 Mar 2017 12:19:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50542) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1coY82-0007Gn-Kg for qemu-devel@nongnu.org; Thu, 16 Mar 2017 12:19:54 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6A09E7AE85 for ; Thu, 16 Mar 2017 16:19:54 +0000 (UTC) Date: Thu, 16 Mar 2017 16:19:46 +0000 From: "Daniel P. Berrange" Message-ID: <20170316161946.GA15193@redhat.com> Reply-To: "Daniel P. Berrange" References: <20170316161535.22157-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20170316161535.22157-1-pbonzini@redhat.com> Subject: Re: [Qemu-devel] [PATCH] qemu-ga: obey LISTEN_PID when using systemd socket activation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org, "Richard W.M. Jones" , Stefan Hajnoczi On Thu, Mar 16, 2017 at 05:15:35PM +0100, Paolo Bonzini wrote: > qemu-ga's socket activation support was not obeying the LISTEN_PID > environment variable, which avoids that a process uses a socket-activation > file descriptor meant for its parent. > > Mess can for example ensue if a process forks a children before consuming > the socket-activation file descriptor and therefore setting O_CLOEXEC > on it. > > Luckily, qemu-nbd also got socket activation code, and its copy does > support LISTEN_PID. Some extra fixups are needed to ensure that the > code can be used for both, but that's what this patch does. The > main change is to replace get_listen_fds's "consume" argument with > the FIRST_SOCKET_ACTIVATION_FD macro from the qemu-nbd code. > > Cc: "Richard W.M. Jones" > Cc: Stefan Hajnoczi > Signed-off-by: Paolo Bonzini > --- > include/qemu/systemd.h | 26 +++++++++++++ > qemu-nbd.c | 100 ++++--------------------------------------------- > qga/main.c | 51 +++++++------------------ > util/Makefile.objs | 1 + > util/systemd.c | 77 +++++++++++++++++++++++++++++++++++++ A MAINTAINERS file entry for these new files ? > 5 files changed, 125 insertions(+), 130 deletions(-) > create mode 100644 include/qemu/systemd.h > create mode 100644 util/systemd.c Reviewed-by: Daniel P. Berrange Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://entangle-photo.org -o- http://search.cpan.org/~danberr/ :|