From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277279; cv=none;
	d=zoho.com; s=zohoarc;
	b=Ug2WrW1ZOa1MF8USzX0BcnlrXLlny+q1d7ZrZt/op+rVXJ342caGcsN7SgDXMqgT5HIYBUAuPUe9LLqhRaffaJ1xS40qX5KbtHovmR3v9IlY2Sj2aoQL4oi9Vo9bitanrMnG4GD7K4wYeTCaFV5BFulcmIe31bVfGkk/AsVUZc4=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277279;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=nOyXoWREzGvYN7zFmOtaX+rMUEjBwb14VK40VHmkT04=;
	b=jST4FDaap/pUq29WABJjd0LosKFZUoUkFpmZCMc6TBbNZNpt2Xy2zIqTZSObhwTjMm7/IIqBRVPq+oYq7nv3jDpNeLnuXtbU6ZZE8eOvU68p5UTIJ3s00xxJVpk6XzqehV2doCKE899dt5q5BmUEQN0+glUQOv9O0quQ5DleouI=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277279875124.51822771063416;
 Thu, 8 Aug 2019 08:14:39 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id 779BD72642;
	Thu,  8 Aug 2019 15:14:37 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 4ED405FCDF;
	Thu,  8 Aug 2019 15:14:37 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0FF38E206;
	Thu,  8 Aug 2019 15:14:37 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FAoYl027300 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:10:50 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id CF025100194E; Thu,  8 Aug 2019 15:10:50 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id D25F910002B9;
	Thu,  8 Aug 2019 15:10:49 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:03 +0100
Message-Id: <20190808151044.11385-2-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 01/42] build: make augeas-gentest.pl write to
	stdout
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]);
 Thu, 08 Aug 2019 15:14:38 +0000 (UTC)

The augeas-gentest.pl program merges a config file into a augeas
file, saving the output to a new file. It is going to be useful
to further process the output file, and it would be easier if this can
be done with a pipeline, so change augeas-gentest.pl to write to stdout
instead of a file.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 build-aux/augeas-gentest.pl | 20 ++++++--------------
 src/bhyve/Makefile.inc.am   |  2 +-
 src/libxl/Makefile.inc.am   |  2 +-
 src/locking/Makefile.inc.am |  6 +++---
 src/logging/Makefile.inc.am |  2 +-
 src/lxc/Makefile.inc.am     |  2 +-
 src/qemu/Makefile.inc.am    |  2 +-
 src/remote/Makefile.inc.am  |  2 +-
 8 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/build-aux/augeas-gentest.pl b/build-aux/augeas-gentest.pl
index 567fc651f3..faf2fd593e 100755
--- a/build-aux/augeas-gentest.pl
+++ b/build-aux/augeas-gentest.pl
@@ -20,17 +20,10 @@
 use strict;
 use warnings;
=20
-die "syntax: $0 CONFIG TEMPLATE AUGTEST\n" unless @ARGV =3D=3D 3;
+die "syntax: $0 CONFIG TEMPLATE\n" unless @ARGV =3D=3D 2;
=20
 my $config =3D shift @ARGV;
 my $template =3D shift @ARGV;
-my $augtest =3D shift @ARGV;
-
-open AUGTEST, ">", $augtest or die "cannot create $augtest: $!";
-
-$SIG{__DIE__} =3D sub {
-    unlink $augtest;
-};
=20
 open CONFIG, "<", $config or die "cannot read $config: $!";
 open TEMPLATE, "<", $template or die "cannot read $template: $!";
@@ -39,12 +32,12 @@ my $group =3D 0;
 while (<TEMPLATE>) {
     if (/::CONFIG::/) {
         my $group =3D 0;
-        print AUGTEST "  let conf =3D \"";
+        print "  let conf =3D \"";
         while (<CONFIG>) {
             if (/^#\w/) {
                 s/^#//;
                 s/\"/\\\"/g;
-                print AUGTEST $_;
+                print $_;
                 $group =3D /\[\s$/;
             } elsif ($group) {
                 s/\"/\\\"/g;
@@ -53,16 +46,15 @@ while (<TEMPLATE>) {
                 }
                 if (/^#/) {
                     s/^#//;
-                    print AUGTEST $_;
+                    print $_;
                 }
             }
         }
-        print AUGTEST "\"\n";
+        print "\"\n";
     } else {
-        print AUGTEST $_;
+        print $_;
     }
 }
=20
 close TEMPLATE;
 close CONFIG;
-close AUGTEST or die "cannot save $augtest: $!";
diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am
index 36af5d7504..6e8e6ad5d8 100644
--- a/src/bhyve/Makefile.inc.am
+++ b/src/bhyve/Makefile.inc.am
@@ -55,7 +55,7 @@ AUGEAS_DIRS +=3D bhyve
=20
 test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.aug.in \
 		$(srcdir)/bhyve/bhyve.conf $(AUG_GENTEST)
-	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/bhyve/bhyve.conf $< $@
+	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/bhyve/bhyve.conf $< > $@
=20
 check-augeas-bhyve: test_libvirtd_bhyve.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index 7f60b449d8..abc65ede2c 100644
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -74,7 +74,7 @@ AUGEAS_DIRS +=3D libxl
=20
 test_libvirtd_libxl.aug: libxl/test_libvirtd_libxl.aug.in \
 		$(srcdir)/libxl/libxl.conf $(AUG_GENTEST)
-	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/libxl/libxl.conf $< $@
+	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/libxl/libxl.conf $< > $@
=20
 check-augeas-libxl: test_libvirtd_libxl.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index 46ab11c2a9..c44f74a529 100644
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -228,7 +228,7 @@ if WITH_SANLOCK
 if WITH_QEMU
 test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \
 		locking/qemu-sanlock.conf $(AUG_GENTEST)
-	$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< $@
+	$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< > $@
=20
 check-augeas-sanlock: test_libvirt_sanlock.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
@@ -244,14 +244,14 @@ endif ! WITH_SANLOCK
 if WITH_QEMU
 test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \
 		locking/qemu-lockd.conf $(AUG_GENTEST)
-	$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-lockd.conf $< $@
+	$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-lockd.conf $< > $@
 else ! WITH_QEMU
 test_libvirt_lockd.aug:
 endif ! WITH_QEMU
=20
 test_virtlockd.aug: locking/test_virtlockd.aug.in \
 		locking/virtlockd.conf $(AUG_GENTEST)
-	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/locking/virtlockd.conf $< $@
+	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/locking/virtlockd.conf $< > $@
=20
 if WITH_QEMU
 check-augeas-lockd: test_libvirt_lockd.aug
diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am
index d57394cbde..8527890eb0 100644
--- a/src/logging/Makefile.inc.am
+++ b/src/logging/Makefile.inc.am
@@ -101,7 +101,7 @@ augeastest_DATA +=3D test_virtlogd.aug
=20
 test_virtlogd.aug: logging/test_virtlogd.aug.in \
 		logging/virtlogd.conf $(AUG_GENTEST)
-	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/logging/virtlogd.conf $< $@
+	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/logging/virtlogd.conf $< > $@
=20
 AUGEAS_DIRS +=3D logging
=20
diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index f27827c1e9..1c0b715a2f 100644
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -163,7 +163,7 @@ AUGEAS_DIRS +=3D lxc
=20
 test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \
 		$(srcdir)/lxc/lxc.conf $(AUG_GENTEST)
-	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/lxc/lxc.conf $< $@
+	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/lxc/lxc.conf $< > $@
=20
 check-augeas-lxc: test_libvirtd_lxc.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index 254ba07dc0..e8c7d4b5b1 100644
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -122,7 +122,7 @@ AUGEAS_DIRS +=3D qemu
=20
 test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in \
 		$(srcdir)/qemu/qemu.conf $(AUG_GENTEST)
-	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/qemu/qemu.conf $< $@
+	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/qemu/qemu.conf $< > $@
=20
 check-augeas-qemu: test_libvirtd_qemu.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 0cf00cb902..4f706f9743 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -190,7 +190,7 @@ AUGEAS_DIRS +=3D remote
=20
 test_libvirtd.aug: remote/test_libvirtd.aug.in \
 		remote/libvirtd.conf $(AUG_GENTEST)
-	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/remote/libvirtd.conf $< $@
+	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/remote/libvirtd.conf $< > $@
=20
 check-augeas-remote: test_libvirtd.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277226; cv=none;
	d=zoho.com; s=zohoarc;
	b=C93Id8cMpvDhspIZ/mJMS5hmB32cozszSKpBxQ3moxQguujUE4WKg6UryEXpK/jcpeOpMWRT0uh3YofTINfeDIR4HXcdP9Z9aJ2FKn7RIrjg8eW2Is4BZPy6aFXxDwxDd8mC9uoCD9n5WNSxFpLfK/KGpHidtoHkT1ZK4Gifvj4=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277226;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=gpiTZtkRGtPeBz73LVkDFBRmW5OD0BMLIjs7HSYXA2k=;
	b=VWahpZIJyMz2X/WriKu5KcNi7TquMP6qdgkquRzu1LLcmxhpQRN7nZmeUAf6zoL4hsp3Qwr4X4rKmSRRZolPfDHPUSeV/pymimY07XevsJvVT5F9YwtrpG1AP5faMy79kQ/skUHIMrrGgfok+kGGOEC/2f52u+Wd5C+VPaqitig=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277226523559.6249132401346;
 Thu, 8 Aug 2019 08:13:46 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id D8B49309BF22;
	Thu,  8 Aug 2019 15:13:44 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id A43E16012E;
	Thu,  8 Aug 2019 15:13:44 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6A0BC24F32;
	Thu,  8 Aug 2019 15:13:44 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FAsVw027315 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:10:54 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id DB3FE1001948; Thu,  8 Aug 2019 15:10:54 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 5A24310002B9;
	Thu,  8 Aug 2019 15:10:51 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:04 +0100
Message-Id: <20190808151044.11385-3-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 02/42] build: collapse rules adding augeas
	tests to CLEANFILES
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]);
 Thu, 08 Aug 2019 15:13:45 +0000 (UTC)

We already have a variable that lists all augeas test files, so we can
add everything to CLEANFILES at once.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/Makefile.am             | 1 +
 src/libxl/Makefile.inc.am   | 1 -
 src/locking/Makefile.inc.am | 4 +---
 src/logging/Makefile.inc.am | 2 --
 src/lxc/Makefile.inc.am     | 1 -
 src/qemu/Makefile.inc.am    | 1 -
 src/remote/Makefile.inc.am  | 2 --
 7 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index f111b2a1b4..2b5ac3914e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -149,6 +149,7 @@ augeasdir =3D $(datadir)/augeas/lenses
=20
 augeastestdir =3D $(datadir)/augeas/lenses/tests
=20
+CLEANFILES +=3D $(augeastest_DATA)
=20
 # Internal generic driver infrastructure
 DATATYPES_SOURCES =3D datatypes.h datatypes.c
diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index abc65ede2c..cfe136f07e 100644
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -68,7 +68,6 @@ libvirt_driver_libxl_impl_la_SOURCES =3D $(LIBXL_DRIVER_S=
OURCES)
 conf_DATA +=3D libxl/libxl.conf
 augeas_DATA +=3D libxl/libvirtd_libxl.aug
 augeastest_DATA +=3D test_libvirtd_libxl.aug
-CLEANFILES +=3D test_libvirtd_libxl.aug
=20
 AUGEAS_DIRS +=3D libxl
=20
diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index c44f74a529..2c53cff190 100644
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -74,7 +74,7 @@ SYSCONF_FILES +=3D locking/virtlockd.sysconf
 PODFILES +=3D locking/virtlockd.pod
 MANINFILES +=3D virtlockd.8.in
=20
-CLEANFILES +=3D test_virtlockd.aug $(man8_MANS)
+CLEANFILES +=3D $(man8_MANS)
 MAINTAINERCLEANFILES +=3D $(MANINFILES)
=20
 SYSTEMD_UNIT_FILES_IN +=3D \
@@ -115,7 +115,6 @@ endif WITH_SASL
=20
 if WITH_QEMU
 augeastest_DATA +=3D test_libvirt_lockd.aug
-CLEANFILES +=3D test_libvirt_lockd.aug
 nodist_conf_DATA +=3D locking/qemu-lockd.conf
 BUILT_SOURCES +=3D locking/qemu-lockd.conf
 DISTCLEANFILES +=3D locking/qemu-lockd.conf
@@ -171,7 +170,6 @@ augeas_DATA +=3D locking/libvirt_sanlock.aug
=20
 if WITH_QEMU
 augeastest_DATA +=3D test_libvirt_sanlock.aug
-CLEANFILES +=3D test_libvirt_sanlock.aug
 nodist_conf_DATA +=3D locking/qemu-sanlock.conf
 BUILT_SOURCES +=3D locking/qemu-sanlock.conf
 DISTCLEANFILES +=3D locking/qemu-sanlock.conf
diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am
index 8527890eb0..bf89c47b3b 100644
--- a/src/logging/Makefile.inc.am
+++ b/src/logging/Makefile.inc.am
@@ -46,8 +46,6 @@ MAINTAINERCLEANFILES +=3D \
 	$(LOG_DAEMON_GENERATED) \
 	$(NULL)
=20
-CLEANFILES +=3D test_virtlogd.aug
-
 PODFILES +=3D logging/virtlogd.pod
 MANINFILES +=3D virtlogd.8.in
 SYSCONF_FILES +=3D logging/virtlogd.sysconf
diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index 1c0b715a2f..df8d5db110 100644
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -157,7 +157,6 @@ conf_DATA +=3D lxc/lxc.conf
=20
 augeas_DATA +=3D lxc/libvirtd_lxc.aug
 augeastest_DATA +=3D test_libvirtd_lxc.aug
-CLEANFILES +=3D test_libvirtd_lxc.aug
=20
 AUGEAS_DIRS +=3D lxc
=20
diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index e8c7d4b5b1..69aaeb46c2 100644
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -116,7 +116,6 @@ conf_DATA +=3D qemu/qemu.conf
=20
 augeas_DATA +=3D qemu/libvirtd_qemu.aug
 augeastest_DATA +=3D test_libvirtd_qemu.aug
-CLEANFILES +=3D test_libvirtd_qemu.aug
=20
 AUGEAS_DIRS +=3D qemu
=20
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 4f706f9743..7d5c90cff1 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -130,8 +130,6 @@ augeastest_DATA +=3D test_libvirtd.aug
=20
 conf_DATA +=3D remote/libvirtd.conf
=20
-CLEANFILES +=3D test_libvirtd.aug
-
 man8_MANS +=3D libvirtd.8
=20
 libvirtd_SOURCES =3D $(LIBVIRTD_SOURCES)
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277229; cv=none;
	d=zoho.com; s=zohoarc;
	b=bZ8zFJBVH1Z2LwmzNrhGJwRKpPfPfE5i2OnHNXDIE5dP2xBsjqloW3A8zftTqZqc3jjGKHt39lVZCy7+KQFYyl1Hgs5I+xSuUucwk48dW+QoTeJf+weCr5SssIKLL9JDNcN0Wyof0YzBxDkjJ/64lpTNoZ9Q1ConoNsTqOOrZGI=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277229;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=uhBu5ZdZLAXGRLVD9L/xdW3c9Q3VTlPjyXw7xQfIvfY=;
	b=LaSBciFsqpdW52/6On86g3cZXLDeobrMhAPV9n3w2FUdLUhw2OwsV4CMORDGw++AgHFEQc6iiPIut1axTBWanMGxj2XxCOgEQXIq5qxyrvfDC5F3Vf3xyFZwJtjHmX4/s8traKiJrhHqkebxvYK0kwWubbLLOP7o96s9zTd3fUk=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277229782520.9367870495788;
 Thu, 8 Aug 2019 08:13:49 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id 5D7E17E427;
	Thu,  8 Aug 2019 15:13:48 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 3310D60BE1;
	Thu,  8 Aug 2019 15:13:48 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id E311724F3B;
	Thu,  8 Aug 2019 15:13:47 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FAupU027326 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:10:56 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 3B55F10016F3; Thu,  8 Aug 2019 15:10:56 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 3B2DA1001948;
	Thu,  8 Aug 2019 15:10:55 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:05 +0100
Message-Id: <20190808151044.11385-4-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 03/42] build: create all augeas test files in
	same dir as their source
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]);
 Thu, 08 Aug 2019 15:13:49 +0000 (UTC)

The current make rules are inconsistent about which directory the
augeas test files are created in. Put them all in the same dir as
their source.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                  |  9 ++++++---
 src/bhyve/Makefile.inc.am   |  8 ++++----
 src/libxl/Makefile.inc.am   |  8 ++++----
 src/locking/Makefile.inc.am | 29 +++++++++++++----------------
 src/logging/Makefile.inc.am |  8 ++++----
 src/lxc/Makefile.inc.am     |  8 ++++----
 src/qemu/Makefile.inc.am    |  8 ++++----
 src/remote/Makefile.inc.am  |  8 ++++----
 8 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/.gitignore b/.gitignore
index f3193173d6..0780546914 100644
--- a/.gitignore
+++ b/.gitignore
@@ -135,6 +135,7 @@
 /src/libvirt_lxc
 /src/libvirtd
 /src/libvirtd*.logrotate
+/src/libxl/test_libvirtd_libxl.aug
 /src/locking/libxl-lockd.conf
 /src/locking/libxl-sanlock.conf
 /src/locking/lock_daemon_dispatch_stubs.h
@@ -142,8 +143,11 @@
 /src/locking/qemu-lockd.conf
 /src/locking/qemu-sanlock.conf
 /src/locking/test_libvirt_sanlock.aug
+/src/locking/test_libvirt_lockd.aug
+/src/locking/test_virtlockd.aug
 /src/logging/log_daemon_dispatch_stubs.h
 /src/logging/log_protocol.[ch]
+/src/logging/test_virtlogd.aug
 /src/lxc/lxc_controller_dispatch.h
 /src/lxc/lxc_monitor_dispatch.h
 /src/lxc/lxc_monitor_protocol.c
@@ -154,11 +158,10 @@
 /src/remote/*_client_bodies.h
 /src/remote/*_protocol.[ch]
 /src/remote/*_stubs.h
+/src/remote/test_libvirtd.aug
 /src/rpc/virkeepaliveprotocol.[ch]
 /src/rpc/virnetprotocol.[ch]
-/src/test_libvirt*.aug
-/src/test_virtlockd.aug
-/src/test_virtlogd.aug
+/src/test*.aug
 /src/util/virkeycodetable*.h
 /src/util/virkeynametable*.h
 /src/virt-aa-helper
diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am
index 6e8e6ad5d8..0aef5e17c7 100644
--- a/src/bhyve/Makefile.inc.am
+++ b/src/bhyve/Makefile.inc.am
@@ -49,17 +49,17 @@ libvirt_driver_bhyve_impl_la_SOURCES =3D $(BHYVE_DRIVER=
_SOURCES)
=20
 conf_DATA +=3D bhyve/bhyve.conf
 augeas_DATA +=3D bhyve/libvirtd_bhyve.aug
-augeastest_DATA +=3D test_libvirtd_bhyve.aug
+augeastest_DATA +=3D bhyve/test_libvirtd_bhyve.aug
=20
 AUGEAS_DIRS +=3D bhyve
=20
-test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.aug.in \
+bhyve/test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.aug.in \
 		$(srcdir)/bhyve/bhyve.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/bhyve/bhyve.conf $< > $@
=20
-check-augeas-bhyve: test_libvirtd_bhyve.aug
+check-augeas-bhyve: bhyve/test_libvirtd_bhyve.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/bhyve test_libvirtd_bhyve.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/bhyve bhyve/test_libvirtd_bhyve.aug; \
 	fi
=20
 endif WITH_BHYVE
diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index cfe136f07e..e73f34db8e 100644
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -67,17 +67,17 @@ libvirt_driver_libxl_impl_la_SOURCES =3D $(LIBXL_DRIVER=
_SOURCES)
=20
 conf_DATA +=3D libxl/libxl.conf
 augeas_DATA +=3D libxl/libvirtd_libxl.aug
-augeastest_DATA +=3D test_libvirtd_libxl.aug
+augeastest_DATA +=3D libxl/test_libvirtd_libxl.aug
=20
 AUGEAS_DIRS +=3D libxl
=20
-test_libvirtd_libxl.aug: libxl/test_libvirtd_libxl.aug.in \
+libxl/test_libvirtd_libxl.aug: libxl/test_libvirtd_libxl.aug.in \
 		$(srcdir)/libxl/libxl.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/libxl/libxl.conf $< > $@
=20
-check-augeas-libxl: test_libvirtd_libxl.aug
+check-augeas-libxl: libxl/test_libvirtd_libxl.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/libxl test_libvirtd_libxl.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/libxl libxl/test_libvirtd_libxl.aug; \
 	fi
=20
 INSTALL_DATA_DIRS +=3D libxl
diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index 2c53cff190..0f284faf25 100644
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -114,7 +114,7 @@ lockd_la_CFLAGS +=3D \
 endif WITH_SASL
=20
 if WITH_QEMU
-augeastest_DATA +=3D test_libvirt_lockd.aug
+augeastest_DATA +=3D locking/test_libvirt_lockd.aug
 nodist_conf_DATA +=3D locking/qemu-lockd.conf
 BUILT_SOURCES +=3D locking/qemu-lockd.conf
 DISTCLEANFILES +=3D locking/qemu-lockd.conf
@@ -169,7 +169,7 @@ sanlock_la_LIBADD =3D -lsanlock_client libvirt.la ../gn=
ulib/lib/libgnu.la
 augeas_DATA +=3D locking/libvirt_sanlock.aug
=20
 if WITH_QEMU
-augeastest_DATA +=3D test_libvirt_sanlock.aug
+augeastest_DATA +=3D locking/test_libvirt_sanlock.aug
 nodist_conf_DATA +=3D locking/qemu-sanlock.conf
 BUILT_SOURCES +=3D locking/qemu-sanlock.conf
 DISTCLEANFILES +=3D locking/qemu-sanlock.conf
@@ -201,8 +201,7 @@ man8_MANS +=3D virtlockd.8
 conf_DATA +=3D locking/virtlockd.conf
=20
 augeas_DATA +=3D locking/virtlockd.aug
-augeastest_DATA +=3D test_virtlockd.aug
-
+augeastest_DATA +=3D locking/test_virtlockd.aug
=20
 INSTALL_DATA_DIRS +=3D locking
=20
@@ -224,13 +223,13 @@ endif WITH_SANLOCK
=20
 if WITH_SANLOCK
 if WITH_QEMU
-test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \
+locking/test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \
 		locking/qemu-sanlock.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< > $@
=20
-check-augeas-sanlock: test_libvirt_sanlock.aug
+check-augeas-sanlock: locking/test_libvirt_sanlock.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_sanlock.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/locking locking/test_libvirt_sanlock.aug; \
 	fi
 else ! WITH_QEMU
 check-augeas-sanlock:
@@ -240,29 +239,27 @@ check-augeas-sanlock:
 endif ! WITH_SANLOCK
=20
 if WITH_QEMU
-test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \
+locking/test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \
 		locking/qemu-lockd.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-lockd.conf $< > $@
-else ! WITH_QEMU
-test_libvirt_lockd.aug:
-endif ! WITH_QEMU
+endif WITH_QEMU
=20
-test_virtlockd.aug: locking/test_virtlockd.aug.in \
+locking/test_virtlockd.aug: locking/test_virtlockd.aug.in \
 		locking/virtlockd.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/locking/virtlockd.conf $< > $@
=20
 if WITH_QEMU
-check-augeas-lockd: test_libvirt_lockd.aug
+check-augeas-lockd: locking/test_libvirt_lockd.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_lockd.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/locking locking/test_libvirt_lockd.aug; \
 	fi
 else ! WITH_QEMU
 check-augeas-lockd:
 endif ! WITH_QEMU
=20
-check-augeas-virtlockd: test_virtlockd.aug
+check-augeas-virtlockd: locking/test_virtlockd.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/locking test_virtlockd.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/locking locking/test_virtlockd.aug; \
 	fi
=20
 AUGEAS_DIRS +=3D locking
diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am
index bf89c47b3b..58a139ec2f 100644
--- a/src/logging/Makefile.inc.am
+++ b/src/logging/Makefile.inc.am
@@ -95,17 +95,17 @@ endif WITH_SASL
 conf_DATA +=3D logging/virtlogd.conf
=20
 augeas_DATA +=3D logging/virtlogd.aug
-augeastest_DATA +=3D test_virtlogd.aug
+augeastest_DATA +=3D logging/test_virtlogd.aug
=20
-test_virtlogd.aug: logging/test_virtlogd.aug.in \
+logging/test_virtlogd.aug: logging/test_virtlogd.aug.in \
 		logging/virtlogd.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/logging/virtlogd.conf $< > $@
=20
 AUGEAS_DIRS +=3D logging
=20
-check-augeas-logging: test_virtlogd.aug
+check-augeas-logging: logging/test_virtlogd.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/logging test_virtlogd.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/logging logging/test_virtlogd.aug; \
 	fi
=20
 endif WITH_LIBVIRTD
diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index df8d5db110..f011d90e95 100644
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -156,17 +156,17 @@ endif
 conf_DATA +=3D lxc/lxc.conf
=20
 augeas_DATA +=3D lxc/libvirtd_lxc.aug
-augeastest_DATA +=3D test_libvirtd_lxc.aug
+augeastest_DATA +=3D lxc/test_libvirtd_lxc.aug
=20
 AUGEAS_DIRS +=3D lxc
=20
-test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \
+lxc/test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \
 		$(srcdir)/lxc/lxc.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/lxc/lxc.conf $< > $@
=20
-check-augeas-lxc: test_libvirtd_lxc.aug
+check-augeas-lxc: lxc/test_libvirtd_lxc.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/lxc test_libvirtd_lxc.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/lxc lxc/test_libvirtd_lxc.aug; \
 	fi
=20
 INSTALL_DATA_DIRS +=3D lxc
diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index 69aaeb46c2..750b8a5c85 100644
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -115,17 +115,17 @@ endif WITH_DTRACE_PROBES
 conf_DATA +=3D qemu/qemu.conf
=20
 augeas_DATA +=3D qemu/libvirtd_qemu.aug
-augeastest_DATA +=3D test_libvirtd_qemu.aug
+augeastest_DATA +=3D qemu/test_libvirtd_qemu.aug
=20
 AUGEAS_DIRS +=3D qemu
=20
-test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in \
+qemu/test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in \
 		$(srcdir)/qemu/qemu.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/qemu/qemu.conf $< > $@
=20
-check-augeas-qemu: test_libvirtd_qemu.aug
+check-augeas-qemu: qemu/test_libvirtd_qemu.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/qemu test_libvirtd_qemu.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/qemu qemu/test_libvirtd_qemu.aug; \
 	fi
=20
 INSTALL_DATA_DIRS +=3D qemu
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 7d5c90cff1..18519b129d 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -126,7 +126,7 @@ sbin_PROGRAMS +=3D libvirtd
=20
 augeas_DATA +=3D remote/libvirtd.aug
=20
-augeastest_DATA +=3D test_libvirtd.aug
+augeastest_DATA +=3D remote/test_libvirtd.aug
=20
 conf_DATA +=3D remote/libvirtd.conf
=20
@@ -186,13 +186,13 @@ uninstall-data-remote:
=20
 AUGEAS_DIRS +=3D remote
=20
-test_libvirtd.aug: remote/test_libvirtd.aug.in \
+remote/test_libvirtd.aug: remote/test_libvirtd.aug.in \
 		remote/libvirtd.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/remote/libvirtd.conf $< > $@
=20
-check-augeas-remote: test_libvirtd.aug
+check-augeas-remote: remote/test_libvirtd.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/remote test_libvirtd.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/remote remote/test_libvirtd.aug; \
 	fi
=20
 if WITH_SYSCTL
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277282; cv=none;
	d=zoho.com; s=zohoarc;
	b=XtqeAdKidqsZ24RBg+jEyL1n0OqbQKDvWFWrc015zaJLpORaWJ7GFP7/dWSpVG6+9Cli26CFcQo0voj7/ccjaVdyYW0h3RW13ADU49l6Kw47s3oHmK8p654gv8qCxWR2izol76S9LSLLk/f7jmBFZbRWhSykjkZeIv7Fbv/fYWs=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277282;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=TsmxOgBu3z47+Al+E9qHPPSnOO2cqXkWYdtWVZi5kmI=;
	b=brCfpAVD91GxEbQVFXjnZ9gL2D8c82/zuF6AJIjGWnCfX0CCUuieXMZOvzgvw0YXbkZrG0fyv124kOvN7U8U7jyVIrprXXTW0Us+JbTXzo0u3CfSWHj0IqYWiNKkz+2EswpioBnNE8eGoflumukR61KTa6Fng9AVBqJlGjqYhWA=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277282460923.2944179255438;
 Thu, 8 Aug 2019 08:14:42 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id 3108969081;
	Thu,  8 Aug 2019 15:14:41 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id EDA4860F9F;
	Thu,  8 Aug 2019 15:14:40 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 97D36E20F;
	Thu,  8 Aug 2019 15:14:40 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FAwtM027337 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:10:58 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 053501001948; Thu,  8 Aug 2019 15:10:58 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 8D0D81001284;
	Thu,  8 Aug 2019 15:10:56 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:06 +0100
Message-Id: <20190808151044.11385-5-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 04/42] build: use a common rule for checking
	augeas test data files
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]);
 Thu, 08 Aug 2019 15:14:41 +0000 (UTC)

Instead of each subdir containing its own custom rule for checking the
augeas tests, use common rule for all.

The new rule searches both src + build dirs for include files, since
some augeas files will be auto-generated very shortly.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/Makefile.am             | 20 ++++++++++++--------
 src/bhyve/Makefile.inc.am   | 11 -----------
 src/libxl/Makefile.inc.am   | 11 -----------
 src/locking/Makefile.inc.am | 34 ++--------------------------------
 src/logging/Makefile.inc.am |  9 ---------
 src/lxc/Makefile.inc.am     |  8 --------
 src/qemu/Makefile.inc.am    |  8 --------
 src/remote/Makefile.inc.am  |  8 --------
 8 files changed, 14 insertions(+), 95 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 2b5ac3914e..9eeef08b91 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -74,7 +74,6 @@ GENERATED_SYM_FILES =3D
 augeas_DATA =3D
 augeastest_DATA =3D
 conf_DATA =3D
-AUGEAS_DIRS =3D
 if WITH_DTRACE_PROBES
 tapset_DATA =3D
 endif WITH_DTRACE_PROBES
@@ -395,15 +394,20 @@ GENERATED_SYM_FILES +=3D \
 	$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -h \
 	       $< $(srcdir)/$(subst $(srcdir)/,,$@)
=20
-
-
-
-
-
-
 check-local: check-augeas
=20
-check-augeas: $(AUGEAS_DIRS:%=3Dcheck-augeas-%)
+check-augeas: $(augeas_DATA) $(augeastest_DATA)
+	$(AM_V_GEN) \
+	if test -x "$(AUGPARSE)"; then \
+	    for f in $(augeastest_DATA); do \
+		DIR=3D$$(dirname "$$f"); \
+		FILE=3D$$(basename "$$f"); \
+		"$(AUGPARSE)" \
+		    -I "$(srcdir)/$$DIR" -I "$(builddir)/$$DIR" \
+		    "$$DIR/$$FILE"; \
+	    done; \
+	fi
+.PHONY: check-augeas
=20
 AUG_GENTEST =3D $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl
=20
diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am
index 0aef5e17c7..8b662e9775 100644
--- a/src/bhyve/Makefile.inc.am
+++ b/src/bhyve/Makefile.inc.am
@@ -51,17 +51,10 @@ conf_DATA +=3D bhyve/bhyve.conf
 augeas_DATA +=3D bhyve/libvirtd_bhyve.aug
 augeastest_DATA +=3D bhyve/test_libvirtd_bhyve.aug
=20
-AUGEAS_DIRS +=3D bhyve
-
 bhyve/test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.aug.in \
 		$(srcdir)/bhyve/bhyve.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/bhyve/bhyve.conf $< > $@
=20
-check-augeas-bhyve: bhyve/test_libvirtd_bhyve.aug
-	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/bhyve bhyve/test_libvirtd_bhyve.aug; \
-	fi
-
 endif WITH_BHYVE
=20
 EXTRA_DIST +=3D \
@@ -69,7 +62,3 @@ EXTRA_DIST +=3D \
 	bhyve/libvirtd_bhyve.aug \
 	bhyve/test_libvirtd_bhyve.aug.in \
 	$(NULL)
-
-.PHONY: \
-	check-augeas-bhyve \
-	$(NULL)
diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index e73f34db8e..467c2720b2 100644
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -69,17 +69,10 @@ conf_DATA +=3D libxl/libxl.conf
 augeas_DATA +=3D libxl/libvirtd_libxl.aug
 augeastest_DATA +=3D libxl/test_libvirtd_libxl.aug
=20
-AUGEAS_DIRS +=3D libxl
-
 libxl/test_libvirtd_libxl.aug: libxl/test_libvirtd_libxl.aug.in \
 		$(srcdir)/libxl/libxl.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/libxl/libxl.conf $< > $@
=20
-check-augeas-libxl: libxl/test_libvirtd_libxl.aug
-	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/libxl libxl/test_libvirtd_libxl.aug; \
-	fi
-
 INSTALL_DATA_DIRS +=3D libxl
=20
 install-data-libxl:
@@ -94,10 +87,6 @@ uninstall-data-libxl:
=20
 endif WITH_LIBXL
=20
-.PHONY: \
-	check-augeas-libxl \
-	$(NULL)
-
 EXTRA_DIST +=3D \
 	libxl/libxl.conf \
 	libxl/libvirtd_libxl.aug \
diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index 0f284faf25..24d83fdd80 100644
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -227,16 +227,8 @@ locking/test_libvirt_sanlock.aug: locking/test_libvirt=
_sanlock.aug.in \
 		locking/qemu-sanlock.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< > $@
=20
-check-augeas-sanlock: locking/test_libvirt_sanlock.aug
-	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/locking locking/test_libvirt_sanlock.aug; \
-	fi
-else ! WITH_QEMU
-check-augeas-sanlock:
-endif ! WITH_QEMU
-else ! WITH_SANLOCK
-check-augeas-sanlock:
-endif ! WITH_SANLOCK
+endif WITH_QEMU
+endif WITH_SANLOCK
=20
 if WITH_QEMU
 locking/test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \
@@ -248,33 +240,11 @@ locking/test_virtlockd.aug: locking/test_virtlockd.au=
g.in \
 		locking/virtlockd.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/locking/virtlockd.conf $< > $@
=20
-if WITH_QEMU
-check-augeas-lockd: locking/test_libvirt_lockd.aug
-	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/locking locking/test_libvirt_lockd.aug; \
-	fi
-else ! WITH_QEMU
-check-augeas-lockd:
-endif ! WITH_QEMU
-
-check-augeas-virtlockd: locking/test_virtlockd.aug
-	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/locking locking/test_virtlockd.aug; \
-	fi
-
-AUGEAS_DIRS +=3D locking
-
-check-augeas-locking: check-augeas-virtlockd check-augeas-lockd check-auge=
as-sanlock
-
 endif WITH_LIBVIRTD
=20
 .PHONY: \
 	install-data-locking \
 	uninstall-data-locking \
-	check-augeas-locking \
-	check-augeas-virtlockd \
-	check-augeas-lockd \
-	check-augeas-sanlock \
 	$(NULL)
=20
 locking/%-lockd.conf: $(srcdir)/locking/lockd.conf
diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am
index 58a139ec2f..f0c49330f5 100644
--- a/src/logging/Makefile.inc.am
+++ b/src/logging/Makefile.inc.am
@@ -101,17 +101,8 @@ logging/test_virtlogd.aug: logging/test_virtlogd.aug.i=
n \
 		logging/virtlogd.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/logging/virtlogd.conf $< > $@
=20
-AUGEAS_DIRS +=3D logging
-
-check-augeas-logging: logging/test_virtlogd.aug
-	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/logging logging/test_virtlogd.aug; \
-	fi
-
 endif WITH_LIBVIRTD
=20
-.PHONY: check-augeas-logging
-
 logging/log_daemon_dispatch_stubs.h: $(LOG_PROTOCOL) \
 		$(srcdir)/rpc/gendispatch.pl Makefile.am
 	$(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl --mode=3Dserver \
diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index f011d90e95..0c241fc5c1 100644
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -158,17 +158,10 @@ conf_DATA +=3D lxc/lxc.conf
 augeas_DATA +=3D lxc/libvirtd_lxc.aug
 augeastest_DATA +=3D lxc/test_libvirtd_lxc.aug
=20
-AUGEAS_DIRS +=3D lxc
-
 lxc/test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \
 		$(srcdir)/lxc/lxc.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/lxc/lxc.conf $< > $@
=20
-check-augeas-lxc: lxc/test_libvirtd_lxc.aug
-	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/lxc lxc/test_libvirtd_lxc.aug; \
-	fi
-
 INSTALL_DATA_DIRS +=3D lxc
=20
 install-data-lxc:
@@ -196,7 +189,6 @@ lxc/lxc_controller_dispatch.h: $(srcdir)/rpc/gendispatc=
h.pl \
 	  $(srcdir)/lxc/lxc_controller_dispatch.h
=20
 .PHONY: \
-	check-agueas-lxc \
 	install-data-lxc \
 	uninstall-data-lxc \
 	$(NULL)
diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index 750b8a5c85..12236a9e7b 100644
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -117,17 +117,10 @@ conf_DATA +=3D qemu/qemu.conf
 augeas_DATA +=3D qemu/libvirtd_qemu.aug
 augeastest_DATA +=3D qemu/test_libvirtd_qemu.aug
=20
-AUGEAS_DIRS +=3D qemu
-
 qemu/test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in \
 		$(srcdir)/qemu/qemu.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/qemu/qemu.conf $< > $@
=20
-check-augeas-qemu: qemu/test_libvirtd_qemu.aug
-	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/qemu qemu/test_libvirtd_qemu.aug; \
-	fi
-
 INSTALL_DATA_DIRS +=3D qemu
=20
 install-data-qemu:
@@ -151,7 +144,6 @@ uninstall-data-qemu:
 endif WITH_QEMU
=20
 .PHONY: \
-	check-augeas-qemu \
 	install-data-qemu \
 	uninstall-data-qemu \
 	$(NULL)
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 18519b129d..0400dabad9 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -184,17 +184,10 @@ install-data-remote:
 uninstall-data-remote:
 	rmdir "$(DESTDIR)$(localstatedir)/log/libvirt" ||:
=20
-AUGEAS_DIRS +=3D remote
-
 remote/test_libvirtd.aug: remote/test_libvirtd.aug.in \
 		remote/libvirtd.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/remote/libvirtd.conf $< > $@
=20
-check-augeas-remote: remote/test_libvirtd.aug
-	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/remote remote/test_libvirtd.aug; \
-	fi
-
 if WITH_SYSCTL
 # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
 # /usr/lib/sysctl.d/ even when libdir is /usr/lib64
@@ -241,7 +234,6 @@ endif WITH_LIBVIRTD
 .PHONY: \
 	install-data-remote \
 	uninstall-data-remote \
-	check-augeas-remote \
 	$(NULL)
=20
 # This is needed for clients too, so can't wrap in
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277190; cv=none;
	d=zoho.com; s=zohoarc;
	b=akwbybFI3rxtIFUoGP/BvHphQyyVjNWrbkSKMlEQhJ/19vgxqqP2YFTCUVLaPEc/9OF02TMMqd0bH1eRIPFB566tKUIJnzJqVHJA6yC9z1ceaV0JrSAeDRDqJwXanmTLGNg9IzWJVsv4BgqUI3yAjjCJCQqTKNa8BOkHzpUT3v0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277190;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=2s/JpQ71f0GtRNY/J1RQjvW9tOm0Eg5ZRVwFS7reKIE=;
	b=U+QG4pbNEmtbxjZvvi4ucBgjcqtVPLCYQ2vKq1Ws1L2mDz6ljlyWK93VYFA51A2zAq+bKqE0mN4Bx7Q/WrPoBp5ZMyB0Q0y3uMtcBDHLOFUnp/ixiaGiDAZ1qPN7NoC988SefAD3COATCTk0HnNg6sDvhmOhQlenMEZOZPOfZ2E=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277190706832.446213117105;
 Thu, 8 Aug 2019 08:13:10 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com
 [10.5.11.15])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id AFBB8308A958;
	Thu,  8 Aug 2019 15:13:08 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id E47D75D784;
	Thu,  8 Aug 2019 15:13:07 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id B2CFE24F30;
	Thu,  8 Aug 2019 15:13:06 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FAxRO027345 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:10:59 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 4DC9C100194E; Thu,  8 Aug 2019 15:10:59 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 56A2D1001284;
	Thu,  8 Aug 2019 15:10:58 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:07 +0100
Message-Id: <20190808151044.11385-6-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 05/42] build: centralize rule for handling
	generated config files
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]);
 Thu, 08 Aug 2019 15:13:09 +0000 (UTC)

Instead of adding generated config files to CLEANFILES and BUILT_SOURCES
in each makefile, add them all at once.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/Makefile.am             | 3 +++
 src/locking/Makefile.inc.am | 8 --------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 9eeef08b91..150f67e0c3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -144,6 +144,9 @@ moddir =3D $(libdir)/libvirt/connection-driver
 confdir =3D $(sysconfdir)/libvirt
 conf_DATA +=3D libvirt.conf libvirt-admin.conf
=20
+CLEANFILES +=3D $(nodist_conf_DATA)
+BUILT_SOURCES +=3D $(nodist_conf_DATA)
+
 augeasdir =3D $(datadir)/augeas/lenses
=20
 augeastestdir =3D $(datadir)/augeas/lenses/tests
diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index 24d83fdd80..161410051c 100644
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -116,14 +116,10 @@ endif WITH_SASL
 if WITH_QEMU
 augeastest_DATA +=3D locking/test_libvirt_lockd.aug
 nodist_conf_DATA +=3D locking/qemu-lockd.conf
-BUILT_SOURCES +=3D locking/qemu-lockd.conf
-DISTCLEANFILES +=3D locking/qemu-lockd.conf
 endif WITH_QEMU
=20
 if WITH_LIBXL
 nodist_conf_DATA +=3D locking/libxl-lockd.conf
-BUILT_SOURCES +=3D locking/libxl-lockd.conf
-DISTCLEANFILES +=3D locking/libxl-lockd.conf
 endif WITH_LIBXL
=20
 sbin_PROGRAMS +=3D virtlockd
@@ -171,14 +167,10 @@ augeas_DATA +=3D locking/libvirt_sanlock.aug
 if WITH_QEMU
 augeastest_DATA +=3D locking/test_libvirt_sanlock.aug
 nodist_conf_DATA +=3D locking/qemu-sanlock.conf
-BUILT_SOURCES +=3D locking/qemu-sanlock.conf
-DISTCLEANFILES +=3D locking/qemu-sanlock.conf
 endif WITH_QEMU
=20
 if WITH_LIBXL
 nodist_conf_DATA +=3D locking/libxl-sanlock.conf
-BUILT_SOURCES +=3D locking/libxl-sanlock.conf
-DISTCLEANFILES +=3D locking/libxl-sanlock.conf
 endif WITH_LIBXL
=20
 libexec_PROGRAMS +=3D libvirt_sanlock_helper
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277286; cv=none;
	d=zoho.com; s=zohoarc;
	b=hJVJGnnUfrFwzgMnZXwlHUMC0ElX/IFg/cnnqkdJhrkYPHxMGi19VgRqfOFd7qEA7T/XrjJ33W1pDcxKFnyGjeF+KMBnhnAFZhGMUd2kn04ILOwmfla0yLA9lhAEX9jtjUrn1cf2bpapAfn4ArXNFxbc29r5vyW/43mM8PXuWfA=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277286;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=7RdFdQFODrk+4dXdn05eLHT7MT2xi4v/7IA2XxuvaAc=;
	b=n8BomHFjRVl6fFUws53MatsX+Sv95tb2l6RLeBR+eF2bOiRGvEC9hd2Ihi1cXcNluz3m65gAl5L3lTuolS+d8+ePWTKbRJ07+npnXa0ihT5E0PGrWGAGAkXdp8/66yDFlIgeVgqPFj6XREEC9TFa0hrwHlIhqHNXg4sPIfp3YxY=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 156527728695141.263599597917505;
 Thu, 8 Aug 2019 08:14:46 -0700 (PDT)
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 6DB7069094;
	Thu,  8 Aug 2019 15:14:45 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 4B0745C258;
	Thu,  8 Aug 2019 15:14:45 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0F1EFE212;
	Thu,  8 Aug 2019 15:14:45 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FB39D027357 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:03 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 5450310016F3; Thu,  8 Aug 2019 15:11:03 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 9EDA81001948;
	Thu,  8 Aug 2019 15:10:59 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:08 +0100
Message-Id: <20190808151044.11385-7-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Christophe de Dinechin <dinechin@redhat.com>,
	Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 06/42] remote: stop trying to print help as
	giant blocks of text
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]);
 Thu, 08 Aug 2019 15:14:46 +0000 (UTC)

The remote daemon tries to print out its help text in a couple of giant
blocks of text. This has already lead to duplication of the text for the
privileged vs unprivileged execution mode. With the introduction of more
daemons, this text is going to be duplicated many more times with small
variations. This is very unfriendly to translators as they have to
translate approximately the same text many times with small tweaks.

Splitting the text up into individual strings to print means that each
piece will only need translating once. It also gets rid of all the
layout information from the translated strings, so avoids the problem of
translators breaking formatting by mistake.

Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gnulib                    |   2 +-
 src/remote/Makefile.inc.am |   1 +
 src/remote/remote_daemon.c | 153 ++++++++++++++++++++-----------------
 src/remote/remote_driver.h |   1 -
 4 files changed, 83 insertions(+), 74 deletions(-)

diff --git a/.gnulib b/.gnulib
index c8e2eee548..8089c00979 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit c8e2eee548e6e81f3fccd31cf9f9a825db7fc8a8
+Subproject commit 8089c00979a5b089cff592c6b91420e595657167
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 0400dabad9..ced940d3c1 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -146,6 +146,7 @@ libvirtd_CFLAGS =3D \
 	-I$(srcdir)/access \
 	-I$(srcdir)/conf \
 	-I$(srcdir)/rpc \
+	-DSOCK_PREFIX=3D"\"libvirt\"" \
 	$(NULL)
=20
 libvirtd_LDFLAGS =3D \
diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index d887b7abfb..39c5d8642f 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -221,19 +221,25 @@ daemonUnixSocketPaths(struct daemonConfig *config,
     char *rundir =3D NULL;
=20
     if (config->unix_sock_dir) {
-        if (virAsprintf(sockfile, "%s/libvirt-sock", config->unix_sock_dir=
) < 0)
+        if (virAsprintf(sockfile, "%s/%s-sock",
+                        SOCK_PREFIX, config->unix_sock_dir) < 0)
             goto cleanup;
=20
         if (privileged) {
-            if (virAsprintf(rosockfile, "%s/libvirt-sock-ro", config->unix=
_sock_dir) < 0 ||
-                virAsprintf(admsockfile, "%s/libvirt-admin-sock", config->=
unix_sock_dir) < 0)
+            if (virAsprintf(rosockfile, "%s/%s-sock-ro",
+                            SOCK_PREFIX, config->unix_sock_dir) < 0 ||
+                virAsprintf(admsockfile, "%s/%s-admin-sock",
+                            SOCK_PREFIX, config->unix_sock_dir) < 0)
                 goto cleanup;
         }
     } else {
         if (privileged) {
-            if (VIR_STRDUP(*sockfile, LOCALSTATEDIR "/run/libvirt/libvirt-=
sock") < 0 ||
-                VIR_STRDUP(*rosockfile, LOCALSTATEDIR "/run/libvirt/libvir=
t-sock-ro") < 0 ||
-                VIR_STRDUP(*admsockfile, LOCALSTATEDIR "/run/libvirt/libvi=
rt-admin-sock") < 0)
+            if (virAsprintf(sockfile, "%s/run/libvirt/%s-sock",
+                            LOCALSTATEDIR, SOCK_PREFIX) < 0 ||
+                virAsprintf(rosockfile, "%s/run/libvirt/%s-sock-ro",
+                            LOCALSTATEDIR, SOCK_PREFIX) < 0 ||
+                virAsprintf(admsockfile, "%s/run/libvirt/%s-admin-sock",
+                            LOCALSTATEDIR, SOCK_PREFIX) < 0)
                 goto cleanup;
         } else {
             mode_t old_umask;
@@ -248,8 +254,10 @@ daemonUnixSocketPaths(struct daemonConfig *config,
             }
             umask(old_umask);
=20
-            if (virAsprintf(sockfile, "%s/libvirt-sock", rundir) < 0 ||
-                virAsprintf(admsockfile, "%s/libvirt-admin-sock", rundir) =
< 0)
+            if (virAsprintf(sockfile, "%s/%s-sock",
+                            rundir, SOCK_PREFIX) < 0 ||
+                virAsprintf(admsockfile, "%s/%s-admin-sock",
+                            rundir, SOCK_PREFIX) < 0)
                 goto cleanup;
         }
     }
@@ -859,75 +867,76 @@ daemonSetupHostUUID(const struct daemonConfig *config)
     return 0;
 }
=20
+typedef struct {
+    const char *opts;
+    const char *help;
+} virOptionHelp;
+
 /* Print command-line usage. */
 static void
 daemonUsage(const char *argv0, bool privileged)
 {
-    fprintf(stderr,
-            _("\n"
-              "Usage:\n"
-              "  %s [options]\n"
-              "\n"
-              "Options:\n"
-              "  -h | --help            Display program help:\n"
-              "  -v | --verbose         Verbose messages.\n"
-              "  -d | --daemon          Run as a daemon & write PID file.\=
n"
-              "  -l | --listen          Listen for TCP/IP connections.\n"
-              "  -t | --timeout <secs>  Exit after timeout period.\n"
-              "  -f | --config <file>   Configuration file.\n"
-              "  -V | --version         Display version information.\n"
-              "  -p | --pid-file <file> Change name of PID file.\n"
-              "\n"
-              "libvirt management daemon:\n"),
-            argv0);
+    size_t i;
+    virOptionHelp opthelp[] =3D {
+        { "-h | --help", N_("Display program help") },
+        { "-v | --verbose", N_("Verbose messages") },
+        { "-d | --daemon", N_("Run as a daemon & write PID file") },
+        { "-l | --listen", N_("Listen for TCP/IP connections") },
+        { "-t | --timeout <secs>", N_("Exit after timeout period") },
+        { "-f | --config <file>", N_("Configuration file") },
+        { "-V | --version", N_("Display version information") },
+        { "-p | --pid-file <file>", N_("Change name of PID file") },
+    };
=20
-    if (privileged) {
-        fprintf(stderr,
-                _("\n"
-                  "  Default paths:\n"
-                  "\n"
-                  "    Configuration file (unless overridden by -f):\n"
-                  "      %s\n"
-                  "\n"
-                  "    Sockets:\n"
-                  "      %s\n"
-                  "      %s\n"
-                  "\n"
-                  "    TLS:\n"
-                  "      CA certificate:     %s\n"
-                  "      Server certificate: %s\n"
-                  "      Server private key: %s\n"
-                  "\n"
-                  "    PID file (unless overridden by -p):\n"
-                  "      %s/run/libvirtd.pid\n"
-                  "\n"),
-                LIBVIRTD_CONFIGURATION_FILE,
-                LIBVIRTD_PRIV_UNIX_SOCKET,
-                LIBVIRTD_PRIV_UNIX_SOCKET_RO,
-                LIBVIRT_CACERT,
-                LIBVIRT_SERVERCERT,
-                LIBVIRT_SERVERKEY,
-                LOCALSTATEDIR);
-    } else {
-        fprintf(stderr, "%s",
-                _("\n"
-                  "  Default paths:\n"
-                  "\n"
-                  "    Configuration file (unless overridden by -f):\n"
-                  "      $XDG_CONFIG_HOME/libvirt/libvirtd.conf\n"
-                  "\n"
-                  "    Sockets:\n"
-                  "      $XDG_RUNTIME_DIR/libvirt/libvirt-sock\n"
-                  "\n"
-                  "    TLS:\n"
-                  "      CA certificate:     $HOME/.pki/libvirt/cacert.pem=
\n"
-                  "      Server certificate: $HOME/.pki/libvirt/servercert=
.pem\n"
-                  "      Server private key: $HOME/.pki/libvirt/serverkey.=
pem\n"
-                  "\n"
-                  "    PID file:\n"
-                  "      $XDG_RUNTIME_DIR/libvirt/libvirtd.pid\n"
-                  "\n"));
-    }
+    fprintf(stderr, "\n");
+    fprintf(stderr, "%s\n", _("Usage:"));
+    fprintf(stderr, "  %s [%s]\n", argv0, _("options"));
+    fprintf(stderr, "\n");
+
+    fprintf(stderr, "%s\n", _("Options:"));
+    for (i =3D 0; i < ARRAY_CARDINALITY(opthelp); i++)
+        fprintf(stderr, "  %-22s %s\n", opthelp[i].opts,
+                _(opthelp[i].help));
+    fprintf(stderr, "\n");
+
+    fprintf(stderr, "%s\n", _("libvirt management daemon:"));
+
+    fprintf(stderr, "\n");
+    fprintf(stderr, "  %s\n", _("Default paths:"));
+    fprintf(stderr, "\n");
+
+    fprintf(stderr, "    %s\n", _("Configuration file (unless overridden b=
y -f):"));
+    fprintf(stderr, "      %s/libvirt/libvirtd.conf\n",
+            privileged ? SYSCONFDIR : "$XDG_CONFIG_HOME");
+    fprintf(stderr, "\n");
+
+    fprintf(stderr, "    %s\n", _("Sockets:"));
+    fprintf(stderr, "      %s/libvirt/%s-sock\n",
+            privileged ? LOCALSTATEDIR "/run" : "$XDG_RUNTIME_DIR",
+            SOCK_PREFIX);
+    if (privileged)
+        fprintf(stderr, "      %s/run/libvirt/%s-sock-ro\n",
+                LOCALSTATEDIR, SOCK_PREFIX);
+    fprintf(stderr, "\n");
+
+    fprintf(stderr, "    %s\n", _("TLS:"));
+    fprintf(stderr, "      %s %s\n",
+            _("CA certificate:"),
+            privileged ? LIBVIRT_CACERT : "$HOME/.pki/libvirt/cacert.pem");
+    fprintf(stderr, "      %s %s\n",
+            _("Server certificate:"),
+            privileged ? LIBVIRT_SERVERCERT : "$HOME/.pki/libvirt/serverce=
rt.pem");
+    fprintf(stderr, "      %s %s\n",
+            _("Server private key:"),
+            privileged ? LIBVIRT_SERVERKEY : "$HOME/.pki/libvirt/serverkey=
.pem");
+    fprintf(stderr, "\n");
+
+    fprintf(stderr, "    %s\n",
+            _("PID file (unless overridden by -p):"));
+    fprintf(stderr, "      %s\n",
+            privileged ? LOCALSTATEDIR "/run/libvirtd.pid":
+            "$XDG_RUNTIME_DIR/libvirt/libvirtd.pid");
+    fprintf(stderr, "\n");
 }
=20
 int main(int argc, char **argv) {
diff --git a/src/remote/remote_driver.h b/src/remote/remote_driver.h
index 8c7da6b000..132e478ef3 100644
--- a/src/remote/remote_driver.h
+++ b/src/remote/remote_driver.h
@@ -34,7 +34,6 @@ unsigned long remoteVersion(void);
 #define LIBVIRTD_PRIV_UNIX_SOCKET LOCALSTATEDIR "/run/libvirt/libvirt-sock"
 #define LIBVIRTD_PRIV_UNIX_SOCKET_RO LOCALSTATEDIR "/run/libvirt/libvirt-s=
ock-ro"
 #define LIBVIRTD_USER_UNIX_SOCKET "libvirt-sock"
-#define LIBVIRTD_CONFIGURATION_FILE SYSCONFDIR "/libvirt/libvirtd.conf"
=20
 /* Defaults for PKI directory. */
 #define LIBVIRT_PKI_DIR SYSCONFDIR "/pki"
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277233; cv=none;
	d=zoho.com; s=zohoarc;
	b=F+dgLSulkLmqi9xbM6hDR+mcwyKW3a5uBEeaYYVws73FgrAdyppuo+p7wTkxfnIkwJYYCwvhuKDWRmXI0B6Pkoh9jaAsyUrwJTkKkZFySD74oeedweZUkxGcZyVSM/g1tx3EE1jiPRk2WgSCuw4D3boJbYjbR16YNZo1e34LBZg=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277233;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=K4rlj7LVyo2BrQ+JbwH02ow5bFpv7/H7yurY+7p/i0I=;
	b=UAPIang7IKdnSTEZhnt0lA0JkPHtjQ08N/RKpg+JHngzi/7CDte3Xyhvg46nvhhnLZeY1DN/mYffkFPFbEVTJsexzBHeUFWMKGjC6lbg0+1XxXwOCv5L+EWiKVFVVPfz03ouRG+AKG7cjIuv27vFO/og1y2vhLetDqI1vdMzguM=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277233475934.0494660320276;
 Thu, 8 Aug 2019 08:13:53 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id 46C7E89C3B;
	Thu,  8 Aug 2019 15:13:52 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 19D8760619;
	Thu,  8 Aug 2019 15:13:52 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id C908C180BAA6;
	Thu,  8 Aug 2019 15:13:51 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FB5tX027367 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:05 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 7F16910016F3; Thu,  8 Aug 2019 15:11:05 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id E4FB61001284;
	Thu,  8 Aug 2019 15:11:03 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:09 +0100
Message-Id: <20190808151044.11385-8-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Christophe de Dinechin <dinechin@redhat.com>,
	Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 07/42] remote: conditionalize daemon name in
	libvirtd daemon
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]);
 Thu, 08 Aug 2019 15:13:52 +0000 (UTC)

Prepare for reusing libvirtd source to create other daemons by making
the daemon name conditionally defined by the make rules.

Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/Makefile.inc.am        |  1 +
 src/remote/remote_daemon.c        | 50 +++++++++++++++++--------------
 src/remote/remote_daemon_config.c |  5 ++--
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index ced940d3c1..b72186109a 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -147,6 +147,7 @@ libvirtd_CFLAGS =3D \
 	-I$(srcdir)/conf \
 	-I$(srcdir)/rpc \
 	-DSOCK_PREFIX=3D"\"libvirt\"" \
+	-DDAEMON_NAME=3D"\"libvirtd\"" \
 	$(NULL)
=20
 libvirtd_LDFLAGS =3D \
diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index 39c5d8642f..577da7aa1f 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -64,7 +64,11 @@
=20
 #include "virdbus.h"
=20
-VIR_LOG_INIT("daemon.libvirtd");
+VIR_LOG_INIT("daemon." DAEMON_NAME);
+
+#ifndef SOCK_PREFIX
+# define SOCK_PREFIX DAEMON_NAME
+#endif
=20
 #if WITH_SASL
 virNetSASLContextPtr saslCtxt =3D NULL;
@@ -383,11 +387,11 @@ daemonSetupNetworking(virNetServerPtr srv,
     int ret =3D -1;
     VIR_AUTOPTR(virSystemdActivation) act =3D NULL;
     virSystemdActivationMap actmap[] =3D {
-        { .name =3D "libvirtd.socket", .family =3D AF_UNIX, .path =3D sock=
_path },
-        { .name =3D "libvirtd-ro.socket", .family =3D AF_UNIX, .path =3D s=
ock_path_ro },
-        { .name =3D "libvirtd-admin.socket", .family =3D AF_UNIX, .path =
=3D sock_path_adm },
-        { .name =3D "libvirtd-tcp.socket", .family =3D AF_INET },
-        { .name =3D "libvirtd-tls.socket", .family =3D AF_INET },
+        { .name =3D DAEMON_NAME ".socket", .family =3D AF_UNIX, .path =3D =
sock_path },
+        { .name =3D DAEMON_NAME "-ro.socket", .family =3D AF_UNIX, .path =
=3D sock_path_ro },
+        { .name =3D DAEMON_NAME "-admin.socket", .family =3D AF_UNIX, .pat=
h =3D sock_path_adm },
+        { .name =3D DAEMON_NAME "-tcp.socket", .family =3D AF_INET },
+        { .name =3D DAEMON_NAME "-tls.socket", .family =3D AF_INET },
     };
=20
     if ((actmap[3].port =3D virSocketAddrResolveService(config->tcp_port))=
 < 0)
@@ -421,7 +425,7 @@ daemonSetupNetworking(virNetServerPtr srv,
=20
     if (virNetServerAddServiceUNIX(srv,
                                    act,
-                                   "libvirtd.socket",
+                                   DAEMON_NAME ".socket",
                                    sock_path,
                                    unix_sock_rw_mask,
                                    unix_sock_gid,
@@ -434,7 +438,7 @@ daemonSetupNetworking(virNetServerPtr srv,
     if (sock_path_ro &&
         virNetServerAddServiceUNIX(srv,
                                    act,
-                                   "libvirtd-ro.socket",
+                                   DAEMON_NAME "-ro.socket",
                                    sock_path_ro,
                                    unix_sock_ro_mask,
                                    unix_sock_gid,
@@ -448,7 +452,7 @@ daemonSetupNetworking(virNetServerPtr srv,
     if (sock_path_adm &&
         virNetServerAddServiceUNIX(srvAdm,
                                    act,
-                                   "libvirtd-admin.socket",
+                                   DAEMON_NAME "-admin.socket",
                                    sock_path_adm,
                                    unix_sock_adm_mask,
                                    unix_sock_gid,
@@ -462,7 +466,7 @@ daemonSetupNetworking(virNetServerPtr srv,
     if (((ipsock && config->listen_tcp) || act) &&
         virNetServerAddServiceTCP(srv,
                                   act,
-                                  "libvirtd-tcp.socket",
+                                  DAEMON_NAME "-tcp.socket",
                                   config->listen_addr,
                                   config->tcp_port,
                                   AF_UNSPEC,
@@ -519,7 +523,7 @@ daemonSetupNetworking(virNetServerPtr srv,
                   config->listen_addr, config->tls_port);
         if (virNetServerAddServiceTCP(srv,
                                       act,
-                                      "libvirtd-tls.socket",
+                                      DAEMON_NAME "-tls.socket",
                                       config->listen_addr,
                                       config->tls_port,
                                       AF_UNSPEC,
@@ -564,7 +568,7 @@ daemonSetupNetDevOpenvswitch(struct daemonConfig *confi=
g)
=20
 /*
  * Set up the logging environment
- * By default if daemonized all errors go to the logfile libvirtd.log,
+ * By default if daemonized all errors go to journald/a logfile
  * but if verbose or error debugging is asked for then also output
  * informational and debug messages. Default size if 64 kB.
  */
@@ -577,7 +581,7 @@ daemonSetupLogging(struct daemonConfig *config,
     virLogReset();
=20
     /*
-     * Libvirtd's order of precedence is:
+     * Logging setup order of precedence is:
      * cmdline > environment > config
      *
      * Given the precedence, we must process the variables in the opposite
@@ -605,7 +609,7 @@ daemonSetupLogging(struct daemonConfig *config,
     /* Define the default output. This is only applied if there was no set=
ting
      * from either the config or the environment.
      */
-    if (virLogSetDefaultOutput("libvirtd", godaemon, privileged) < 0)
+    if (virLogSetDefaultOutput(DAEMON_NAME, godaemon, privileged) < 0)
         return -1;
=20
     if (virLogGetNbOutputs() =3D=3D 0)
@@ -717,7 +721,7 @@ static void daemonStopWorker(void *opaque)
=20
     VIR_DEBUG("Completed stop dmn=3D%p", dmn);
=20
-    /* Exit libvirtd cleanly */
+    /* Exit daemon cleanly */
     virNetDaemonQuit(dmn);
 }
=20
@@ -796,7 +800,7 @@ static void daemonRunStateInit(void *opaque)
     driversInitialized =3D true;
=20
 #ifdef WITH_DBUS
-    /* Tie the non-privileged libvirtd to the session/shutdown lifecycle */
+    /* Tie the non-privileged daemons to the session/shutdown lifecycle */
     if (!virNetDaemonIsPrivileged(dmn)) {
=20
         sessionBus =3D virDBusGetSessionBus();
@@ -906,8 +910,8 @@ daemonUsage(const char *argv0, bool privileged)
     fprintf(stderr, "\n");
=20
     fprintf(stderr, "    %s\n", _("Configuration file (unless overridden b=
y -f):"));
-    fprintf(stderr, "      %s/libvirt/libvirtd.conf\n",
-            privileged ? SYSCONFDIR : "$XDG_CONFIG_HOME");
+    fprintf(stderr, "      %s/libvirt/%s.conf\n",
+            privileged ? SYSCONFDIR : "$XDG_CONFIG_HOME", DAEMON_NAME);
     fprintf(stderr, "\n");
=20
     fprintf(stderr, "    %s\n", _("Sockets:"));
@@ -933,9 +937,9 @@ daemonUsage(const char *argv0, bool privileged)
=20
     fprintf(stderr, "    %s\n",
             _("PID file (unless overridden by -p):"));
-    fprintf(stderr, "      %s\n",
-            privileged ? LOCALSTATEDIR "/run/libvirtd.pid":
-            "$XDG_RUNTIME_DIR/libvirt/libvirtd.pid");
+    fprintf(stderr, "      %s/%s.pid\n",
+            privileged ? LOCALSTATEDIR "/run" : "$XDG_RUNTIME_DIR/libvirt",
+            DAEMON_NAME);
     fprintf(stderr, "\n");
 }
=20
@@ -1099,7 +1103,7 @@ int main(int argc, char **argv) {
     if (!pid_file &&
         virPidFileConstructPath(privileged,
                                 LOCALSTATEDIR,
-                                "libvirtd",
+                                DAEMON_NAME,
                                 &pid_file) < 0) {
         VIR_ERROR(_("Can't determine pid file path."));
         exit(EXIT_FAILURE);
@@ -1179,7 +1183,7 @@ int main(int argc, char **argv) {
         goto cleanup;
     }
=20
-    if (!(srv =3D virNetServerNew("libvirtd", 1,
+    if (!(srv =3D virNetServerNew(DAEMON_NAME, 1,
                                 config->min_workers,
                                 config->max_workers,
                                 config->prio_workers,
diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_c=
onfig.c
index 537b90a855..3e62b4203f 100644
--- a/src/remote/remote_daemon_config.c
+++ b/src/remote/remote_daemon_config.c
@@ -77,7 +77,8 @@ int
 daemonConfigFilePath(bool privileged, char **configfile)
 {
     if (privileged) {
-        if (VIR_STRDUP(*configfile, SYSCONFDIR "/libvirt/libvirtd.conf") <=
 0)
+        if (VIR_STRDUP(*configfile,
+                       SYSCONFDIR "/libvirt/" DAEMON_NAME ".conf") < 0)
             goto error;
     } else {
         char *configdir =3D NULL;
@@ -85,7 +86,7 @@ daemonConfigFilePath(bool privileged, char **configfile)
         if (!(configdir =3D virGetUserConfigDirectory()))
             goto error;
=20
-        if (virAsprintf(configfile, "%s/libvirtd.conf", configdir) < 0) {
+        if (virAsprintf(configfile, "%s/%s.conf", configdir, DAEMON_NAME) =
< 0) {
             VIR_FREE(configdir);
             goto error;
         }
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277199; cv=none;
	d=zoho.com; s=zohoarc;
	b=SU/Pf2s6DEKW07wfzURVKH28La9kJAM68fxpU/ku5Nvj4KwmF2Imq5fiPbWnSvr6uEesgaNdGgowe81u3Whng3SfsY+Cl+PhD+vE1WmEIS1m8bevSsWO8wQA9cq0jEHubjxSVcvURCatKzXQQva7RxfjFL6nvkI9WvwELVUfQhg=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277199;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=kKxbR+YQpIy9t8PMWvzZrCkIXgqsJ/6vZaET4R253WU=;
	b=B3PF3DhdSqeHXzoRCHkrw///0/aCJeG79iruoUdGMjTDNlGuTrXfleoHvUPdnPZI4RUD9F1/ssStmmCX4LctTaUk/znEb4TPfmHxvCmySXO6HUNDUs+wBGGaiVoGGpxiXGtdJAMElr5C91WTSAnV1v0iYiqyNRdPAvCkD0zR1MQ=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277199776442.04368369539463;
 Thu, 8 Aug 2019 08:13:19 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
 [10.5.11.22])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 1C8238E59D;
	Thu,  8 Aug 2019 15:13:18 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id E01F11001284;
	Thu,  8 Aug 2019 15:13:17 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4907E24F33;
	Thu,  8 Aug 2019 15:13:17 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FB9qC027378 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:09 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 4398B1001956; Thu,  8 Aug 2019 15:11:09 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 1E8501001284;
	Thu,  8 Aug 2019 15:11:05 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:10 +0100
Message-Id: <20190808151044.11385-9-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Christophe de Dinechin <dinechin@redhat.com>,
	Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 08/42] remote: conditionalize driver loading in
	libvirtd daemon
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]);
 Thu, 08 Aug 2019 15:13:18 +0000 (UTC)

Prepare for reusing libvirtd source to create other daemons by making
the driver(s) to load conditionally defined by the make rules.

If nothing is set, all drivers will be loaded, ignoring any missing ones
as historically done.

If MODULE_NAME is set only one driver will be loaded and that one must
succeed.

Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/remote_daemon.c | 55 +++++++++++++++++++++-----------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index 577da7aa1f..cf3d4b8f90 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -311,60 +311,67 @@ static int daemonErrorLogFilter(virErrorPtr err, int =
priority)
=20
 static int daemonInitialize(void)
 {
-    /*
+#ifdef MODULE_NAME
+    /* This a dedicated per-driver daemon build */
+    if (virDriverLoadModule(MODULE_NAME, MODULE_NAME "Register", true) < 0)
+        return -1;
+#else
+    /* This is the legacy monolithic libvirtd built with all drivers
+     *
      * Note that the order is important: the first ones have a higher
      * priority when calling virStateInitialize. We must register the
      * network, storage and nodedev drivers before any stateful domain
      * driver, since their resources must be auto-started before any
      * domains can be auto-started.
      */
-#ifdef WITH_NETWORK
+# ifdef WITH_NETWORK
     if (virDriverLoadModule("network", "networkRegister", false) < 0)
         return -1;
-#endif
-#ifdef WITH_INTERFACE
+# endif
+# ifdef WITH_INTERFACE
     if (virDriverLoadModule("interface", "interfaceRegister", false) < 0)
         return -1;
-#endif
-#ifdef WITH_SECRETS
+# endif
+# ifdef WITH_SECRETS
     if (virDriverLoadModule("secret", "secretRegister", false) < 0)
         return -1;
-#endif
-#ifdef WITH_STORAGE
+# endif
+# ifdef WITH_STORAGE
     if (virDriverLoadModule("storage", "storageRegister", false) < 0)
         return -1;
-#endif
-#ifdef WITH_NODE_DEVICES
+# endif
+# ifdef WITH_NODE_DEVICES
     if (virDriverLoadModule("nodedev", "nodedevRegister", false) < 0)
         return -1;
-#endif
-#ifdef WITH_NWFILTER
+# endif
+# ifdef WITH_NWFILTER
     if (virDriverLoadModule("nwfilter", "nwfilterRegister", false) < 0)
         return -1;
-#endif
-#ifdef WITH_LIBXL
+# endif
+# ifdef WITH_LIBXL
     if (virDriverLoadModule("libxl", "libxlRegister", false) < 0)
         return -1;
-#endif
-#ifdef WITH_QEMU
+# endif
+# ifdef WITH_QEMU
     if (virDriverLoadModule("qemu", "qemuRegister", false) < 0)
         return -1;
-#endif
-#ifdef WITH_LXC
+# endif
+# ifdef WITH_LXC
     if (virDriverLoadModule("lxc", "lxcRegister", false) < 0)
         return -1;
-#endif
-#ifdef WITH_VBOX
+# endif
+# ifdef WITH_VBOX
     if (virDriverLoadModule("vbox", "vboxRegister", false) < 0)
         return -1;
-#endif
-#ifdef WITH_BHYVE
+# endif
+# ifdef WITH_BHYVE
     if (virDriverLoadModule("bhyve", "bhyveRegister", false) < 0)
         return -1;
-#endif
-#ifdef WITH_VZ
+# endif
+# ifdef WITH_VZ
     if (virDriverLoadModule("vz", "vzRegister", false) < 0)
         return -1;
+# endif
 #endif
     return 0;
 }
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277208; cv=none;
	d=zoho.com; s=zohoarc;
	b=dzgnjP1H6vv5RFIiLvu5deUBR5KKwEZV2iUAvFP2TILFnHugV13I2WWXYRuYNUfJMWZvvOOSu6vHtZkP627OHwVx+LBjXV5O9I1CBtLlqJTYtIFJINWZpn+gBh+jfZdXsS19p53KBn0VwRSsLHAu927MjXizHbVwpurTQt8oAGc=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277208;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=tJ2S36x9BMQ/S3luKYEfxcApgX3+kEhWotRnNUVTyBs=;
	b=VI22hInJAFOKI3xveSGmUXpN+YoFo1swvK0SPNKmm+psgTT8ho5fy6bOZKSCNwiGYdw65uB9zCbd8Jm6gAV/ijBXysp5bOobs6Vkn3lPg7Ym+XFaiH6xtZ7odkvO9fuC8vz4qY1Dq44IKFpFW1FRRHAA79exSMUmIywBJab5lsg=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 156527720826044.91135273771829;
 Thu, 8 Aug 2019 08:13:28 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
 [10.5.11.22])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 9934130EA1A7;
	Thu,  8 Aug 2019 15:13:26 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 72BCB100194E;
	Thu,  8 Aug 2019 15:13:26 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 34BC524F36;
	Thu,  8 Aug 2019 15:13:26 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBBwF027389 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:11 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 0405A1001955; Thu,  8 Aug 2019 15:11:11 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id BA7AF1001284;
	Thu,  8 Aug 2019 15:11:09 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:11 +0100
Message-Id: <20190808151044.11385-10-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Christophe de Dinechin <dinechin@redhat.com>,
	Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 09/42] remote: conditionalize IP socket usage
	in libvirtd daemon
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]);
 Thu, 08 Aug 2019 15:13:27 +0000 (UTC)

Prepare for reusing libvirtd source to create other daemons by making
the use of IP sockets conditionally defined by the make rules.

The main libvirtd daemon will retain IP listen ability, but all the
driver specific daemons will be local UNIX sockets only. Apps needing
IP connectivity will connect via the libvirtd daemon which will proxy
to the driver specfic daemon.

Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/Makefile.inc.am        |  1 +
 src/remote/remote_daemon.c        | 39 ++++++++++++++++++++++++++-----
 src/remote/remote_daemon_config.c | 36 ++++++++++++++++++++--------
 src/remote/remote_daemon_config.h | 10 +++++++-
 4 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index b72186109a..a77b59a171 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -148,6 +148,7 @@ libvirtd_CFLAGS =3D \
 	-I$(srcdir)/rpc \
 	-DSOCK_PREFIX=3D"\"libvirt\"" \
 	-DDAEMON_NAME=3D"\"libvirtd\"" \
+	-DWITH_IP \
 	$(NULL)
=20
 libvirtd_LDFLAGS =3D \
diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index cf3d4b8f90..d63f2daac1 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -381,11 +381,13 @@ static int ATTRIBUTE_NONNULL(3)
 daemonSetupNetworking(virNetServerPtr srv,
                       virNetServerPtr srvAdm,
                       struct daemonConfig *config,
+#ifdef WITH_IP
+                      bool ipsock,
+                      bool privileged,
+#endif /* ! WITH_IP */
                       const char *sock_path,
                       const char *sock_path_ro,
-                      const char *sock_path_adm,
-                      bool ipsock,
-                      bool privileged)
+                      const char *sock_path_adm)
 {
     gid_t unix_sock_gid =3D 0;
     int unix_sock_ro_mask =3D 0;
@@ -397,15 +399,19 @@ daemonSetupNetworking(virNetServerPtr srv,
         { .name =3D DAEMON_NAME ".socket", .family =3D AF_UNIX, .path =3D =
sock_path },
         { .name =3D DAEMON_NAME "-ro.socket", .family =3D AF_UNIX, .path =
=3D sock_path_ro },
         { .name =3D DAEMON_NAME "-admin.socket", .family =3D AF_UNIX, .pat=
h =3D sock_path_adm },
+#ifdef WITH_IP
         { .name =3D DAEMON_NAME "-tcp.socket", .family =3D AF_INET },
         { .name =3D DAEMON_NAME "-tls.socket", .family =3D AF_INET },
+#endif /* ! WITH_IP */
     };
=20
+#ifdef WITH_IP
     if ((actmap[3].port =3D virSocketAddrResolveService(config->tcp_port))=
 < 0)
         return -1;
=20
     if ((actmap[4].port =3D virSocketAddrResolveService(config->tls_port))=
 < 0)
         return -1;
+#endif /* ! WITH_IP */
=20
     if (virSystemdGetActivation(actmap, ARRAY_CARDINALITY(actmap), &act) <=
 0)
         return -1;
@@ -470,6 +476,7 @@ daemonSetupNetworking(virNetServerPtr srv,
                                    config->admin_max_client_requests) < 0)
         goto cleanup;
=20
+#ifdef WITH_IP
     if (((ipsock && config->listen_tcp) || act) &&
         virNetServerAddServiceTCP(srv,
                                   act,
@@ -544,6 +551,7 @@ daemonSetupNetworking(virNetServerPtr srv,
         }
         virObjectUnref(ctxt);
     }
+#endif /* ! WITH_IP */
=20
     if (act &&
         virSystemdActivationComplete(act) < 0)
@@ -892,7 +900,9 @@ daemonUsage(const char *argv0, bool privileged)
         { "-h | --help", N_("Display program help") },
         { "-v | --verbose", N_("Verbose messages") },
         { "-d | --daemon", N_("Run as a daemon & write PID file") },
+#ifdef WITH_IP
         { "-l | --listen", N_("Listen for TCP/IP connections") },
+#endif /* !WITH_IP */
         { "-t | --timeout <secs>", N_("Exit after timeout period") },
         { "-f | --config <file>", N_("Configuration file") },
         { "-V | --version", N_("Display version information") },
@@ -930,6 +940,7 @@ daemonUsage(const char *argv0, bool privileged)
                 LOCALSTATEDIR, SOCK_PREFIX);
     fprintf(stderr, "\n");
=20
+#ifdef WITH_IP
     fprintf(stderr, "    %s\n", _("TLS:"));
     fprintf(stderr, "      %s %s\n",
             _("CA certificate:"),
@@ -941,6 +952,7 @@ daemonUsage(const char *argv0, bool privileged)
             _("Server private key:"),
             privileged ? LIBVIRT_SERVERKEY : "$HOME/.pki/libvirt/serverkey=
.pem");
     fprintf(stderr, "\n");
+#endif /* ! WITH_IP */
=20
     fprintf(stderr, "    %s\n",
             _("PID file (unless overridden by -p):"));
@@ -967,7 +979,9 @@ int main(int argc, char **argv) {
     int timeout =3D -1;        /* -t: Shutdown timeout */
     int verbose =3D 0;
     int godaemon =3D 0;
+#ifdef WITH_IP
     int ipsock =3D 0;
+#endif /* ! WITH_IP */
     struct daemonConfig *config;
     bool privileged =3D geteuid() =3D=3D 0 ? true : false;
     bool implicit_conf =3D false;
@@ -977,7 +991,9 @@ int main(int argc, char **argv) {
     struct option opts[] =3D {
         { "verbose", no_argument, &verbose, 'v'},
         { "daemon", no_argument, &godaemon, 'd'},
+#ifdef WITH_IP
         { "listen", no_argument, &ipsock, 'l'},
+#endif /* ! WITH_IP */
         { "config", required_argument, NULL, 'f'},
         { "timeout", required_argument, NULL, 't'},
         { "pid-file", required_argument, NULL, 'p'},
@@ -1000,8 +1016,13 @@ int main(int argc, char **argv) {
         int optidx =3D 0;
         int c;
         char *tmp;
+#ifdef WITH_IP
+        const char *optstr =3D "ldf:p:t:vVh";
+#else /* ! WITH_IP */
+        const char *optstr =3D "df:p:t:vVh";
+#endif /* ! WITH_IP */
=20
-        c =3D getopt_long(argc, argv, "ldf:p:t:vVh", opts, &optidx);
+        c =3D getopt_long(argc, argv, optstr, opts, &optidx);
=20
         if (c =3D=3D -1)
             break;
@@ -1016,9 +1037,12 @@ int main(int argc, char **argv) {
         case 'd':
             godaemon =3D 1;
             break;
+
+#ifdef WITH_IP
         case 'l':
             ipsock =3D 1;
             break;
+#endif /* ! WITH_IP */
=20
         case 't':
             if (virStrToLong_i(optarg, &tmp, 10, &timeout) !=3D 0
@@ -1332,10 +1356,13 @@ int main(int argc, char **argv) {
=20
     if (daemonSetupNetworking(srv, srvAdm,
                               config,
+#ifdef WITH_IP
+                              ipsock,
+                              privileged,
+#endif /* !WITH_IP */
                               sock_file,
                               sock_file_ro,
-                              sock_file_adm,
-                              ipsock, privileged) < 0) {
+                              sock_file_adm) < 0) {
         ret =3D VIR_DAEMON_ERR_NETWORK;
         goto cleanup;
     }
diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_c=
onfig.c
index 3e62b4203f..b74a1c242d 100644
--- a/src/remote/remote_daemon_config.c
+++ b/src/remote/remote_daemon_config.c
@@ -107,12 +107,14 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED)
     if (VIR_ALLOC(data) < 0)
         return NULL;
=20
+#ifdef WITH_IP
     data->listen_tls =3D 1;
     data->listen_tcp =3D 0;
=20
     if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 ||
         VIR_STRDUP(data->tcp_port, LIBVIRTD_TCP_PORT) < 0)
         goto error;
+#endif /* !WITH_IP */
=20
     /* Only default to PolicyKit if running as root */
 #if WITH_POLKIT
@@ -133,12 +135,14 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED)
         VIR_STRDUP(data->unix_sock_admin_perms, "0700") < 0)
         goto error;
=20
-#if WITH_SASL
+#ifdef WITH_IP
+# if WITH_SASL
     data->auth_tcp =3D REMOTE_AUTH_SASL;
-#else
+# else
     data->auth_tcp =3D REMOTE_AUTH_NONE;
-#endif
+# endif
     data->auth_tls =3D REMOTE_AUTH_NONE;
+#endif /* ! WITH_IP */
=20
     data->min_workers =3D 5;
     data->max_workers =3D 20;
@@ -182,9 +186,12 @@ daemonConfigFree(struct daemonConfig *data)
     if (!data)
         return;
=20
+#ifdef WITH_IP
     VIR_FREE(data->listen_addr);
     VIR_FREE(data->tls_port);
     VIR_FREE(data->tcp_port);
+#endif /* ! WITH_IP */
+
     tmp =3D data->access_drivers;
     while (tmp && *tmp) {
         VIR_FREE(*tmp);
@@ -198,25 +205,28 @@ daemonConfigFree(struct daemonConfig *data)
     VIR_FREE(data->unix_sock_group);
     VIR_FREE(data->unix_sock_dir);
=20
-    tmp =3D data->tls_allowed_dn_list;
+    tmp =3D data->sasl_allowed_username_list;
     while (tmp && *tmp) {
         VIR_FREE(*tmp);
         tmp++;
     }
-    VIR_FREE(data->tls_allowed_dn_list);
+    VIR_FREE(data->sasl_allowed_username_list);
=20
-    tmp =3D data->sasl_allowed_username_list;
+#ifdef WITH_IP
+    tmp =3D data->tls_allowed_dn_list;
     while (tmp && *tmp) {
         VIR_FREE(*tmp);
         tmp++;
     }
-    VIR_FREE(data->sasl_allowed_username_list);
+    VIR_FREE(data->tls_allowed_dn_list);
+
     VIR_FREE(data->tls_priority);
=20
     VIR_FREE(data->key_file);
     VIR_FREE(data->ca_file);
     VIR_FREE(data->cert_file);
     VIR_FREE(data->crl_file);
+#endif /* ! WITH_IP */
=20
     VIR_FREE(data->host_uuid);
     VIR_FREE(data->host_uuid_source);
@@ -231,6 +241,7 @@ daemonConfigLoadOptions(struct daemonConfig *data,
                         const char *filename,
                         virConfPtr conf)
 {
+#ifdef WITH_IP
     if (virConfGetValueBool(conf, "listen_tcp", &data->listen_tcp) < 0)
         goto error;
     if (virConfGetValueBool(conf, "listen_tls", &data->listen_tls) < 0)
@@ -241,6 +252,7 @@ daemonConfigLoadOptions(struct daemonConfig *data,
         goto error;
     if (virConfGetValueString(conf, "listen_addr", &data->listen_addr) < 0)
         goto error;
+#endif /* !WITH_IP */
=20
     if (remoteConfigGetAuth(conf, filename, "auth_unix_rw", &data->auth_un=
ix_rw) < 0)
         goto error;
@@ -256,10 +268,13 @@ daemonConfigLoadOptions(struct daemonConfig *data,
 #endif
     if (remoteConfigGetAuth(conf, filename, "auth_unix_ro", &data->auth_un=
ix_ro) < 0)
         goto error;
+
+#ifdef WITH_IP
     if (remoteConfigGetAuth(conf, filename, "auth_tcp", &data->auth_tcp) <=
 0)
         goto error;
     if (remoteConfigGetAuth(conf, filename, "auth_tls", &data->auth_tls) <=
 0)
         goto error;
+#endif /* ! WITH_IP */
=20
     if (virConfGetValueStringList(conf, "access_drivers", false,
                                   &data->access_drivers) < 0)
@@ -277,6 +292,7 @@ daemonConfigLoadOptions(struct daemonConfig *data,
     if (virConfGetValueString(conf, "unix_sock_dir", &data->unix_sock_dir)=
 < 0)
         goto error;
=20
+#ifdef WITH_IP
     if (virConfGetValueBool(conf, "tls_no_sanity_certificate", &data->tls_=
no_sanity_certificate) < 0)
         goto error;
     if (virConfGetValueBool(conf, "tls_no_verify_certificate", &data->tls_=
no_verify_certificate) < 0)
@@ -295,14 +311,14 @@ daemonConfigLoadOptions(struct daemonConfig *data,
                                   &data->tls_allowed_dn_list) < 0)
         goto error;
=20
+    if (virConfGetValueString(conf, "tls_priority", &data->tls_priority) <=
 0)
+        goto error;
+#endif /* ! WITH_IP */
=20
     if (virConfGetValueStringList(conf, "sasl_allowed_username_list", fals=
e,
                                   &data->sasl_allowed_username_list) < 0)
         goto error;
=20
-    if (virConfGetValueString(conf, "tls_priority", &data->tls_priority) <=
 0)
-        goto error;
-
     if (virConfGetValueUInt(conf, "min_workers", &data->min_workers) < 0)
         goto error;
     if (virConfGetValueUInt(conf, "max_workers", &data->max_workers) < 0)
diff --git a/src/remote/remote_daemon_config.h b/src/remote/remote_daemon_c=
onfig.h
index d580e7d49c..9cad9da734 100644
--- a/src/remote/remote_daemon_config.h
+++ b/src/remote/remote_daemon_config.h
@@ -27,11 +27,13 @@ struct daemonConfig {
     char *host_uuid;
     char *host_uuid_source;
=20
+#ifdef WITH_IP
     bool listen_tls;
     bool listen_tcp;
     char *listen_addr;
     char *tls_port;
     char *tcp_port;
+#endif /* ! WITH_IP */
=20
     char *unix_sock_admin_perms;
     char *unix_sock_ro_perms;
@@ -41,21 +43,27 @@ struct daemonConfig {
=20
     int auth_unix_rw;
     int auth_unix_ro;
+
+#ifdef WITH_IP
     int auth_tcp;
     int auth_tls;
+#endif /* ! WITH_IP */
=20
     char **access_drivers;
=20
+#ifdef WITH_IP
     bool tls_no_verify_certificate;
     bool tls_no_sanity_certificate;
     char **tls_allowed_dn_list;
-    char **sasl_allowed_username_list;
     char *tls_priority;
=20
     char *key_file;
     char *cert_file;
     char *ca_file;
     char *crl_file;
+#endif /* ! WITH_IP */
+
+    char **sasl_allowed_username_list;
=20
     unsigned int min_workers;
     unsigned int max_workers;
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277290; cv=none;
	d=zoho.com; s=zohoarc;
	b=kS+1OBPtKgfdinyEkbjKsxMrUmpyFJt53weAsqTfXIo0gg4IAPzZ2VDn4RtUdeglAfO06rrTG+xVxXYMYiMntcDt4BE4IFjRkG/C5LKVFpecW3wpq6kMjwFPciPzR2VqiWB3aHiw4wvfU6LKLTzr/nhdKpd5islWHkCPkOViDBg=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277290;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=vH+Ztzqa3idnE88cVj5mXpz0vSdzRMJ4t0x+PEb+9Mg=;
	b=iNFyJnPIJSTfZSlxScegATmt+Wnsy+wp5lZlDcdgJR9Kc2KOi4M8omI7I18EoFYCvxrrMEWQi3zhjaWCQ22h54ViFS67KpHpm0vmf8xX8TS/t7G9ZpHA0PFZbmNB0hHA7nB5AVfrjgmw76Yrlx3z46KAeZ6oqqqrIzTOdbIo8LM=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277290962718.7432141861898;
 Thu, 8 Aug 2019 08:14:50 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 2DAA15FD40;
	Thu,  8 Aug 2019 15:14:49 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id F2570600C8;
	Thu,  8 Aug 2019 15:14:48 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id ABE5A1803B56;
	Thu,  8 Aug 2019 15:14:48 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBCqr027399 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:12 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id BA28810016F3; Thu,  8 Aug 2019 15:11:12 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 719D91001948;
	Thu,  8 Aug 2019 15:11:11 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:12 +0100
Message-Id: <20190808151044.11385-11-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 10/42] build: use @CONFIG@ instead of
	::CONFIG:: in augeas tests
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]);
 Thu, 08 Aug 2019 15:14:50 +0000 (UTC)

Using @VARNAME@ is a normal style of automake, so lets match that.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 build-aux/augeas-gentest.pl             | 2 +-
 src/bhyve/test_libvirtd_bhyve.aug.in    | 2 +-
 src/libxl/test_libvirtd_libxl.aug.in    | 2 +-
 src/locking/test_libvirt_lockd.aug.in   | 2 +-
 src/locking/test_libvirt_sanlock.aug.in | 2 +-
 src/locking/test_virtlockd.aug.in       | 2 +-
 src/logging/test_virtlogd.aug.in        | 2 +-
 src/lxc/test_libvirtd_lxc.aug.in        | 2 +-
 src/qemu/test_libvirtd_qemu.aug.in      | 2 +-
 src/remote/test_libvirtd.aug.in         | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build-aux/augeas-gentest.pl b/build-aux/augeas-gentest.pl
index faf2fd593e..65834b533b 100755
--- a/build-aux/augeas-gentest.pl
+++ b/build-aux/augeas-gentest.pl
@@ -30,7 +30,7 @@ open TEMPLATE, "<", $template or die "cannot read $templa=
te: $!";
=20
 my $group =3D 0;
 while (<TEMPLATE>) {
-    if (/::CONFIG::/) {
+    if (/\@CONFIG\@/) {
         my $group =3D 0;
         print "  let conf =3D \"";
         while (<CONFIG>) {
diff --git a/src/bhyve/test_libvirtd_bhyve.aug.in b/src/bhyve/test_libvirtd=
_bhyve.aug.in
index f28e58614d..ec932b4b11 100644
--- a/src/bhyve/test_libvirtd_bhyve.aug.in
+++ b/src/bhyve/test_libvirtd_bhyve.aug.in
@@ -1,5 +1,5 @@
 module Test_libvirtd_bhyve =3D
-  ::CONFIG::
+  @CONFIG@
=20
   test Libvirtd_bhyve.lns get conf =3D
 { "firmware_dir" =3D "/usr/local/share/uefi-firmware" }
diff --git a/src/libxl/test_libvirtd_libxl.aug.in b/src/libxl/test_libvirtd=
_libxl.aug.in
index 372a43f94a..ac37de67eb 100644
--- a/src/libxl/test_libvirtd_libxl.aug.in
+++ b/src/libxl/test_libvirtd_libxl.aug.in
@@ -1,5 +1,5 @@
 module Test_libvirtd_libxl =3D
-  ::CONFIG::
+  @CONFIG@
=20
    test Libvirtd_libxl.lns get conf =3D
 { "autoballoon" =3D "1" }
diff --git a/src/locking/test_libvirt_lockd.aug.in b/src/locking/test_libvi=
rt_lockd.aug.in
index 52b37541cb..0f3b57eb34 100644
--- a/src/locking/test_libvirt_lockd.aug.in
+++ b/src/locking/test_libvirt_lockd.aug.in
@@ -1,5 +1,5 @@
 module Test_libvirt_lockd =3D
-  ::CONFIG::
+  @CONFIG@
=20
    test Libvirt_lockd.lns get conf =3D
 { "auto_disk_leases" =3D "0" }
diff --git a/src/locking/test_libvirt_sanlock.aug.in b/src/locking/test_lib=
virt_sanlock.aug.in
index 7f66f8192b..5eabb6726d 100644
--- a/src/locking/test_libvirt_sanlock.aug.in
+++ b/src/locking/test_libvirt_sanlock.aug.in
@@ -1,5 +1,5 @@
 module Test_libvirt_sanlock =3D
-  ::CONFIG::
+  @CONFIG@
=20
    test Libvirt_sanlock.lns get conf =3D
 { "auto_disk_leases" =3D "1" }
diff --git a/src/locking/test_virtlockd.aug.in b/src/locking/test_virtlockd=
.aug.in
index f2f6979ef5..fad0c418b9 100644
--- a/src/locking/test_virtlockd.aug.in
+++ b/src/locking/test_virtlockd.aug.in
@@ -1,5 +1,5 @@
 module Test_virtlockd =3D
-   ::CONFIG::
+   @CONFIG@
=20
    test Virtlockd.lns get conf =3D
         { "log_level" =3D "3" }
diff --git a/src/logging/test_virtlogd.aug.in b/src/logging/test_virtlogd.a=
ug.in
index a29e7e3730..cd5b0d91f8 100644
--- a/src/logging/test_virtlogd.aug.in
+++ b/src/logging/test_virtlogd.aug.in
@@ -1,5 +1,5 @@
 module Test_virtlogd =3D
-   ::CONFIG::
+   @CONFIG@
=20
    test Virtlogd.lns get conf =3D
         { "log_level" =3D "3" }
diff --git a/src/lxc/test_libvirtd_lxc.aug.in b/src/lxc/test_libvirtd_lxc.a=
ug.in
index 3eb25aa292..68db2e1c86 100644
--- a/src/lxc/test_libvirtd_lxc.aug.in
+++ b/src/lxc/test_libvirtd_lxc.aug.in
@@ -1,5 +1,5 @@
 module Test_libvirtd_lxc =3D
-  ::CONFIG::
+  @CONFIG@
=20
    test Libvirtd_lxc.lns get conf =3D
 { "log_with_libvirtd" =3D "1" }
diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qe=
mu.aug.in
index b3b44d42d9..9f81759cb5 100644
--- a/src/qemu/test_libvirtd_qemu.aug.in
+++ b/src/qemu/test_libvirtd_qemu.aug.in
@@ -1,5 +1,5 @@
 module Test_libvirtd_qemu =3D
-  ::CONFIG::
+  @CONFIG@
=20
    test Libvirtd_qemu.lns get conf =3D
 { "default_tls_x509_cert_dir" =3D "/etc/pki/qemu" }
diff --git a/src/remote/test_libvirtd.aug.in b/src/remote/test_libvirtd.aug=
.in
index ad6450a569..6c51b7b9e7 100644
--- a/src/remote/test_libvirtd.aug.in
+++ b/src/remote/test_libvirtd.aug.in
@@ -1,5 +1,5 @@
 module Test_libvirtd =3D
-   ::CONFIG::
+   @CONFIG@
=20
    test Libvirtd.lns get conf =3D
         { "listen_tls" =3D "0" }
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277213; cv=none;
	d=zoho.com; s=zohoarc;
	b=YKIXjoycmrHjdU7u8925ZYJW1WPi84Kk9l6Gd0SNZZ8cZVy3FE/uoGQpKzTN35p5Ab2zhGeP55ziuiBwyEFAm/DF1/pVIX7Inoop79Rm0ZqqkVCMoMxPzs1aq6EcAr3+iqQjQPwT994Ygo2DdLj5ai5Iu7Asfp4Nw+oEmeAMs8c=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277213;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=w9RyJbtDxgnTKdA6+53fLy/H/2bdY/7MT7n5GjmzPqo=;
	b=Wj1Bpw4f+UTIoZ12ATXd5b8/x/pUlLcBsXUsXo3zDtZfAj5y+CZJnKl4zR6hmIxYyYfiXPYiQb4p2Gxp7YP0B5K0EOtPx+U7iTqJiL7gSbmALn/jGb9niY9PxkPgXZ/mBOEH7gNNP+CWXJjF8udJF684rbgeOBtfusVsECtMdt8=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277213239602.475326418438;
 Thu, 8 Aug 2019 08:13:33 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com
 [10.5.11.14])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id E7FB830C746E;
	Thu,  8 Aug 2019 15:13:31 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id BA3F85D9DC;
	Thu,  8 Aug 2019 15:13:31 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6739E1806B00;
	Thu,  8 Aug 2019 15:13:31 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBEit027409 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:14 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 944821001955; Thu,  8 Aug 2019 15:11:14 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 1B2641001284;
	Thu,  8 Aug 2019 15:11:12 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:13 +0100
Message-Id: <20190808151044.11385-12-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Christophe de Dinechin <dinechin@redhat.com>,
	Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 11/42] remote: conditionalize IP socket config
	in libvirtd.conf
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]);
 Thu, 08 Aug 2019 15:13:32 +0000 (UTC)

Prepare for reusing libvirtd config to create other daemons by making
the config parameters for IP sockets conditionally defined by the make
rules.

The main libvirtd daemon will retain IP listen ability, but all the
driver specific daemons will be local UNIX sockets only. Apps needing
IP connectivity will connect via the libvirtd daemon which will proxy
to the driver specfic daemon.

Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                                    |  1 +
 src/remote/Makefile.inc.am                    | 16 +++++--
 .../{libvirtd.conf =3D> libvirtd.conf.in}       | 42 +++++++++++--------
 src/remote/test_libvirtd.aug.in               |  2 +-
 4 files changed, 40 insertions(+), 21 deletions(-)
 rename src/remote/{libvirtd.conf =3D> libvirtd.conf.in} (95%)

diff --git a/.gitignore b/.gitignore
index 0780546914..7d24dc3f5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -158,6 +158,7 @@
 /src/remote/*_client_bodies.h
 /src/remote/*_protocol.[ch]
 /src/remote/*_stubs.h
+/src/remote/libvirtd.conf
 /src/remote/test_libvirtd.aug
 /src/rpc/virkeepaliveprotocol.[ch]
 /src/rpc/virnetprotocol.[ch]
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index a77b59a171..d7e614c476 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -76,7 +76,7 @@ EXTRA_DIST +=3D \
 	$(LIBVIRTD_SOURCES) \
 	remote/test_libvirtd.aug.in \
 	remote/libvirtd.aug \
-	remote/libvirtd.conf \
+	remote/libvirtd.conf.in \
 	remote/libvirtd.policy \
 	remote/libvirtd.rules \
 	remote/libvirtd.sasl \
@@ -93,6 +93,9 @@ MAINTAINERCLEANFILES +=3D \
 	$(REMOTE_DRIVER_GENERATED) \
 	$(LIBVIRTD_GENERATED) \
 	$(NULL)
+CLEANFILES +=3D \
+	remote/libvirtd.conf \
+	$(NULL)
=20
 if WITH_REMOTE
 noinst_LTLIBRARIES +=3D libvirt_driver_remote.la
@@ -128,7 +131,7 @@ augeas_DATA +=3D remote/libvirtd.aug
=20
 augeastest_DATA +=3D remote/test_libvirtd.aug
=20
-conf_DATA +=3D remote/libvirtd.conf
+nodist_conf_DATA +=3D remote/libvirtd.conf
=20
 man8_MANS +=3D libvirtd.8
=20
@@ -179,6 +182,13 @@ libvirtd_LDADD +=3D \
 	$(LIBSOCKET) \
 	$(NULL)
=20
+remote/libvirtd.conf: remote/libvirtd.conf.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/d' \
+		-e '/[@]END[@]/d' \
+		-e 's|[@]DAEMON_NAME[@]|libvirtd|' \
+		$< > $@
+
 INSTALL_DATA_DIRS +=3D remote
=20
 install-data-remote:
@@ -189,7 +199,7 @@ uninstall-data-remote:
=20
 remote/test_libvirtd.aug: remote/test_libvirtd.aug.in \
 		remote/libvirtd.conf $(AUG_GENTEST)
-	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/remote/libvirtd.conf $< > $@
+	$(AM_V_GEN)$(AUG_GENTEST) remote/libvirtd.conf $< > $@
=20
 if WITH_SYSCTL
 # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
diff --git a/src/remote/libvirtd.conf b/src/remote/libvirtd.conf.in
similarity index 95%
rename from src/remote/libvirtd.conf
rename to src/remote/libvirtd.conf.in
index b63b8d61b7..e351a8c190 100644
--- a/src/remote/libvirtd.conf
+++ b/src/remote/libvirtd.conf.in
@@ -1,13 +1,14 @@
 # Master libvirt daemon configuration file
 #
=20
+@CUT_ENABLE_IP@
 #################################################################
 #
 # Network connectivity controls
 #
=20
 # Flag listening for secure TLS connections on the public TCP/IP port.
-# NB, must pass the --listen flag to the libvirtd process for this to
+# NB, must pass the --listen flag to the @DAEMON_NAME@ process for this to
 # have any effect.
 #
 # This setting is not required or honoured if using systemd socket
@@ -20,7 +21,7 @@
 #listen_tls =3D 0
=20
 # Listen for unencrypted TCP connections on the public TCP/IP port.
-# NB, must pass the --listen flag to the libvirtd process for this to
+# NB, must pass the --listen flag to the @DAEMON_NAME@ process for this to
 # have any effect.
 #
 # This setting is not required or honoured if using systemd socket
@@ -58,13 +59,14 @@
 # This setting is not required or honoured if using systemd socket
 # activation.
 #
-# If the libvirtd service is started in parallel with network
+# If the @DAEMON_NAME@ service is started in parallel with network
 # startup (e.g. with systemd), binding to addresses other than
 # the wildcards (0.0.0.0/::) might not be available yet.
 #
 #listen_addr =3D "192.168.0.1"
=20
=20
+@END@
 #################################################################
 #
 # UNIX socket access controls
@@ -157,6 +159,7 @@
 # If the unix_sock_rw_perms are changed you may wish to enable
 # an authentication mechanism here
 #auth_unix_rw =3D "none"
+@CUT_ENABLE_IP@
=20
 # Change the authentication scheme for TCP sockets.
 #
@@ -174,6 +177,7 @@
 # It is possible to make use of any SASL authentication
 # mechanism as well, by using 'sasl' for this option
 #auth_tls =3D "none"
+@END@
=20
=20
 # Change the API access control scheme
@@ -182,10 +186,11 @@
 # to all APIs. Access drivers can place restrictions
 # on this. By default the 'nop' driver is enabled,
 # meaning no access control checks are done once a
-# client has authenticated with libvirtd
+# client has authenticated with @DAEMON_NAME@
 #
 #access_drivers =3D [ "polkit" ]
=20
+@CUT_ENABLE_IP@
 #################################################################
 #
 # TLS x509 certificate configuration
@@ -225,15 +230,17 @@
=20
=20
=20
+@END@
 #################################################################
 #
 # Authorization controls
 #
=20
=20
+@CUT_ENABLE_IP@
 # Flag to disable verification of our own server certificates
 #
-# When libvirtd starts it performs some sanity checks against
+# When @DAEMON_NAME@ starts it performs some sanity checks against
 # its own certificates.
 #
 # Default is to always run sanity checks. Uncommenting this
@@ -265,6 +272,15 @@
 #tls_allowed_dn_list =3D ["DN1", "DN2"]
=20
=20
+# Override the compile time default TLS priority string. The
+# default is usually "NORMAL" unless overridden at build time.
+# Only set this is it is desired for libvirt to deviate from
+# the global default settings.
+#
+#tls_priority=3D"NORMAL"
+
+
+@END@
 # A whitelist of allowed SASL usernames. The format for username
 # depends on the SASL authentication mechanism. Kerberos usernames
 # look like username@REALM
@@ -282,14 +298,6 @@
 #sasl_allowed_username_list =3D ["joe@EXAMPLE.COM", "fred@EXAMPLE.COM" ]
=20
=20
-# Override the compile time default TLS priority string. The
-# default is usually "NORMAL" unless overridden at build time.
-# Only set this is it is desired for libvirt to deviate from
-# the global default settings.
-#
-#tls_priority=3D"NORMAL"
-
-
 #################################################################
 #
 # Processing controls
@@ -417,8 +425,8 @@
 #    4: ERROR
 #
 # Multiple outputs can be defined, they just need to be separated by space=
s.
-# e.g. to log all warnings and errors to syslog under the libvirtd ident:
-#log_outputs=3D"3:syslog:libvirtd"
+# e.g. to log all warnings and errors to syslog under the @DAEMON_NAME@ id=
ent:
+#log_outputs=3D"3:syslog:@DAEMON_NAME@"
=20
=20
 ##################################################################
@@ -461,7 +469,7 @@
=20
 ###################################################################
 # Keepalive protocol:
-# This allows libvirtd to detect broken client connections or even
+# This allows @DAEMON_NAME@ to detect broken client connections or even
 # dead clients.  A keepalive message is sent to a client after
 # keepalive_interval seconds of inactivity to check if the client is
 # still responding; keepalive_count is a maximum number of keepalive
@@ -470,7 +478,7 @@
 # words, the connection is automatically closed approximately after
 # keepalive_interval * (keepalive_count + 1) seconds since the last
 # message received from the client.  If keepalive_interval is set to
-# -1, libvirtd will never send keepalive requests; however clients
+# -1, @DAEMON_NAME@ will never send keepalive requests; however clients
 # can still send them and the daemon will send responses.  When
 # keepalive_count is set to 0, connections will be automatically
 # closed after keepalive_interval seconds of inactivity without
diff --git a/src/remote/test_libvirtd.aug.in b/src/remote/test_libvirtd.aug=
.in
index 6c51b7b9e7..d768b30b55 100644
--- a/src/remote/test_libvirtd.aug.in
+++ b/src/remote/test_libvirtd.aug.in
@@ -29,11 +29,11 @@ module Test_libvirtd =3D
              { "1" =3D "DN1"}
              { "2" =3D "DN2"}
         }
+        { "tls_priority" =3D "NORMAL" }
         { "sasl_allowed_username_list"
              { "1" =3D "joe@EXAMPLE.COM" }
              { "2" =3D "fred@EXAMPLE.COM" }
         }
-        { "tls_priority" =3D "NORMAL" }
         { "max_clients" =3D "5000" }
         { "max_queued_clients" =3D "1000" }
         { "max_anonymous_clients" =3D "20" }
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277217; cv=none;
	d=zoho.com; s=zohoarc;
	b=dXixwYsuwy/GwUa02ENWfjJnG3rM+7yoNyHGBB4gD8btvaJDybgAJj0Op/U9JLRFg/oh6ut/OlmAuaFwo0DSnpQILu7P78M/BrmiYDMWGwhOZjmJb29E4SlJL7qMSOYopYtVojPDl1pIFSt2Y6faIV6nPtd6y91ada4/yL01XKI=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277217;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=zrFwF0VES6zWOXQT8GI3HqR/2S/FoApBul1j8HzRme0=;
	b=O+EVO4zUgPjy0fWYpDrmO1g6QceSjqXrM02FDtb1ACprooESvb1rIyWEXJ4ZHZk1YbIcUiqYtECZJIFjPRfff5a6pvgr3puP1qwTUtDYlumoccql+5pusZwSde73vG+HAQZj/3n/W09CKbN2FpOJS4IyrvWTCO84imvi0ynp7DQ=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277217624147.75524867897468;
 Thu, 8 Aug 2019 08:13:37 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com
 [10.5.11.15])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id B3AE719D381;
	Thu,  8 Aug 2019 15:13:35 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 8448C5EE1D;
	Thu,  8 Aug 2019 15:13:35 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 42D111800B74;
	Thu,  8 Aug 2019 15:13:35 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBGqS027419 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:16 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 3E6CC10016F3; Thu,  8 Aug 2019 15:11:16 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 41999100194E;
	Thu,  8 Aug 2019 15:11:14 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:14 +0100
Message-Id: <20190808151044.11385-13-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 12/42] remote: conditionalize IP socket config
	in augeas definitions
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]);
 Thu, 08 Aug 2019 15:13:36 +0000 (UTC)

Prepare for reusing libvirtd augeas defintions with other daemons by
making the config parameters for IP sockets conditionally defined by
the make rules.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                                   |  1 +
 src/remote/Makefile.inc.am                   | 21 ++++++++++++++--
 src/remote/{libvirtd.aug =3D> libvirtd.aug.in} | 26 +++++++++++++-------
 src/remote/test_libvirtd.aug.in              | 12 ++++++---
 4 files changed, 46 insertions(+), 14 deletions(-)
 rename src/remote/{libvirtd.aug =3D> libvirtd.aug.in} (89%)

diff --git a/.gitignore b/.gitignore
index 7d24dc3f5a..35dc2c8bec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -158,6 +158,7 @@
 /src/remote/*_client_bodies.h
 /src/remote/*_protocol.[ch]
 /src/remote/*_stubs.h
+/src/remote/libvirtd.aug
 /src/remote/libvirtd.conf
 /src/remote/test_libvirtd.aug
 /src/rpc/virkeepaliveprotocol.[ch]
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index d7e614c476..314b90885f 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -75,7 +75,7 @@ EXTRA_DIST +=3D \
 	$(REMOTE_DRIVER_SOURCES) \
 	$(LIBVIRTD_SOURCES) \
 	remote/test_libvirtd.aug.in \
-	remote/libvirtd.aug \
+	remote/libvirtd.aug.in \
 	remote/libvirtd.conf.in \
 	remote/libvirtd.policy \
 	remote/libvirtd.rules \
@@ -133,6 +133,8 @@ augeastest_DATA +=3D remote/test_libvirtd.aug
=20
 nodist_conf_DATA +=3D remote/libvirtd.conf
=20
+CLEANFILES +=3D remote/libvirtd.aug
+
 man8_MANS +=3D libvirtd.8
=20
 libvirtd_SOURCES =3D $(LIBVIRTD_SOURCES)
@@ -197,9 +199,24 @@ install-data-remote:
 uninstall-data-remote:
 	rmdir "$(DESTDIR)$(localstatedir)/log/libvirt" ||:
=20
+remote/libvirtd.aug: remote/libvirtd.aug.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/d' \
+		-e '/[@]END[@]/d' \
+		-e 's|[@]DAEMON_NAME[@]|libvirtd|' \
+		-e 's|[@]DAEMON_NAME_UC[@]|Libvirtd|' \
+		$< > $@
+
 remote/test_libvirtd.aug: remote/test_libvirtd.aug.in \
 		remote/libvirtd.conf $(AUG_GENTEST)
-	$(AM_V_GEN)$(AUG_GENTEST) remote/libvirtd.conf $< > $@
+	$(AM_V_GEN)$(AUG_GENTEST) remote/libvirtd.conf \
+		$(srcdir)/remote/test_libvirtd.aug.in | \
+		$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/d' \
+		-e '/[@]END[@]/d' \
+		-e 's|[@]DAEMON_NAME[@]|libvirtd|' \
+		-e 's|[@]DAEMON_NAME_UC[@]|Libvirtd|' \
+		> $@ || rm -f $@
=20
 if WITH_SYSCTL
 # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
diff --git a/src/remote/libvirtd.aug b/src/remote/libvirtd.aug.in
similarity index 89%
rename from src/remote/libvirtd.aug
rename to src/remote/libvirtd.aug.in
index 0188c23dd7..eec3433f29 100644
--- a/src/remote/libvirtd.aug
+++ b/src/remote/libvirtd.aug.in
@@ -1,6 +1,6 @@
-(* /etc/libvirt/libvirtd.conf *)
+(* /etc/libvirt/@DAEMON_NAME@.conf *)
=20
-module Libvirtd =3D
+module @DAEMON_NAME_UC@ =3D
    autoload xfm
=20
    let eol   =3D del /[ \t]*\n/ "\n"
@@ -24,11 +24,13 @@ module Libvirtd =3D
=20
=20
    (* Config entry grouped by function - same order as example config *)
+@CUT_ENABLE_IP@
    let network_entry =3D bool_entry "listen_tls"
                      | bool_entry "listen_tcp"
                      | str_entry "tls_port"
                      | str_entry "tcp_port"
                      | str_entry "listen_addr"
+@END@
=20
    let sock_acl_entry =3D str_entry "unix_sock_group"
                       | str_entry "unix_sock_ro_perms"
@@ -38,6 +40,7 @@ module Libvirtd =3D
=20
    let authentication_entry =3D str_entry "auth_unix_ro"
                             | str_entry "auth_unix_rw"
+@CUT_ENABLE_IP@
                             | str_entry "auth_tcp"
                             | str_entry "auth_tls"
=20
@@ -46,12 +49,14 @@ module Libvirtd =3D
                          | str_entry "ca_file"
                          | str_entry "crl_file"
=20
-   let authorization_entry =3D bool_entry "tls_no_verify_certificate"
+   let tls_authorization_entry =3D bool_entry "tls_no_verify_certificate"
                            | bool_entry "tls_no_sanity_certificate"
                            | str_array_entry "tls_allowed_dn_list"
-                           | str_array_entry "sasl_allowed_username_list"
-                           | str_array_entry "access_drivers"
                            | str_entry "tls_priority"
+@END@
+
+   let misc_authorization_entry =3D str_array_entry "sasl_allowed_username=
_list"
+                           | str_array_entry "access_drivers"
=20
    let processing_entry =3D int_entry "min_workers"
                         | int_entry "max_workers"
@@ -87,11 +92,14 @@ module Libvirtd =3D
                   | int_entry "ovs_timeout"
=20
    (* Each enty in the config is one of the following three ... *)
-   let entry =3D network_entry
-             | sock_acl_entry
+   let entry =3D sock_acl_entry
              | authentication_entry
+@CUT_ENABLE_IP@
+             | network_entry
              | certificate_entry
-             | authorization_entry
+             | tls_authorization_entry
+@END@
+             | misc_authorization_entry
              | processing_entry
              | admin_processing_entry
              | logging_entry
@@ -106,7 +114,7 @@ module Libvirtd =3D
=20
    let lns =3D ( record | comment | empty ) *
=20
-   let filter =3D incl "/etc/libvirt/libvirtd.conf"
+   let filter =3D incl "/etc/libvirt/@DAEMON_NAME@.conf"
               . Util.stdexcl
=20
    let xfm =3D transform lns filter
diff --git a/src/remote/test_libvirtd.aug.in b/src/remote/test_libvirtd.aug=
.in
index d768b30b55..2fd809af4a 100644
--- a/src/remote/test_libvirtd.aug.in
+++ b/src/remote/test_libvirtd.aug.in
@@ -1,12 +1,14 @@
-module Test_libvirtd =3D
+module Test_@DAEMON_NAME@ =3D
    @CONFIG@
=20
-   test Libvirtd.lns get conf =3D
+   test @DAEMON_NAME_UC@.lns get conf =3D
+@CUT_ENABLE_IP@
         { "listen_tls" =3D "0" }
         { "listen_tcp" =3D "1" }
         { "tls_port" =3D "16514" }
         { "tcp_port" =3D "16509" }
         { "listen_addr" =3D "192.168.0.1" }
+@END@
         { "unix_sock_group" =3D "libvirt" }
         { "unix_sock_ro_perms" =3D "0777" }
         { "unix_sock_rw_perms" =3D "0770" }
@@ -14,11 +16,14 @@ module Test_libvirtd =3D
         { "unix_sock_dir" =3D "/var/run/libvirt" }
         { "auth_unix_ro" =3D "none" }
         { "auth_unix_rw" =3D "none" }
+@CUT_ENABLE_IP@
         { "auth_tcp" =3D "sasl" }
         { "auth_tls" =3D "none" }
+@END@
         { "access_drivers"
              { "1" =3D "polkit" }
         }
+@CUT_ENABLE_IP@
         { "key_file" =3D "/etc/pki/libvirt/private/serverkey.pem" }
         { "cert_file" =3D "/etc/pki/libvirt/servercert.pem" }
         { "ca_file" =3D "/etc/pki/CA/cacert.pem" }
@@ -30,6 +35,7 @@ module Test_libvirtd =3D
              { "2" =3D "DN2"}
         }
         { "tls_priority" =3D "NORMAL" }
+@END@
         { "sasl_allowed_username_list"
              { "1" =3D "joe@EXAMPLE.COM" }
              { "2" =3D "fred@EXAMPLE.COM" }
@@ -48,7 +54,7 @@ module Test_libvirtd =3D
         { "admin_max_client_requests" =3D "5" }
         { "log_level" =3D "3" }
         { "log_filters" =3D "1:qemu 1:libvirt 4:object 4:json 4:event 1:ut=
il" }
-        { "log_outputs" =3D "3:syslog:libvirtd" }
+        { "log_outputs" =3D "3:syslog:@DAEMON_NAME@" }
         { "audit_level" =3D "2" }
         { "audit_logging" =3D "1" }
         { "host_uuid" =3D "00000000-0000-0000-0000-000000000000" }
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277237; cv=none;
	d=zoho.com; s=zohoarc;
	b=HRWy4S85PvZ+45VqjEpAEZP9hxznN7eBsYbrgDc9bZHNARALlekpvTBrJMq+B2GsFfrmCnfHCyeEjM28yAYEdXMJEZagUqkWtyFxlcKWVB0DOCTplg+fn95Q7TVGYK/BaypszAgISI1tDfLKxZrNIvy3rO6hYzSf2Lqg/YGn/iw=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277237;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=SFzK9/jn4briMcSWrUdtM54qALEZz8p78sfmWEdaw90=;
	b=CqL12Z3b8eA8UBLO4EFMfBTPCPNqllVSysv4pUMuJ7pGZXeagIuXWqSIdRnY/uyzSwcbygNFha1x9ywmReJxkGAro/GZe+eMb7BxHQXpqtHz61zwOYzxPaPMl5N8zwKqq23vRONr1GmWyG8phMRrVSyUMvHZTsPgRAjQApVxd/4=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277237600724.0977842051542;
 Thu, 8 Aug 2019 08:13:57 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com
 [10.5.11.15])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 66EF830A00D8;
	Thu,  8 Aug 2019 15:13:56 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 3DEA45B69A;
	Thu,  8 Aug 2019 15:13:56 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id EECB8180BAB9;
	Thu,  8 Aug 2019 15:13:55 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBINa027430 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:18 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 5F8341001955; Thu,  8 Aug 2019 15:11:18 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id D2052100194E;
	Thu,  8 Aug 2019 15:11:16 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:15 +0100
Message-Id: <20190808151044.11385-14-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 13/42] remote: remove useless $(LIBSOCKET)
	variable
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]);
 Thu, 08 Aug 2019 15:13:57 +0000 (UTC)

GNULIB sets $(LIBSOCKET) on mingw to pull in the windows socket
APIs. This is trivially not required, since we don't build libvirtd
on mingw.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/Makefile.inc.am | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 314b90885f..923bc15cd5 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -181,7 +181,6 @@ endif WITH_DTRACE_PROBES
=20
 libvirtd_LDADD +=3D \
 	../gnulib/lib/libgnu.la \
-	$(LIBSOCKET) \
 	$(NULL)
=20
 remote/libvirtd.conf: remote/libvirtd.conf.in
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277241; cv=none;
	d=zoho.com; s=zohoarc;
	b=UbA43+589MR/7p8cMlgNroBHxQ9yw36RJ/dwSFFVRFqGFTBVMImYlk9aqpftacTfyUJBhNA4a7MKTZSxduFJ2C8adJwPKzdOxjo+a7JaXtVLMt/gUxh76aQp9jwznYTTDxKvOtjtnaO/K7n31jAgHL4ak/Xohd6sQInEzv9n6T0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277241;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=2ciKuGvOFGdpw1ETT4nOM8ptgZVuGm83QILBOou8+PI=;
	b=bPhUeCRG4CMaTn1P3bQcT64ZXilNrb+2rGD+nL1qvXeces1+nIxyi/9SpLWl/CVL4IG/dIWzNm8qqtDwZMaVuIBJbds4nT5uarxXF1cfwqrBR49XhMFMbNQX9CLVKTM2KqAUBFwUJNrfdRIxrjhhjwyP5w0rmh5U7QT/1MpjZSs=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277241778673.6371303936772;
 Thu, 8 Aug 2019 08:14:01 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com
 [10.5.11.15])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id E32116404F;
	Thu,  8 Aug 2019 15:13:59 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id BD4D761F27;
	Thu,  8 Aug 2019 15:13:59 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 78B181806134;
	Thu,  8 Aug 2019 15:13:59 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBJtI027440 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:19 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id AF71E100194E; Thu,  8 Aug 2019 15:11:19 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id CC8FB10002B9;
	Thu,  8 Aug 2019 15:11:18 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:16 +0100
Message-Id: <20190808151044.11385-15-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 14/42] remote: refactor & rename variables for
	building libvirtd
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]);
 Thu, 08 Aug 2019 15:14:01 +0000 (UTC)

The same make variables will be useful for building both libvirtd and
the split daemons, so refactor & rename variables to facilitate reuse.

Automake gets annoyed if you define a variable ending LDFLAGS:

src/remote/Makefile.inc.am:53: warning: variable 'REMOTE_DAEMON_LDFLAGS' is=
 defined but no program or
src/remote/Makefile.inc.am:53: library has 'REMOTE_DAEMON' as canonical nam=
e (possible typo)

So we trick it by using an LD_FLAGS or LD_ADD suffix instead.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/Makefile.inc.am | 93 ++++++++++++++++++++------------------
 1 file changed, 50 insertions(+), 43 deletions(-)

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 923bc15cd5..9d0adb6d8c 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -18,13 +18,13 @@ REMOTE_DRIVER_SOURCES =3D \
 	$(REMOTE_DRIVER_GENERATED) \
 	$(NULL)
=20
-LIBVIRTD_GENERATED =3D \
+REMOTE_DAEMON_GENERATED =3D \
 	remote/remote_daemon_dispatch_stubs.h \
 	remote/remote_daemon_dispatch_lxc_stubs.h \
 	remote/remote_daemon_dispatch_qemu_stubs.h \
 	$(NULL)
=20
-LIBVIRTD_SOURCES =3D \
+REMOTE_DAEMON_SOURCES =3D \
 	remote/remote_daemon.c \
 	remote/remote_daemon.h \
 	remote/remote_daemon_config.c \
@@ -33,9 +33,49 @@ LIBVIRTD_SOURCES =3D \
 	remote/remote_daemon_dispatch.h \
 	remote/remote_daemon_stream.c \
 	remote/remote_daemon_stream.h \
-	$(LIBVIRTD_GENERATED) \
+	$(REMOTE_DAEMON_GENERATED) \
 	$(NULL)
=20
+REMOTE_DAEMON_CFLAGS =3D \
+	$(LIBXML_CFLAGS) \
+	$(GNUTLS_CFLAGS) \
+	$(SASL_CFLAGS) \
+	$(XDR_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(LIBNL_CFLAGS) \
+	$(WARN_CFLAGS) \
+	$(PIE_CFLAGS) \
+	-I$(srcdir)/access \
+	-I$(srcdir)/conf \
+	-I$(srcdir)/rpc \
+	$(NULL)
+
+REMOTE_DAEMON_LD_FLAGS =3D \
+	$(RELRO_LDFLAGS) \
+	$(PIE_LDFLAGS) \
+	$(NO_INDIRECT_LDFLAGS) \
+	$(NO_UNDEFINED_LDFLAGS) \
+	$(NULL)
+
+REMOTE_DAEMON_LD_ADD =3D \
+	libvirt_driver_admin.la \
+	libvirt-lxc.la \
+	libvirt-qemu.la \
+	libvirt.la \
+	$(LIBXML_LIBS) \
+	$(GNUTLS_LIBS) \
+	$(SASL_LIBS) \
+	$(DBUS_LIBS) \
+	$(LIBNL_LIBS) \
+	$(NULL)
+
+if WITH_DTRACE_PROBES
+REMOTE_DAEMON_LD_ADD +=3D ../src/libvirt_probes.lo
+endif WITH_DTRACE_PROBES
+
+REMOTE_DAEMON_LD_ADD +=3D \
+	../gnulib/lib/libgnu.la \
+	$(NULL)
=20
 LOGROTATE_FILES_IN +=3D \
 	remote/libvirtd.qemu.logrotate.in \
@@ -73,7 +113,7 @@ DRIVER_SOURCE_FILES +=3D $(REMOTE_DRIVER_SOURCES)
 EXTRA_DIST +=3D \
 	$(REMOTE_DRIVER_PROTOCOL) \
 	$(REMOTE_DRIVER_SOURCES) \
-	$(LIBVIRTD_SOURCES) \
+	$(REMOTE_DAEMON_SOURCES) \
 	remote/test_libvirtd.aug.in \
 	remote/libvirtd.aug.in \
 	remote/libvirtd.conf.in \
@@ -87,11 +127,11 @@ EXTRA_DIST +=3D \
 # the WITH_REMOTE/WITH_LIBVIRTD conditionals
 BUILT_SOURCES +=3D \
 	$(REMOTE_DRIVER_GENERATED) \
-	$(LIBVIRTD_GENERATED) \
+	$(REMOTE_DAEMON_GENERATED) \
 	$(NULL)
 MAINTAINERCLEANFILES +=3D \
 	$(REMOTE_DRIVER_GENERATED) \
-	$(LIBVIRTD_GENERATED) \
+	$(REMOTE_DAEMON_GENERATED) \
 	$(NULL)
 CLEANFILES +=3D \
 	remote/libvirtd.conf \
@@ -137,51 +177,18 @@ CLEANFILES +=3D remote/libvirtd.aug
=20
 man8_MANS +=3D libvirtd.8
=20
-libvirtd_SOURCES =3D $(LIBVIRTD_SOURCES)
+libvirtd_SOURCES =3D $(REMOTE_DAEMON_SOURCES)
=20
 libvirtd_CFLAGS =3D \
-	$(LIBXML_CFLAGS) \
-	$(GNUTLS_CFLAGS) \
-	$(SASL_CFLAGS) \
-	$(XDR_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	$(LIBNL_CFLAGS) \
-	$(WARN_CFLAGS) \
-	$(PIE_CFLAGS) \
-	-I$(srcdir)/access \
-	-I$(srcdir)/conf \
-	-I$(srcdir)/rpc \
+	$(REMOTE_DAEMON_CFLAGS) \
 	-DSOCK_PREFIX=3D"\"libvirt\"" \
 	-DDAEMON_NAME=3D"\"libvirtd\"" \
 	-DWITH_IP \
 	$(NULL)
=20
-libvirtd_LDFLAGS =3D \
-	$(RELRO_LDFLAGS) \
-	$(PIE_LDFLAGS) \
-	$(NO_INDIRECT_LDFLAGS) \
-	$(NO_UNDEFINED_LDFLAGS) \
-	$(NULL)
+libvirtd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS)
=20
-libvirtd_LDADD =3D \
-	libvirt_driver_admin.la \
-	libvirt-lxc.la \
-	libvirt-qemu.la \
-	libvirt.la \
-	$(LIBXML_LIBS) \
-	$(GNUTLS_LIBS) \
-	$(SASL_LIBS) \
-	$(DBUS_LIBS) \
-	$(LIBNL_LIBS) \
-	$(NULL)
-
-if WITH_DTRACE_PROBES
-libvirtd_LDADD +=3D ../src/libvirt_probes.lo
-endif WITH_DTRACE_PROBES
-
-libvirtd_LDADD +=3D \
-	../gnulib/lib/libgnu.la \
-	$(NULL)
+libvirtd_LDADD =3D $(REMOTE_DAEMON_LD_ADD)
=20
 remote/libvirtd.conf: remote/libvirtd.conf.in
 	$(AM_V_GEN)$(SED) \
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277245; cv=none;
	d=zoho.com; s=zohoarc;
	b=SDYx+2nXgSBoobH2WBY9NOwmFO2QlGXL5bzJ+wrf5xJtTENGM7JQeuKb2ruxe4Lby0ymdAlJesYBymBOow2x7FQfIhovQQ0eMmC9H7usB7dzuImYLFp7uIm8SdkrubjDUDSE+yPQYRlU0v8QAozZ8z/pTtczJlyqaQuxrj6zDQo=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277245;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=MdwttzjtlokBG9EPp7mXkSeod0sMJJo2YWcyOFQ5A/E=;
	b=QXQVPUfHrH34SJenc8+E2BkJwbaUDQvydtVENM+RJdjeMKEJIkiGu2ImI4qyjwL7Mgvv6jzAFar8aSatyFIm9++3y6wAO5309Q9q+HtCPXyNRp2mX94WRSPDHyXRUtlKUvpDHJivMOwNBc+IfkdgvRN3EkowPas5YWKndP6IAg8=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277245317411.2121799988671;
 Thu, 8 Aug 2019 08:14:05 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com
 [10.5.11.23])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 1981B14AFA6;
	Thu,  8 Aug 2019 15:14:04 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id DF104F6DA;
	Thu,  8 Aug 2019 15:14:03 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9C7721802216;
	Thu,  8 Aug 2019 15:14:03 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBOZm027452 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:24 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 05901100194E; Thu,  8 Aug 2019 15:11:24 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 1FFBA1001284;
	Thu,  8 Aug 2019 15:11:19 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:17 +0100
Message-Id: <20190808151044.11385-16-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Christophe de Dinechin <dinechin@redhat.com>,
	Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 15/42] build: don't hardcode /etc in the config
	related files
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]);
 Thu, 08 Aug 2019 15:14:04 +0000 (UTC)

Substitute in the @sysconfigdir@ value instead of /etc.

Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/locking/Makefile.inc.am         |  1 +
 src/locking/virtlockd.service.in    |  2 +-
 src/logging/Makefile.inc.am         |  1 +
 src/logging/virtlogd.service.in     |  2 +-
 src/remote/Makefile.inc.am          |  8 ++++++++
 src/remote/libvirtd-admin.socket.in |  2 +-
 src/remote/libvirtd-ro.socket.in    |  2 +-
 src/remote/libvirtd-tcp.socket.in   |  2 +-
 src/remote/libvirtd-tls.socket.in   |  2 +-
 src/remote/libvirtd.aug.in          |  4 ++--
 src/remote/libvirtd.conf.in         | 20 ++++++++++----------
 src/remote/libvirtd.service.in      |  2 +-
 src/remote/libvirtd.socket.in       |  2 +-
 src/remote/test_libvirtd.aug.in     |  8 ++++----
 tools/libvirt-guests.service.in     |  2 +-
 15 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index 161410051c..bc1a05549a 100644
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -258,6 +258,7 @@ locking/lock_daemon_dispatch_stubs.h: $(LOCK_PROTOCOL) \
 virtlockd.service: locking/virtlockd.service.in $(top_builddir)/config.sta=
tus
 	$(AM_V_GEN)sed \
 	    -e 's|[@]sbindir[@]|$(sbindir)|g' \
+	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
 	    < $< > $@-t && \
 	    mv $@-t $@
=20
diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.servi=
ce.in
index 3c9d587032..e7f8057c06 100644
--- a/src/locking/virtlockd.service.in
+++ b/src/locking/virtlockd.service.in
@@ -7,7 +7,7 @@ Documentation=3Dman:virtlockd(8)
 Documentation=3Dhttps://libvirt.org
=20
 [Service]
-EnvironmentFile=3D-/etc/sysconfig/virtlockd
+EnvironmentFile=3D-@sysconfdir@/sysconfig/virtlockd
 ExecStart=3D@sbindir@/virtlockd $VIRTLOCKD_ARGS
 ExecReload=3D/bin/kill -USR1 $MAINPID
 # Loosing the locks is a really bad thing that will
diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am
index f0c49330f5..18772fde2f 100644
--- a/src/logging/Makefile.inc.am
+++ b/src/logging/Makefile.inc.am
@@ -122,6 +122,7 @@ virtlogd.8.in: logging/virtlogd.pod
 virtlogd.service: logging/virtlogd.service.in $(top_builddir)/config.status
 	$(AM_V_GEN)sed \
 	    -e 's|[@]sbindir[@]|$(sbindir)|g' \
+	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
 	    < $< > $@-t && \
 	    mv $@-t $@
=20
diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service=
.in
index 3d9ae36150..daff48e67d 100644
--- a/src/logging/virtlogd.service.in
+++ b/src/logging/virtlogd.service.in
@@ -7,7 +7,7 @@ Documentation=3Dman:virtlogd(8)
 Documentation=3Dhttps://libvirt.org
=20
 [Service]
-EnvironmentFile=3D-/etc/sysconfig/virtlogd
+EnvironmentFile=3D-@sysconfdir@/sysconfig/virtlogd
 ExecStart=3D@sbindir@/virtlogd $VIRTLOGD_ARGS
 ExecReload=3D/bin/kill -USR1 $MAINPID
 # Loosing the logs is a really bad thing that will
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 9d0adb6d8c..9dc27361fd 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -194,6 +194,7 @@ remote/libvirtd.conf: remote/libvirtd.conf.in
 	$(AM_V_GEN)$(SED) \
 		-e '/[@]CUT_ENABLE_IP[@]/d' \
 		-e '/[@]END[@]/d' \
+		-e 's|[@]sysconfdir[@]|@sysconfdir@|' \
 		-e 's|[@]DAEMON_NAME[@]|libvirtd|' \
 		$< > $@
=20
@@ -209,6 +210,7 @@ remote/libvirtd.aug: remote/libvirtd.aug.in
 	$(AM_V_GEN)$(SED) \
 		-e '/[@]CUT_ENABLE_IP[@]/d' \
 		-e '/[@]END[@]/d' \
+		-e 's|[@]sysconfdir[@]|@sysconfdir@|' \
 		-e 's|[@]DAEMON_NAME[@]|libvirtd|' \
 		-e 's|[@]DAEMON_NAME_UC[@]|Libvirtd|' \
 		$< > $@
@@ -220,6 +222,7 @@ remote/test_libvirtd.aug: remote/test_libvirtd.aug.in \
 		$(SED) \
 		-e '/[@]CUT_ENABLE_IP[@]/d' \
 		-e '/[@]END[@]/d' \
+		-e 's|[@]sysconfdir[@]|@sysconfdir@|' \
 		-e 's|[@]DAEMON_NAME[@]|libvirtd|' \
 		-e 's|[@]DAEMON_NAME_UC[@]|Libvirtd|' \
 		> $@ || rm -f $@
@@ -301,30 +304,35 @@ libvirtd.service: remote/libvirtd.service.in $(top_bu=
ilddir)/config.status
 libvirtd.socket: remote/libvirtd.socket.in $(top_builddir)/config.status
 	$(AM_V_GEN)sed \
 	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
 	    < $< > $@-t && \
 	    mv $@-t $@
=20
 libvirtd-ro.socket: remote/libvirtd-ro.socket.in $(top_builddir)/config.st=
atus
 	$(AM_V_GEN)sed \
 	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
 	    < $< > $@-t && \
 	    mv $@-t $@
=20
 libvirtd-admin.socket: remote/libvirtd-admin.socket.in $(top_builddir)/con=
fig.status
 	$(AM_V_GEN)sed \
 	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
 	    < $< > $@-t && \
 	    mv $@-t $@
=20
 libvirtd-tcp.socket: remote/libvirtd-tcp.socket.in $(top_builddir)/config.=
status
 	$(AM_V_GEN)sed \
 	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
 	    < $< > $@-t && \
 	    mv $@-t $@
=20
 libvirtd-tls.socket: remote/libvirtd-tls.socket.in $(top_builddir)/config.=
status
 	$(AM_V_GEN)sed \
 	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
 	    < $< > $@-t && \
 	    mv $@-t $@
=20
diff --git a/src/remote/libvirtd-admin.socket.in b/src/remote/libvirtd-admi=
n.socket.in
index 307c9ba24b..bbab4ea355 100644
--- a/src/remote/libvirtd-admin.socket.in
+++ b/src/remote/libvirtd-admin.socket.in
@@ -5,7 +5,7 @@ BindsTo=3Dlibvirtd.socket
 After=3Dlibvirtd.socket
=20
 [Socket]
-# The directory must match the /etc/libvirt/libvirtd.conf unix_sock_dir se=
tting
+# The directory must match the @sysconfdir@/libvirt/libvirtd.conf unix_soc=
k_dir setting
 # when using systemd version < 227
 ListenStream=3D@localstatedir@/run/libvirt/libvirt-admin-sock
 Service=3Dlibvirtd.service
diff --git a/src/remote/libvirtd-ro.socket.in b/src/remote/libvirtd-ro.sock=
et.in
index 876daf0c9c..5f8b1892d5 100644
--- a/src/remote/libvirtd-ro.socket.in
+++ b/src/remote/libvirtd-ro.socket.in
@@ -5,7 +5,7 @@ BindsTo=3Dlibvirtd.socket
 After=3Dlibvirtd.socket
=20
 [Socket]
-# The directory must match the /etc/libvirt/libvirtd.conf unix_sock_dir se=
tting
+# The directory must match the @sysconfdir@/libvirt/libvirtd.conf unix_soc=
k_dir setting
 # when using systemd version < 227
 ListenStream=3D@localstatedir@/run/libvirt/libvirt-sock-ro
 Service=3Dlibvirtd.service
diff --git a/src/remote/libvirtd-tcp.socket.in b/src/remote/libvirtd-tcp.so=
cket.in
index 16a4764283..1103036c45 100644
--- a/src/remote/libvirtd-tcp.socket.in
+++ b/src/remote/libvirtd-tcp.socket.in
@@ -5,7 +5,7 @@ BindsTo=3Dlibvirtd.socket
 After=3Dlibvirtd.socket
=20
 [Socket]
-# This must match the /etc/libvirt/libvirtd.conf tcp_port setting
+# This must match the @sysconfdir@/libvirt/libvirtd.conf tcp_port setting
 # when using systemd version < 227
 ListenStream=3D16509
 Service=3Dlibvirtd.service
diff --git a/src/remote/libvirtd-tls.socket.in b/src/remote/libvirtd-tls.so=
cket.in
index e904583cf9..e2b1f839de 100644
--- a/src/remote/libvirtd-tls.socket.in
+++ b/src/remote/libvirtd-tls.socket.in
@@ -5,7 +5,7 @@ BindsTo=3Dlibvirtd.socket
 After=3Dlibvirtd.socket
=20
 [Socket]
-# This must match the /etc/libvirt/libvirtd.conf tls_port setting
+# This must match the @sysconfdir@/libvirt/libvirtd.conf tls_port setting
 # when using systemd version < 227
 ListenStream=3D16514
 Service=3Dlibvirtd.service
diff --git a/src/remote/libvirtd.aug.in b/src/remote/libvirtd.aug.in
index eec3433f29..23a01c41e2 100644
--- a/src/remote/libvirtd.aug.in
+++ b/src/remote/libvirtd.aug.in
@@ -1,4 +1,4 @@
-(* /etc/libvirt/@DAEMON_NAME@.conf *)
+(* @sysconfdir@/libvirt/@DAEMON_NAME@.conf *)
=20
 module @DAEMON_NAME_UC@ =3D
    autoload xfm
@@ -114,7 +114,7 @@ module @DAEMON_NAME_UC@ =3D
=20
    let lns =3D ( record | comment | empty ) *
=20
-   let filter =3D incl "/etc/libvirt/@DAEMON_NAME@.conf"
+   let filter =3D incl "@sysconfdir@/libvirt/@DAEMON_NAME@.conf"
               . Util.stdexcl
=20
    let xfm =3D transform lns filter
diff --git a/src/remote/libvirtd.conf.in b/src/remote/libvirtd.conf.in
index e351a8c190..a0fb634607 100644
--- a/src/remote/libvirtd.conf.in
+++ b/src/remote/libvirtd.conf.in
@@ -134,7 +134,7 @@
 #          the network providing auth (eg, TLS/x509 certificates)
 #
 #  - sasl: use SASL infrastructure. The actual auth scheme is then
-#          controlled from /etc/sasl2/libvirt.conf. For the TCP
+#          controlled from @sysconfdir@/sasl2/libvirt.conf. For the TCP
 #          socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
 #          For non-TCP or TLS sockets, any scheme is allowed.
 #
@@ -166,7 +166,7 @@
 # If you don't enable SASL, then all TCP traffic is cleartext.
 # Don't do this outside of a dev/test scenario. For real world
 # use, always enable SASL and use the GSSAPI or DIGEST-MD5
-# mechanism in /etc/sasl2/libvirt.conf
+# mechanism in @sysconfdir@/sasl2/libvirt.conf
 #auth_tcp =3D "sasl"
=20
 # Change the authentication scheme for TLS sockets.
@@ -199,10 +199,10 @@
 # Use of TLS requires that x509 certificates be issued. The default locati=
ons
 # for the certificate files is as follows:
 #
-#   /etc/pki/CA/cacert.pem                 - The CA master certificate
-#   /etc/pki/libvirt/servercert.pem        - The server certificate signed=
 with
-#                                            the cacert.pem
-#   /etc/pki/libvirt/private/serverkey.pem - The server private key
+#   @sysconfdir@/pki/CA/cacert.pem - The CA master certificate
+#   @sysconfdir@/pki/libvirt/servercert.pem - The server certificate signe=
d with
+#   the cacert.pem
+#   @sysconfdir@/pki/libvirt/private/serverkey.pem - The server private key
 #
 # It is possible to override the default locations by altering the 'key_fi=
le',
 # 'cert_file', and 'ca_file' values and uncommenting them below.
@@ -213,20 +213,20 @@
=20
 # Override the default server key file path
 #
-#key_file =3D "/etc/pki/libvirt/private/serverkey.pem"
+#key_file =3D "@sysconfdir@/pki/libvirt/private/serverkey.pem"
=20
 # Override the default server certificate file path
 #
-#cert_file =3D "/etc/pki/libvirt/servercert.pem"
+#cert_file =3D "@sysconfdir@/pki/libvirt/servercert.pem"
=20
 # Override the default CA certificate path
 #
-#ca_file =3D "/etc/pki/CA/cacert.pem"
+#ca_file =3D "@sysconfdir@/pki/CA/cacert.pem"
=20
 # Specify a certificate revocation list.
 #
 # Defaults to not using a CRL, uncomment to enable it
-#crl_file =3D "/etc/pki/CA/crl.pem"
+#crl_file =3D "@sysconfdir@/pki/CA/crl.pem"
=20
=20
=20
diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
index 5dbe7cbe72..4c5b28b478 100644
--- a/src/remote/libvirtd.service.in
+++ b/src/remote/libvirtd.service.in
@@ -22,7 +22,7 @@ Documentation=3Dhttps://libvirt.org
=20
 [Service]
 Type=3Dnotify
-EnvironmentFile=3D-/etc/sysconfig/libvirtd
+EnvironmentFile=3D-@sysconfdir@/sysconfig/libvirtd
 # libvirtd.service is set to run on boot so that autostart of
 # VMs can be performed. We don't want it to stick around if
 # unused though, so we set a timeout. The socket activation
diff --git a/src/remote/libvirtd.socket.in b/src/remote/libvirtd.socket.in
index 2ee4d7d7a2..872f70eb21 100644
--- a/src/remote/libvirtd.socket.in
+++ b/src/remote/libvirtd.socket.in
@@ -3,7 +3,7 @@ Description=3DLibvirt local socket
 Before=3Dlibvirtd.service
=20
 [Socket]
-# The directory must match the /etc/libvirt/libvirtd.conf unix_sock_dir se=
tting
+# The directory must match the @sysconfdir@/libvirt/libvirtd.conf unix_soc=
k_dir setting
 # when using systemd version < 227
 ListenStream=3D@localstatedir@/run/libvirt/libvirt-sock
 Service=3Dlibvirtd.service
diff --git a/src/remote/test_libvirtd.aug.in b/src/remote/test_libvirtd.aug=
.in
index 2fd809af4a..fc9fb69b67 100644
--- a/src/remote/test_libvirtd.aug.in
+++ b/src/remote/test_libvirtd.aug.in
@@ -24,10 +24,10 @@ module Test_@DAEMON_NAME@ =3D
              { "1" =3D "polkit" }
         }
 @CUT_ENABLE_IP@
-        { "key_file" =3D "/etc/pki/libvirt/private/serverkey.pem" }
-        { "cert_file" =3D "/etc/pki/libvirt/servercert.pem" }
-        { "ca_file" =3D "/etc/pki/CA/cacert.pem" }
-        { "crl_file" =3D "/etc/pki/CA/crl.pem" }
+        { "key_file" =3D "@sysconfdir@/pki/libvirt/private/serverkey.pem" }
+        { "cert_file" =3D "@sysconfdir@/pki/libvirt/servercert.pem" }
+        { "ca_file" =3D "@sysconfdir@/pki/CA/cacert.pem" }
+        { "crl_file" =3D "@sysconfdir@/pki/CA/crl.pem" }
         { "tls_no_sanity_certificate" =3D "1" }
         { "tls_no_verify_certificate" =3D "1" }
         { "tls_allowed_dn_list"
diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service=
.in
index 491ca62138..10c664016a 100644
--- a/tools/libvirt-guests.service.in
+++ b/tools/libvirt-guests.service.in
@@ -10,7 +10,7 @@ Documentation=3Dman:libvirtd(8)
 Documentation=3Dhttps://libvirt.org
=20
 [Service]
-EnvironmentFile=3D-/etc/sysconfig/libvirt-guests
+EnvironmentFile=3D-@sysconfdir@/sysconfig/libvirt-guests
 # Hack just call traditional service until we factor
 # out the code
 ExecStart=3D@libexecdir@/libvirt-guests.sh start
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277249; cv=none;
	d=zoho.com; s=zohoarc;
	b=bbO9FK2WsBr7gi7xdjPQmeL7mAUg/YRmvAW7cYxLI6/Svc5KWw9N+2QiARq54kKe/80PT3UeAX9C8IMMxC5oESbjzhLMF8vym/644ohat1lMaDVyIElhaBBMk8PZfRnZeYHQT90bKQloN4V0VrIPdWUlGHmU4B+lyERdary3hCI=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277249;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=D7MB+AWiflXgbcT44Ap0fE+6jJLyvMfApDT7aUWZgqc=;
	b=HiuvrXtYr2Q+AVJ5hr/hZ+gthGy8JBGmHxbk4QOXq+YvwMnCEgu0/bopBNBrHe/bs6TM4OVVOOPzDEFSLXGwyGCvJEdFVWVywyvYEYuWmsXEvk9Gg1OnjqZt6ew1TFa3/xPNHIgfOvzfd2fHk909AG0h2yIjORzmpPB/NMybMwo=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277249717690.7228436992949;
 Thu, 8 Aug 2019 08:14:09 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id 71EFA14B0F6;
	Thu,  8 Aug 2019 15:14:08 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 443F060BF4;
	Thu,  8 Aug 2019 15:14:08 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id E7C191803B48;
	Thu,  8 Aug 2019 15:14:07 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBSS0027464 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:28 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 3701D1001955; Thu,  8 Aug 2019 15:11:28 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 96DF81001948;
	Thu,  8 Aug 2019 15:11:24 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:18 +0100
Message-Id: <20190808151044.11385-17-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Christophe de Dinechin <dinechin@redhat.com>,
	Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 16/42] remote: reduce duplication in systemd
	unit file make rules into one
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]);
 Thu, 08 Aug 2019 15:14:09 +0000 (UTC)

The make rules for the systemd socket unit files are all essentially
identical and can be collapsed into a single generic rule. The service
unit file rule can be simplified too.

Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/Makefile.am            |  6 +++++
 src/remote/Makefile.inc.am | 49 +++++++-------------------------------
 2 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 150f67e0c3..309947d5f7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -89,6 +89,12 @@ man8_MANS =3D
 DRIVER_SOURCES =3D
 man7_MANS =3D
=20
+COMMON_UNIT_VARS =3D \
+	-e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+	-e 's|[@]sbindir[@]|$(sbindir)|g' \
+	-e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
+	$(NULL)
+
 include util/Makefile.inc.am
 include conf/Makefile.inc.am
 include cpu/Makefile.inc.am
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 9dc27361fd..554fa4afe9 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -293,48 +293,15 @@ INSTALL_DATA_LOCAL +=3D install-sasl
 UNINSTALL_LOCAL +=3D uninstall-sasl
 endif WITH_SASL
=20
+LIBVIRTD_UNIT_VARS =3D \
+	$(COMMON_UNIT_VARS) \
+	$(NULL)
+
 libvirtd.service: remote/libvirtd.service.in $(top_builddir)/config.status
-	$(AM_V_GEN)sed \
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
-	    -e 's|[@]sbindir[@]|$(sbindir)|g' \
-	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
-	    < $< > $@-t && \
-	    mv $@-t $@
-
-libvirtd.socket: remote/libvirtd.socket.in $(top_builddir)/config.status
-	$(AM_V_GEN)sed \
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
-	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
-	    < $< > $@-t && \
-	    mv $@-t $@
-
-libvirtd-ro.socket: remote/libvirtd-ro.socket.in $(top_builddir)/config.st=
atus
-	$(AM_V_GEN)sed \
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
-	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
-	    < $< > $@-t && \
-	    mv $@-t $@
-
-libvirtd-admin.socket: remote/libvirtd-admin.socket.in $(top_builddir)/con=
fig.status
-	$(AM_V_GEN)sed \
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
-	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
-	    < $< > $@-t && \
-	    mv $@-t $@
-
-libvirtd-tcp.socket: remote/libvirtd-tcp.socket.in $(top_builddir)/config.=
status
-	$(AM_V_GEN)sed \
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
-	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
-	    < $< > $@-t && \
-	    mv $@-t $@
-
-libvirtd-tls.socket: remote/libvirtd-tls.socket.in $(top_builddir)/config.=
status
-	$(AM_V_GEN)sed \
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
-	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
-	    < $< > $@-t && \
-	    mv $@-t $@
+	$(AM_V_GEN)$(SED) $(LIBVIRTD_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+libvirt%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
+	$(AM_V_GEN)$(SED) $(LIBVIRTD_UNIT_VARS) $< > $@-t && mv $@-t $@
=20
 virt-guest-shutdown.target: remote/virt-guest-shutdown.target.in \
 			$(top_builddir)/config.status
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277253; cv=none;
	d=zoho.com; s=zohoarc;
	b=XnEdKpyw0btfkZ5I+vYV9N/ea9xllK90HheQl43D3w0yvf+N8E6sBRS03yFDt4YB6DLfIGlqpCo9o+9lXcuECEt41Bdmme5ttCm2VvkE7MgYyk0BU6ZCRcgrFKRzIrV8asTYx2w8r/oQBdZS0h/zF8S5pOgPOhcsuwHP80hM4Ng=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277253;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=/OvtKub3h88A8xRHi6qjfvfAmWnQyVZofHPqIM5rnSo=;
	b=MFzvWk0XJoNI+evWKJ/0gvfxjK577bekZPOrmR10+NnpvyAKxa5xgmvDYtkcajSG7VXPmU6kUbZFAOx/f9qw2cK1AimPnaYy7dQQzRfX+Gj97PCf80XY27K54bf3Vk1845ZTtZ3qtAp7+QVJ1YBB3NI8LGXs1ILwNMeb9l7LElQ=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277253807871.9935605167229;
 Thu, 8 Aug 2019 08:14:13 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 99AC2309C0F5;
	Thu,  8 Aug 2019 15:14:12 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 61881601B7;
	Thu,  8 Aug 2019 15:14:12 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 193C41803B4C;
	Thu,  8 Aug 2019 15:14:12 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBTKx027474 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:29 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id D17071001948; Thu,  8 Aug 2019 15:11:29 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 9E4C610016F3;
	Thu,  8 Aug 2019 15:11:28 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:19 +0100
Message-Id: <20190808151044.11385-18-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Christophe de Dinechin <dinechin@redhat.com>,
	Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 17/42] remote: conditionalize systemd socket
	unit files
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]);
 Thu, 08 Aug 2019 15:14:13 +0000 (UTC)

Prepare for reusing libvirtd socket unit files with other daemons by
making various parts of their config conditionally defined by the make
rules.

Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/Makefile.inc.am          |  4 ++++
 src/remote/libvirtd-admin.socket.in | 15 ++++++++-------
 src/remote/libvirtd-ro.socket.in    | 15 ++++++++-------
 src/remote/libvirtd-tcp.socket.in   | 13 +++++++------
 src/remote/libvirtd-tls.socket.in   | 13 +++++++------
 src/remote/libvirtd.socket.in       | 11 ++++++-----
 6 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 554fa4afe9..6d29458a77 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -295,6 +295,10 @@ endif WITH_SASL
=20
 LIBVIRTD_UNIT_VARS =3D \
 	$(COMMON_UNIT_VARS) \
+	-e 's|[@]name[@]|Libvirt|g' \
+	-e 's|[@]service[@]|libvirtd|g' \
+	-e 's|[@]sockprefix[@]|libvirt|g' \
+	-e 's|[@]deps[@]||g' \
 	$(NULL)
=20
 libvirtd.service: remote/libvirtd.service.in $(top_builddir)/config.status
diff --git a/src/remote/libvirtd-admin.socket.in b/src/remote/libvirtd-admi=
n.socket.in
index bbab4ea355..dcce7fdc93 100644
--- a/src/remote/libvirtd-admin.socket.in
+++ b/src/remote/libvirtd-admin.socket.in
@@ -1,14 +1,15 @@
 [Unit]
-Description=3DLibvirt admin socket
-Before=3Dlibvirtd.service
-BindsTo=3Dlibvirtd.socket
-After=3Dlibvirtd.socket
+Description=3D@name@ admin socket
+Before=3D@service@.service
+BindsTo=3D@service@.socket
+After=3D@service@.socket
+@deps@
=20
 [Socket]
-# The directory must match the @sysconfdir@/libvirt/libvirtd.conf unix_soc=
k_dir setting
+# The directory must match the @sysconfdir@/libvirt/@service@.conf unix_so=
ck_dir setting
 # when using systemd version < 227
-ListenStream=3D@localstatedir@/run/libvirt/libvirt-admin-sock
-Service=3Dlibvirtd.service
+ListenStream=3D@localstatedir@/run/libvirt/@sockprefix@-admin-sock
+Service=3D@service@.service
 SocketMode=3D0600
=20
 [Install]
diff --git a/src/remote/libvirtd-ro.socket.in b/src/remote/libvirtd-ro.sock=
et.in
index 5f8b1892d5..a287f78201 100644
--- a/src/remote/libvirtd-ro.socket.in
+++ b/src/remote/libvirtd-ro.socket.in
@@ -1,14 +1,15 @@
 [Unit]
-Description=3DLibvirt local read-only socket
-Before=3Dlibvirtd.service
-BindsTo=3Dlibvirtd.socket
-After=3Dlibvirtd.socket
+Description=3D@name@ local read-only socket
+Before=3D@service@.service
+BindsTo=3D@service@.socket
+After=3D@service@.socket
+@deps@
=20
 [Socket]
-# The directory must match the @sysconfdir@/libvirt/libvirtd.conf unix_soc=
k_dir setting
+# The directory must match the @sysconfdir@/libvirt/@service@.conf unix_so=
ck_dir setting
 # when using systemd version < 227
-ListenStream=3D@localstatedir@/run/libvirt/libvirt-sock-ro
-Service=3Dlibvirtd.service
+ListenStream=3D@localstatedir@/run/libvirt/@sockprefix@-sock-ro
+Service=3D@service@.service
 SocketMode=3D0666
=20
 [Install]
diff --git a/src/remote/libvirtd-tcp.socket.in b/src/remote/libvirtd-tcp.so=
cket.in
index 1103036c45..dd60317d47 100644
--- a/src/remote/libvirtd-tcp.socket.in
+++ b/src/remote/libvirtd-tcp.socket.in
@@ -1,14 +1,15 @@
 [Unit]
-Description=3DLibvirt non-TLS IP socket
-Before=3Dlibvirtd.service
-BindsTo=3Dlibvirtd.socket
-After=3Dlibvirtd.socket
+Description=3D@name@ non-TLS IP socket
+Before=3D@service@.service
+BindsTo=3D@service@.socket
+After=3D@service@.socket
+@deps@
=20
 [Socket]
-# This must match the @sysconfdir@/libvirt/libvirtd.conf tcp_port setting
+# This must match the @sysconfdir@/libvirt/@service@.conf tcp_port setting
 # when using systemd version < 227
 ListenStream=3D16509
-Service=3Dlibvirtd.service
+Service=3D@service@.service
=20
 [Install]
 WantedBy=3Dsockets.target
diff --git a/src/remote/libvirtd-tls.socket.in b/src/remote/libvirtd-tls.so=
cket.in
index e2b1f839de..8b89737fff 100644
--- a/src/remote/libvirtd-tls.socket.in
+++ b/src/remote/libvirtd-tls.socket.in
@@ -1,14 +1,15 @@
 [Unit]
-Description=3DLibvirt TLS IP socket
-Before=3Dlibvirtd.service
-BindsTo=3Dlibvirtd.socket
-After=3Dlibvirtd.socket
+Description=3D@name@ TLS IP socket
+Before=3D@service@.service
+BindsTo=3D@service@.socket
+After=3D@service@.socket
+@deps@
=20
 [Socket]
-# This must match the @sysconfdir@/libvirt/libvirtd.conf tls_port setting
+# This must match the @sysconfdir@/libvirt/@service@.conf tls_port setting
 # when using systemd version < 227
 ListenStream=3D16514
-Service=3Dlibvirtd.service
+Service=3D@service@.service
=20
 [Install]
 WantedBy=3Dsockets.target
diff --git a/src/remote/libvirtd.socket.in b/src/remote/libvirtd.socket.in
index 872f70eb21..cb61409e23 100644
--- a/src/remote/libvirtd.socket.in
+++ b/src/remote/libvirtd.socket.in
@@ -1,12 +1,13 @@
 [Unit]
-Description=3DLibvirt local socket
-Before=3Dlibvirtd.service
+Description=3D@name@ local socket
+Before=3D@service@.service
+@deps@
=20
 [Socket]
-# The directory must match the @sysconfdir@/libvirt/libvirtd.conf unix_soc=
k_dir setting
+# The directory must match the @sysconfdir@/libvirt/@service@.conf unix_so=
ck_dir setting
 # when using systemd version < 227
-ListenStream=3D@localstatedir@/run/libvirt/libvirt-sock
-Service=3Dlibvirtd.service
+ListenStream=3D@localstatedir@/run/libvirt/@sockprefix@-sock
+Service=3D@service@.service
 SocketMode=3D0666
=20
 [Install]
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277294; cv=none;
	d=zoho.com; s=zohoarc;
	b=lQOgxcMwE5Bx09NyR6pIqbaPyxHno0TU6WE/lNRjzSXOW9u7We2XgLCvs358n9j4j4xNw61DCY+Kufm/V7WHgrzdZXuuGR0D0mW2Y9kWxfPNQiEppUbFRrpjTNjZmvd2x7g3yMXnPzj8dqsDHawad7DG6jT86Gh5fEJcZpLzDXY=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277294;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=p0ad5DoyTH+/AH8KM1BbKlgUgTZGbcAzrEcsDq/Fwvw=;
	b=nekdSGarXFA+t1ZelKzF2i2gnNOsl2WvFhzrgmhdjemez3wGxaoBC0utowR9/M4JfeldWecZ7FdCksNGt3cYSiDJcZCrkxjZfaPg+i+coQPunxYUPH/m5pxa45NaMLuwQrrQd4vDqcJMojXA0zqnW90q2Ab/yBMNts1TfMWQN+4=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277294341612.8653697405703;
 Thu, 8 Aug 2019 08:14:54 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 1D40D300BE7F;
	Thu,  8 Aug 2019 15:14:53 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id DE5CB60467;
	Thu,  8 Aug 2019 15:14:52 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9BE82C593;
	Thu,  8 Aug 2019 15:14:52 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBVYl027484 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:31 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 48AFE1001955; Thu,  8 Aug 2019 15:11:31 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 2FAD5100194E;
	Thu,  8 Aug 2019 15:11:30 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:20 +0100
Message-Id: <20190808151044.11385-19-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 18/42] remote: refactor how list of systemd
	unit files is built
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]);
 Thu, 08 Aug 2019 15:14:53 +0000 (UTC)

The make logic assumes that the SYSTEMD_UNIT_FILES var can be built from
SYSTEMD_UNIT_FILES_IN by simply dropping the directory prefix and the
.in suffix.

This won't work in future when a single .in unit file can be used to
generate multiple different units.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/Makefile.am             | 2 +-
 src/locking/Makefile.inc.am | 5 ++++-
 src/logging/Makefile.inc.am | 5 ++++-
 src/remote/Makefile.inc.am  | 5 ++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 309947d5f7..d02d4deb6d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -82,6 +82,7 @@ RPC_PROBE_FILES =3D
 LOGROTATE_FILES_IN =3D
 PODFILES =3D
 MANINFILES =3D
+SYSTEMD_UNIT_FILES =3D
 SYSTEMD_UNIT_FILES_IN =3D
 SYSCONF_FILES =3D
 sbin_PROGRAMS =3D
@@ -733,7 +734,6 @@ if WITH_LIBVIRTD
 if LIBVIRT_INIT_SCRIPT_SYSTEMD
=20
 SYSTEMD_UNIT_DIR =3D $(prefix)/lib/systemd/system
-SYSTEMD_UNIT_FILES =3D $(notdir $(SYSTEMD_UNIT_FILES_IN:%.in=3D%))
=20
 BUILT_SOURCES +=3D $(SYSTEMD_UNIT_FILES)
 DISTCLEANFILES +=3D $(SYSTEMD_UNIT_FILES)
diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index bc1a05549a..37d0e79f40 100644
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -77,12 +77,15 @@ MANINFILES +=3D virtlockd.8.in
 CLEANFILES +=3D $(man8_MANS)
 MAINTAINERCLEANFILES +=3D $(MANINFILES)
=20
-SYSTEMD_UNIT_FILES_IN +=3D \
+VIRTLOCKD_UNIT_FILES_IN =3D \
 	locking/virtlockd.service.in \
 	locking/virtlockd.socket.in \
 	locking/virtlockd-admin.socket.in \
 	$(NULL)
=20
+SYSTEMD_UNIT_FILES +=3D $(notdir $(VIRTLOCKD_UNIT_FILES_IN:%.in=3D%))
+SYSTEMD_UNIT_FILES_IN +=3D $(VIRTLOCKD_UNIT_FILES_IN)
+
 lockdriverdir =3D $(libdir)/libvirt/lock-driver
 lockdriver_LTLIBRARIES =3D
=20
diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am
index 18772fde2f..b952021d00 100644
--- a/src/logging/Makefile.inc.am
+++ b/src/logging/Makefile.inc.am
@@ -50,12 +50,15 @@ PODFILES +=3D logging/virtlogd.pod
 MANINFILES +=3D virtlogd.8.in
 SYSCONF_FILES +=3D logging/virtlogd.sysconf
=20
-SYSTEMD_UNIT_FILES_IN +=3D \
+VIRTLOGD_UNIT_FILES_IN =3D \
 	logging/virtlogd.service.in \
 	logging/virtlogd.socket.in \
 	logging/virtlogd-admin.socket.in \
 	$(NULL)
=20
+SYSTEMD_UNIT_FILES +=3D $(notdir $(VIRTLOGD_UNIT_FILES_IN:%.in=3D%))
+SYSTEMD_UNIT_FILES_IN +=3D $(VIRTLOGD_UNIT_FILES_IN)
+
 if WITH_LIBVIRTD
 sbin_PROGRAMS +=3D virtlogd
=20
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 6d29458a77..c08d59df1f 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -89,7 +89,7 @@ SYSCONF_FILES +=3D remote/libvirtd.sysconf
 PODFILES +=3D remote/libvirtd.pod
 MANINFILES +=3D libvirtd.8.in
=20
-SYSTEMD_UNIT_FILES_IN +=3D \
+LIBVIRTD_UNIT_FILES_IN =3D \
 	remote/libvirtd.service.in \
 	remote/libvirtd.socket.in \
 	remote/libvirtd-ro.socket.in \
@@ -99,6 +99,9 @@ SYSTEMD_UNIT_FILES_IN +=3D \
 	remote/virt-guest-shutdown.target.in \
 	$(NULL)
=20
+SYSTEMD_UNIT_FILES +=3D $(notdir $(LIBVIRTD_UNIT_FILES_IN:%.in=3D%))
+SYSTEMD_UNIT_FILES_IN +=3D $(LIBVIRTD_UNIT_FILES_IN)
+
 REMOTE_PROTOCOL =3D $(srcdir)/remote/remote_protocol.x
 LXC_PROTOCOL =3D $(srcdir)/remote/lxc_protocol.x
 QEMU_PROTOCOL =3D $(srcdir)/remote/qemu_protocol.x
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277298; cv=none;
	d=zoho.com; s=zohoarc;
	b=lGaTlNvzDbCKvGOMVxRTIrB5/PM3d6+Vw8VD8oa5ImPzLFh+MuzZ4DlTQOMgFvxjLc8V5OyNHDh9FEe752x1NOABOrWnliG4TNFrbt/L7KvdQ3FOLng6yD80lMN/OuVySTAV0CAprt2hQbD/KoM/g0wWwFF2s2E5Fx0zmSeoNR4=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277298;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=A1OfcvW5xLiqlfNR6yp03jMLeByxlRd01f7DWOzEqNU=;
	b=RHkl+AZxokg/6WwOjP8OYjmJZ9AACY60UL+WwhCkphbnQipPP0pr9swzUeNsia/ldZYsON2Gu0T8UAli1WN3q1zr5YGW0bfvlIyYGElq+h85uBhIkHXy1lOhyNFSiuEO7FkmjJsjtrrxdVMIGvVBZcomc5yyjjZEMLJUPeB2ceU=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277298166596.8531433439059;
 Thu, 8 Aug 2019 08:14:58 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 7BFC130ADBAA;
	Thu,  8 Aug 2019 15:14:56 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 4C0BD600C8;
	Thu,  8 Aug 2019 15:14:56 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 10B591803B5A;
	Thu,  8 Aug 2019 15:14:56 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBWQW027490 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:32 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id DECD910016F3; Thu,  8 Aug 2019 15:11:32 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id A909110002B9;
	Thu,  8 Aug 2019 15:11:31 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:21 +0100
Message-Id: <20190808151044.11385-20-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 19/42] remote: in per-driver daemons ensure
	that state initialize succeeds
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]);
 Thu, 08 Aug 2019 15:14:57 +0000 (UTC)

When running in libvirtd, we are happy for any of the drivers to simply
skip their initialization in virStateInitialize, as other drivers are
still potentially useful.

When running in per-driver daemons though, we want the daemon to abort
startup if the driver cannot initialize itself, as the daemon will be
useless without it.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/bhyve/bhyve_driver.c                | 10 +++++-----
 src/driver-state.h                      |  8 +++++++-
 src/interface/interface_backend_netcf.c |  8 ++++----
 src/interface/interface_backend_udev.c  |  4 ++--
 src/libvirt.c                           | 15 ++++++++++++---
 src/libvirt_internal.h                  |  1 +
 src/libxl/libxl_driver.c                | 10 +++++-----
 src/lxc/lxc_driver.c                    | 12 ++++++------
 src/network/bridge_driver.c             |  4 ++--
 src/node_device/node_device_hal.c       | 12 ++++++------
 src/node_device/node_device_udev.c      |  8 ++++----
 src/nwfilter/nwfilter_driver.c          | 12 ++++++------
 src/qemu/qemu_driver.c                  |  8 ++++----
 src/remote/remote_daemon.c              |  6 ++++++
 src/remote/remote_driver.c              |  2 +-
 src/secret/secret_driver.c              |  8 ++++----
 src/storage/storage_driver.c            |  8 ++++----
 src/vz/vz_driver.c                      | 14 +++++++-------
 18 files changed, 86 insertions(+), 64 deletions(-)

diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index 5387ac5570..e2c1b00080 100644
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -1220,16 +1220,16 @@ bhyveStateInitialize(bool privileged,
 {
     if (!privileged) {
         VIR_INFO("Not running privileged, disabling driver");
-        return 0;
+        return VIR_DRV_STATE_INIT_SKIPPED;
     }
=20
     if (VIR_ALLOC(bhyve_driver) < 0)
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
=20
     bhyve_driver->lockFD =3D -1;
     if (virMutexInit(&bhyve_driver->lock) < 0) {
         VIR_FREE(bhyve_driver);
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
     }
=20
     if (!(bhyve_driver->closeCallbacks =3D virCloseCallbacksNew()))
@@ -1303,11 +1303,11 @@ bhyveStateInitialize(bool privileged,
=20
     bhyveAutostartDomains(bhyve_driver);
=20
-    return 0;
+    return VIR_DRV_STATE_INIT_COMPLETE;
=20
  cleanup:
     bhyveStateCleanup();
-    return -1;
+    return VIR_DRV_STATE_INIT_ERROR;
 }
=20
 unsigned
diff --git a/src/driver-state.h b/src/driver-state.h
index 974b2252ee..69e2678dfc 100644
--- a/src/driver-state.h
+++ b/src/driver-state.h
@@ -24,7 +24,13 @@
 # error "Don't include this file directly, only use driver.h"
 #endif
=20
-typedef int
+typedef enum {
+    VIR_DRV_STATE_INIT_ERROR =3D -1,
+    VIR_DRV_STATE_INIT_SKIPPED,
+    VIR_DRV_STATE_INIT_COMPLETE,
+} virDrvStateInitResult;
+
+typedef virDrvStateInitResult
 (*virDrvStateInitialize)(bool privileged,
                          virStateInhibitCallback callback,
                          void *opaque);
diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interf=
ace_backend_netcf.c
index 0000587cee..eb509ccc13 100644
--- a/src/interface/interface_backend_netcf.c
+++ b/src/interface/interface_backend_netcf.c
@@ -93,10 +93,10 @@ netcfStateInitialize(bool privileged,
                      void *opaque ATTRIBUTE_UNUSED)
 {
     if (virNetcfDriverStateInitialize() < 0)
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
=20
     if (!(driver =3D virObjectLockableNew(virNetcfDriverStateClass)))
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
=20
     driver->privileged =3D privileged;
=20
@@ -129,12 +129,12 @@ netcfStateInitialize(bool privileged,
                        _("failed to initialize netcf"));
         goto error;
     }
-    return 0;
+    return VIR_DRV_STATE_INIT_COMPLETE;
=20
  error:
     virObjectUnref(driver);
     driver =3D NULL;
-    return -1;
+    return VIR_DRV_STATE_INIT_ERROR;
 }
=20
=20
diff --git a/src/interface/interface_backend_udev.c b/src/interface/interfa=
ce_backend_udev.c
index fea5108dbc..ef748540d1 100644
--- a/src/interface/interface_backend_udev.c
+++ b/src/interface/interface_backend_udev.c
@@ -1172,7 +1172,7 @@ udevStateInitialize(bool privileged,
                     virStateInhibitCallback callback ATTRIBUTE_UNUSED,
                     void *opaque ATTRIBUTE_UNUSED)
 {
-    int ret =3D -1;
+    int ret =3D VIR_DRV_STATE_INIT_ERROR;
=20
     if (VIR_ALLOC(driver) < 0)
         goto cleanup;
@@ -1210,7 +1210,7 @@ udevStateInitialize(bool privileged,
     }
     driver->privileged =3D privileged;
=20
-    ret =3D 0;
+    ret =3D VIR_DRV_STATE_INIT_COMPLETE;
=20
  cleanup:
     if (ret < 0)
diff --git a/src/libvirt.c b/src/libvirt.c
index 768ad348c7..906bab8128 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -622,6 +622,7 @@ virRegisterStateDriver(virStateDriverPtr driver)
 /**
  * virStateInitialize:
  * @privileged: set to true if running with root privilege, false otherwise
+ * @mandatory: set to true if all drivers must report success, not skipped
  * @callback: callback to invoke to inhibit shutdown of the daemon
  * @opaque: data to pass to @callback
  *
@@ -631,6 +632,7 @@ virRegisterStateDriver(virStateDriverPtr driver)
  */
 int
 virStateInitialize(bool privileged,
+                   bool mandatory,
                    virStateInhibitCallback callback,
                    void *opaque)
 {
@@ -641,15 +643,22 @@ virStateInitialize(bool privileged,
=20
     for (i =3D 0; i < virStateDriverTabCount; i++) {
         if (virStateDriverTab[i]->stateInitialize) {
+            virDrvStateInitResult ret;
             VIR_DEBUG("Running global init for %s state driver",
                       virStateDriverTab[i]->name);
-            if (virStateDriverTab[i]->stateInitialize(privileged,
-                                                      callback,
-                                                      opaque) < 0) {
+            ret =3D virStateDriverTab[i]->stateInitialize(privileged,
+                                                        callback,
+                                                        opaque);
+            VIR_DEBUG("State init result %d (mandatory=3D%d)", ret, mandat=
ory);
+            if (ret =3D=3D VIR_DRV_STATE_INIT_ERROR) {
                 VIR_ERROR(_("Initialization of %s state driver failed: %s"=
),
                           virStateDriverTab[i]->name,
                           virGetLastErrorMessage());
                 return -1;
+            } else if (ret =3D=3D VIR_DRV_STATE_INIT_SKIPPED && mandatory)=
 {
+                VIR_ERROR(_("Initialization of mandatory %s state driver s=
kipped"),
+                          virStateDriverTab[i]->name);
+                return -1;
             }
         }
     }
diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h
index 3f012fdd4b..4a74dbc2af 100644
--- a/src/libvirt_internal.h
+++ b/src/libvirt_internal.h
@@ -30,6 +30,7 @@ typedef void (*virStateInhibitCallback)(bool inhibit,
                                         void *opaque);
=20
 int virStateInitialize(bool privileged,
+                       bool mandatory,
                        virStateInhibitCallback inhibit,
                        void *opaque);
 int virStateCleanup(void);
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index f430522b35..c85bc3f5d0 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -657,17 +657,17 @@ libxlStateInitialize(bool privileged,
     char ebuf[1024];
=20
     if (!libxlDriverShouldLoad(privileged))
-        return 0;
+        return VIR_DRV_STATE_INIT_SKIPPED;
=20
     if (VIR_ALLOC(libxl_driver) < 0)
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
=20
     libxl_driver->lockFD =3D -1;
     if (virMutexInit(&libxl_driver->lock) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        "%s", _("cannot initialize mutex"));
         VIR_FREE(libxl_driver);
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
     }
=20
     /* Allocate bitmap for vnc port reservation */
@@ -806,12 +806,12 @@ libxlStateInitialize(bool privileged,
     virDomainObjListForEach(libxl_driver->domains, libxlDomainManagedSaveL=
oad,
                             libxl_driver);
=20
-    return 0;
+    return VIR_DRV_STATE_INIT_COMPLETE;
=20
  error:
     VIR_FREE(driverConf);
     libxlStateCleanup();
-    return -1;
+    return VIR_DRV_STATE_INIT_ERROR;
 }
=20
 static int
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index d0b6703101..0baf18f3ef 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -1545,7 +1545,7 @@ static int lxcStateInitialize(bool privileged,
     /* Check that the user is root, silently disable if not */
     if (!privileged) {
         VIR_INFO("Not running privileged, disabling driver");
-        return 0;
+        return VIR_DRV_STATE_INIT_SKIPPED;
     }
=20
     /* Check that this is a container enabled kernel */
@@ -1554,15 +1554,15 @@ static int lxcStateInitialize(bool privileged,
                                      VIR_PROCESS_NAMESPACE_UTS |
                                      VIR_PROCESS_NAMESPACE_IPC) < 0) {
         VIR_INFO("LXC support not available in this kernel, disabling driv=
er");
-        return 0;
+        return VIR_DRV_STATE_INIT_SKIPPED;
     }
=20
     if (VIR_ALLOC(lxc_driver) < 0)
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
     lxc_driver->lockFD =3D -1;
     if (virMutexInit(&lxc_driver->lock) < 0) {
         VIR_FREE(lxc_driver);
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
     }
=20
     if (!(lxc_driver->domains =3D virDomainObjListNew()))
@@ -1633,12 +1633,12 @@ static int lxcStateInitialize(bool privileged,
     virLXCProcessAutostartAll(lxc_driver);
=20
     virObjectUnref(caps);
-    return 0;
+    return VIR_DRV_STATE_INIT_COMPLETE;
=20
  cleanup:
     virObjectUnref(caps);
     lxcStateCleanup();
-    return -1;
+    return VIR_DRV_STATE_INIT_ERROR;
 }
=20
 static void lxcNotifyLoadDomain(virDomainObjPtr vm, int newVM, void *opaqu=
e)
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 41fa89a4af..2b1fa59390 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -713,7 +713,7 @@ networkStateInitialize(bool privileged,
                        virStateInhibitCallback callback ATTRIBUTE_UNUSED,
                        void *opaque ATTRIBUTE_UNUSED)
 {
-    int ret =3D -1;
+    int ret =3D VIR_DRV_STATE_INIT_ERROR;
     char *configdir =3D NULL;
     char *rundir =3D NULL;
 #ifdef WITH_FIREWALLD
@@ -847,7 +847,7 @@ networkStateInitialize(bool privileged,
     }
 #endif
=20
-    ret =3D 0;
+    ret =3D VIR_DRV_STATE_INIT_COMPLETE;
  cleanup:
     VIR_FREE(configdir);
     VIR_FREE(rundir);
diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_devic=
e_hal.c
index 1f3f867599..d46e4e98f3 100644
--- a/src/node_device/node_device_hal.c
+++ b/src/node_device/node_device_hal.c
@@ -599,7 +599,7 @@ nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED,
     char **udi =3D NULL;
     int num_devs;
     size_t i;
-    int ret =3D -1;
+    int ret =3D VIR_DRV_STATE_INIT_ERROR;
     DBusConnection *sysbus;
     DBusError err;
=20
@@ -608,12 +608,12 @@ nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED,
           cmpstringp);
=20
     if (VIR_ALLOC(driver) < 0)
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
=20
     driver->lockFD =3D -1;
     if (virMutexInit(&driver->lock) < 0) {
         VIR_FREE(driver);
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
     }
     nodeDeviceLock();
=20
@@ -648,7 +648,7 @@ nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED,
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("DBus not available, disabling HAL driver: %s"),
                        virGetLastErrorMessage());
-        ret =3D 0;
+        ret =3D VIR_DRV_STATE_INIT_SKIPPED;
         goto failure;
     }
=20
@@ -671,7 +671,7 @@ nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED,
         /* We don't want to show a fatal error here,
            otherwise entire libvirtd shuts down when
            hald isn't running */
-        ret =3D 0;
+        ret =3D VIR_DRV_STATE_INIT_SKIPPED;
         goto failure;
     }
=20
@@ -709,7 +709,7 @@ nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED,
     }
     VIR_FREE(udi);
=20
-    return 0;
+    return VIR_DRV_STATE_INIT_COMPLETE;
=20
  failure:
     if (dbus_error_is_set(&err)) {
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi=
ce_udev.c
index 8bc63c506c..adf60e4537 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -1816,14 +1816,14 @@ nodeStateInitialize(bool privileged,
     virThread enumThread;
=20
     if (VIR_ALLOC(driver) < 0)
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
=20
     driver->lockFD =3D -1;
     if (virMutexInit(&driver->lock) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("Unable to initialize mutex"));
         VIR_FREE(driver);
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
     }
=20
     driver->privileged =3D privileged;
@@ -1919,11 +1919,11 @@ nodeStateInitialize(bool privileged,
         goto cleanup;
     }
=20
-    return 0;
+    return VIR_DRV_STATE_INIT_COMPLETE;
=20
  cleanup:
     nodeStateCleanup();
-    return -1;
+    return VIR_DRV_STATE_INIT_ERROR;
=20
  unlock:
     virObjectUnlock(priv);
diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 530e4f5872..6073143437 100644
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -184,10 +184,10 @@ nwfilterStateInitialize(bool privileged,
=20
     if (virDBusHasSystemBus() &&
         !(sysbus =3D virDBusGetSystemBus()))
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
=20
     if (VIR_ALLOC(driver) < 0)
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
=20
     driver->lockFD =3D -1;
     if (virMutexInit(&driver->lock) < 0)
@@ -201,7 +201,7 @@ nwfilterStateInitialize(bool privileged,
         goto error;
=20
     if (!privileged)
-        return 0;
+        return VIR_DRV_STATE_INIT_SKIPPED;
=20
     nwfilterDriverLock();
=20
@@ -281,13 +281,13 @@ nwfilterStateInitialize(bool privileged,
=20
     nwfilterDriverUnlock();
=20
-    return 0;
+    return VIR_DRV_STATE_INIT_COMPLETE;
=20
  error:
     nwfilterDriverUnlock();
     nwfilterStateCleanup();
=20
-    return -1;
+    return VIR_DRV_STATE_INIT_ERROR;
=20
  err_techdrivers_shutdown:
     virNWFilterTechDriversShutdown();
@@ -302,7 +302,7 @@ nwfilterStateInitialize(bool privileged,
     virNWFilterObjListFree(driver->nwfilters);
     VIR_FREE(driver);
=20
-    return -1;
+    return VIR_DRV_STATE_INIT_ERROR;
 }
=20
 /**
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index ff83d1c024..e0bf8ea2c4 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -730,7 +730,7 @@ qemuStateInitialize(bool privileged,
     size_t i;
=20
     if (VIR_ALLOC(qemu_driver) < 0)
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
=20
     qemu_driver->lockFD =3D -1;
=20
@@ -738,7 +738,7 @@ qemuStateInitialize(bool privileged,
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("cannot initialize mutex"));
         VIR_FREE(qemu_driver);
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
     }
=20
     qemu_driver->inhibitCallback =3D callback;
@@ -1074,14 +1074,14 @@ qemuStateInitialize(bool privileged,
=20
     qemuAutostartDomains(qemu_driver);
=20
-    return 0;
+    return VIR_DRV_STATE_INIT_COMPLETE;
=20
  error:
     VIR_FREE(driverConf);
     VIR_FREE(hugepagePath);
     VIR_FREE(memoryBackingPath);
     qemuStateCleanup();
-    return -1;
+    return VIR_DRV_STATE_INIT_ERROR;
 }
=20
 static void qemuNotifyLoadDomain(virDomainObjPtr vm, int newVM, void *opaq=
ue)
diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index d63f2daac1..ad3c163120 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -792,6 +792,11 @@ static void daemonRunStateInit(void *opaque)
 {
     virNetDaemonPtr dmn =3D opaque;
     virIdentityPtr sysident =3D virIdentityGetSystem();
+#ifdef MODULE_NAME
+    bool mandatory =3D true;
+#else /* ! MODULE_NAME */
+    bool mandatory =3D false;
+#endif /* ! MODULE_NAME */
=20
     virIdentitySetCurrent(sysident);
=20
@@ -804,6 +809,7 @@ static void daemonRunStateInit(void *opaque)
      * we're ready, since it can take a long time and this will
      * seriously delay OS bootup process */
     if (virStateInitialize(virNetDaemonIsPrivileged(dmn),
+                           mandatory,
                            daemonInhibitCallback,
                            dmn) < 0) {
         VIR_ERROR(_("Driver state initialization failed"));
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 76ea49ed8e..ef240052f1 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -195,7 +195,7 @@ remoteStateInitialize(bool privileged ATTRIBUTE_UNUSED,
      * re-entering ourselves
      */
     inside_daemon =3D true;
-    return 0;
+    return VIR_DRV_STATE_INIT_COMPLETE;
 }
=20
=20
diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
index 0af2bcef96..0d5ea05f56 100644
--- a/src/secret/secret_driver.c
+++ b/src/secret/secret_driver.c
@@ -457,12 +457,12 @@ secretStateInitialize(bool privileged,
                       void *opaque ATTRIBUTE_UNUSED)
 {
     if (VIR_ALLOC(driver) < 0)
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
=20
     driver->lockFD =3D -1;
     if (virMutexInit(&driver->lock) < 0) {
         VIR_FREE(driver);
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
     }
     secretDriverLock();
=20
@@ -514,12 +514,12 @@ secretStateInitialize(bool privileged,
         goto error;
=20
     secretDriverUnlock();
-    return 0;
+    return VIR_DRV_STATE_INIT_COMPLETE;
=20
  error:
     secretDriverUnlock();
     secretStateCleanup();
-    return -1;
+    return VIR_DRV_STATE_INIT_ERROR;
 }
=20
=20
diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index 03ac6a6845..dfa654178b 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -255,12 +255,12 @@ storageStateInitialize(bool privileged,
     VIR_AUTOFREE(char *) rundir =3D NULL;
=20
     if (VIR_ALLOC(driver) < 0)
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
=20
     driver->lockFD =3D -1;
     if (virMutexInit(&driver->lock) < 0) {
         VIR_FREE(driver);
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
     }
     storageDriverLock();
=20
@@ -326,12 +326,12 @@ storageStateInitialize(bool privileged,
=20
     storageDriverUnlock();
=20
-    return 0;
+    return VIR_DRV_STATE_INIT_COMPLETE;
=20
  error:
     storageDriverUnlock();
     storageStateCleanup();
-    return -1;
+    return VIR_DRV_STATE_INIT_ERROR;
 }
=20
 /**
diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index f5d05a7f43..da72b209d1 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -4118,36 +4118,36 @@ vzStateInitialize(bool privileged,
                   void *opaque ATTRIBUTE_UNUSED)
 {
     if (!privileged)
-        return 0;
+        return VIR_DRV_STATE_INIT_SKIPPED;
=20
     vz_driver_privileged =3D privileged;
=20
     if (virFileMakePathWithMode(VZ_STATEDIR, S_IRWXU) < 0) {
         virReportSystemError(errno, _("cannot create state directory '%s'"=
),
                              VZ_STATEDIR);
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
     }
=20
     if ((vz_driver_lock_fd =3D
          virPidFileAcquire(VZ_STATEDIR, "driver", false, getpid())) < 0)
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
=20
     if (prlsdkInit() < 0) {
         VIR_DEBUG("%s", _("Can't initialize Parallels SDK"));
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
     }
=20
-   if (virMutexInit(&vz_driver_lock) < 0)
+    if (virMutexInit(&vz_driver_lock) < 0)
         goto error;
=20
     /* Failing to create driver here is not fatal and only means
      * that next driver client will try once more when connecting */
     vz_driver =3D vzDriverObjNew();
-    return 0;
+    return VIR_DRV_STATE_INIT_COMPLETE;
=20
  error:
     vzStateCleanup();
-    return -1;
+    return VIR_DRV_STATE_INIT_ERROR;
 }
=20
 static virStateDriver vzStateDriver =3D {
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277301; cv=none;
	d=zoho.com; s=zohoarc;
	b=F78gnjRO7jo8O05TTryvuk+Mr9eUA7FztEDk0/Fm3kVSYp4LYsC1SzNsaXK6m5SnmR7yRodKZOSh9hPCXiHxIlFPDY4jelegOX2N/6BgkvzFKED/0K66UGXD+284ke0LK4Zr9qkJhBFxD2hCXChgimvMZqfFuGiyddx5h9XGQaM=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277301;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=sBOkR1haIBkHlmUOxn8rfHrfgdfDjES9Rjt0UrzPsYU=;
	b=EE3iMZRBDxQ7vWqN6wyGJIOV/uNmmZLY7RS8Pk0f+nI4t/+TQ0ihXC/LvunbNEBf22nZeb/DBi9XvaoZv7lPFeL/hFdVI0rK/cwUjqoiCG0tcAlnlubZ58uglCct5ZPIx//63C25FGTDPgLbeqjZnKtP8vY4u0meVR/7bM09dl8=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277301154218.58454781963587;
 Thu, 8 Aug 2019 08:15:01 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
 [10.5.11.22])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id F07E37E42C;
	Thu,  8 Aug 2019 15:14:59 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id C117B1001B08;
	Thu,  8 Aug 2019 15:14:59 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7C45B1803B5E;
	Thu,  8 Aug 2019 15:14:59 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBZKO027503 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:35 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 7CA831001956; Thu,  8 Aug 2019 15:11:35 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 72C0D1001284;
	Thu,  8 Aug 2019 15:11:33 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:22 +0100
Message-Id: <20190808151044.11385-21-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Christophe de Dinechin <dinechin@redhat.com>,
	Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 20/42] remote: introduce virtproxyd daemon to
	handle IP connectivity
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]);
 Thu, 08 Aug 2019 15:15:00 +0000 (UTC)

The libvirtd daemon provides the traditional libvirt experience where
all the drivers are in a single daemon, and is accessible over both
local UNIX sockets and remote IP sockets.

In the new world we're having a set of per-driver daemons which will
primarily be accessed locally via their own UNIX sockets.

We still, however, need to allow for case of applications which will
connect to libvirt remotely. These remote connections can be done as
TCP/TLS sockets, or by SSH tunnelling to the UNIX socket.

In the later case, the old libvirt.so clients will only know about
the path to the old libvirtd socket /var/run/libvirt/libvirt-sock,
and not the new driver sockets /var/run/libvirt/virtqemud-sock.

It is also not desirable to expose the main driver specific daemons
over IP directly to minimize their attack service.

Thus the virtproxyd daemon steps into place, to provide TCP/TLS sockets,
and back compat for the old libvirtd UNIX socket path(s). It will then
forward all RPC calls made to the appropriate driver specific daemon.

Essentially it is equivalent to the old libvirtd with absolutely no
drivers registered except for the remote driver (and other stateless
drivers in libvirt.so).

We could have modified libvirtd so none of the drivers are registed
to get the same end result. We could even add a libvirtd.conf parameter
to control whether the drivers are loaded to enable users to switch back
to the old world if we discover bugs in the split-daemon model. Using a
new daemon though has some advantages

 - We can make virtproxyd and the virtXXXd per-driver daemons all
   have "Conflicts: libvirtd.service" in their systemd unit files.
   This will guarantee that libvirtd is never started at the same
   time, as this would result in two daemons running the same driver.
   Fortunately drivers use locking to protect themselves, but it is
   better to avoid starting a daemon we know will conflict.

 - It allows us to break CLI compat to remove the --listen parameter.
   Both listen_tcp and listen_tls parameters in /etc/libvirtd/virtd.conf
   will default to zero. Either TLS or TCP can be enabled exclusively
   though virtd.conf without requiring the extra step of adding --listen.

 - It allows us to set a strict SELinux policy over virtproxyd. For
   back compat the libvirtd policy must continue to allow all drivers
   to run. We can't easily give a second policy to libvirtd which
   locks it down. By introducing a new virtproxyd we can set a strict
   policy for that daemon only.

 - It gets rid of the weird naming of having a daemon with "lib" in
   its name. Now all normal daemons libvirt ships will have "virt"
   as their prefix not "libvirt".

 - Distros can more easily choose their upgrade path. They can
   ship both sets of daemons in their packages, and choose to
   either enable libvirtd, or enable the per-driver daemons and
   virtproxyd out of the box. Users can easily override this if
   desired by just tweaking which systemd units are active.

After some time we can deprecate use of libvirtd and after some more
time delete it entirely, leaving us in a pretty world filled with
prancing unicorns.

The main downside with introducing a new daemon, and with the
per-driver daemons in general, is figuring out the correct upgrade
path.

The conservative option is to leave libvirtd running if it was
an existing installation. Only use the new daemons & virtproxyd
on completely new installs.

The aggressive option is to disable libvirtd if already running
and activate all the new daemons.

Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                        |   4 ++
 libvirt.spec.in                   |  10 +++
 src/remote/Makefile.inc.am        | 108 +++++++++++++++++++++++++++---
 src/remote/remote_daemon.c        |  30 ++++++---
 src/remote/remote_daemon_config.c |   6 +-
 src/remote/virtproxyd.service.in  |  24 +++++++
 6 files changed, 162 insertions(+), 20 deletions(-)
 create mode 100644 src/remote/virtproxyd.service.in

diff --git a/.gitignore b/.gitignore
index 35dc2c8bec..9ad159ecfd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -161,6 +161,9 @@
 /src/remote/libvirtd.aug
 /src/remote/libvirtd.conf
 /src/remote/test_libvirtd.aug
+/src/remote/test_virtproxyd.aug
+/src/remote/virtproxyd.aug
+/src/remote/virtproxyd.conf
 /src/rpc/virkeepaliveprotocol.[ch]
 /src/rpc/virnetprotocol.[ch]
 /src/test*.aug
@@ -169,6 +172,7 @@
 /src/virt-aa-helper
 /src/virtlockd
 /src/virtlogd
+/src/virtproxyd
 /src/virt-guest-shutdown.target
 /tests/*.log
 /tests/*.pid
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 6f96fbec33..2acff40ea7 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1527,6 +1527,12 @@ exit 0
 %{_unitdir}/libvirtd-admin.socket
 %{_unitdir}/libvirtd-tcp.socket
 %{_unitdir}/libvirtd-tls.socket
+%{_unitdir}/virtproxyd.service
+%{_unitdir}/virtproxyd.socket
+%{_unitdir}/virtproxyd-ro.socket
+%{_unitdir}/virtproxyd-admin.socket
+%{_unitdir}/virtproxyd-tcp.socket
+%{_unitdir}/virtproxyd-tls.socket
 %{_unitdir}/virt-guest-shutdown.target
 %{_unitdir}/virtlogd.service
 %{_unitdir}/virtlogd.socket
@@ -1538,6 +1544,7 @@ exit 0
 %config(noreplace) %{_sysconfdir}/sysconfig/virtlogd
 %config(noreplace) %{_sysconfdir}/sysconfig/virtlockd
 %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
+%config(noreplace) %{_sysconfdir}/libvirt/virtproxyd.conf
 %config(noreplace) %{_sysconfdir}/libvirt/virtlogd.conf
 %config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf
 %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
@@ -1565,6 +1572,8 @@ exit 0
 %{_datadir}/augeas/lenses/tests/test_virtlogd.aug
 %{_datadir}/augeas/lenses/virtlockd.aug
 %{_datadir}/augeas/lenses/tests/test_virtlockd.aug
+%{_datadir}/augeas/lenses/virtproxyd.aug
+%{_datadir}/augeas/lenses/tests/test_virtproxyd.aug
 %{_datadir}/augeas/lenses/libvirt_lockd.aug
 %if %{with_qemu}
 %{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug
@@ -1579,6 +1588,7 @@ exit 0
 %attr(0755, root, root) %{_libexecdir}/libvirt_iohelper
=20
 %attr(0755, root, root) %{_sbindir}/libvirtd
+%attr(0755, root, root) %{_sbindir}/virtproxyd
 %attr(0755, root, root) %{_sbindir}/virtlogd
 %attr(0755, root, root) %{_sbindir}/virtlockd
=20
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index c08d59df1f..0a3aef1ec1 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -89,18 +89,40 @@ SYSCONF_FILES +=3D remote/libvirtd.sysconf
 PODFILES +=3D remote/libvirtd.pod
 MANINFILES +=3D libvirtd.8.in
=20
-LIBVIRTD_UNIT_FILES_IN =3D \
-	remote/libvirtd.service.in \
+LIBVIRTD_SOCKET_UNIT_FILES_IN =3D \
 	remote/libvirtd.socket.in \
 	remote/libvirtd-ro.socket.in \
 	remote/libvirtd-admin.socket.in \
 	remote/libvirtd-tcp.socket.in \
 	remote/libvirtd-tls.socket.in \
+	$(NULL)
+
+LIBVIRTD_SOCKET_UNIT_FILES =3D $(notdir $(LIBVIRTD_SOCKET_UNIT_FILES_IN:%.=
in=3D%))
+
+LIBVIRTD_UNIT_FILES_IN =3D \
+	remote/libvirtd.service.in \
+	$(LIBVIRTD_SOCKET_UNIT_FILES_IN) \
+	$(NULL)
+
+VIRTPROXYD_UNIT_FILES_IN =3D \
+	remote/virtproxyd.service.in \
+	$(NULL)
+
+GUEST_UNIT_FILES_IN =3D \
 	remote/virt-guest-shutdown.target.in \
 	$(NULL)
=20
-SYSTEMD_UNIT_FILES +=3D $(notdir $(LIBVIRTD_UNIT_FILES_IN:%.in=3D%))
-SYSTEMD_UNIT_FILES_IN +=3D $(LIBVIRTD_UNIT_FILES_IN)
+
+SYSTEMD_UNIT_FILES +=3D \
+	$(notdir $(LIBVIRTD_UNIT_FILES_IN:%.in=3D%)) \
+	$(notdir $(LIBVIRTD_UNIT_FILES_IN:remote/libvirtd%.in=3Dremote/virtproxyd=
%)) \
+	$(notdir $(GUEST_UNIT_FILES_IN:%.in=3D%)) \
+	$(NULL)
+SYSTEMD_UNIT_FILES_IN +=3D \
+	$(LIBVIRTD_UNIT_FILES_IN) \
+	$(VIRTPROXYD_UNIT_FILES_IN) \
+	$(GUEST_UNIT_FILES_IN) \
+	$(NULL)
=20
 REMOTE_PROTOCOL =3D $(srcdir)/remote/remote_protocol.x
 LXC_PROTOCOL =3D $(srcdir)/remote/lxc_protocol.x
@@ -138,6 +160,7 @@ MAINTAINERCLEANFILES +=3D \
 	$(NULL)
 CLEANFILES +=3D \
 	remote/libvirtd.conf \
+	remote/virtproxyd.conf \
 	$(NULL)
=20
 if WITH_REMOTE
@@ -168,15 +191,27 @@ endif ! WITH_REMOTE
=20
 if WITH_LIBVIRTD
=20
-sbin_PROGRAMS +=3D libvirtd
+sbin_PROGRAMS +=3D libvirtd virtproxyd
=20
-augeas_DATA +=3D remote/libvirtd.aug
+augeas_DATA +=3D \
+	remote/libvirtd.aug \
+	remote/virtproxyd.aug \
+	$(NULL)
=20
-augeastest_DATA +=3D remote/test_libvirtd.aug
+augeastest_DATA +=3D \
+	remote/test_libvirtd.aug \
+	remote/test_virtproxyd.aug \
+	$(NULL)
=20
-nodist_conf_DATA +=3D remote/libvirtd.conf
+nodist_conf_DATA +=3D \
+	remote/libvirtd.conf \
+	remote/virtproxyd.conf \
+	$(NULL)
=20
-CLEANFILES +=3D remote/libvirtd.aug
+CLEANFILES +=3D \
+	remote/libvirtd.aug \
+	remote/virtproxyd.aug \
+	$(NULL)
=20
 man8_MANS +=3D libvirtd.8
=20
@@ -187,12 +222,23 @@ libvirtd_CFLAGS =3D \
 	-DSOCK_PREFIX=3D"\"libvirt\"" \
 	-DDAEMON_NAME=3D"\"libvirtd\"" \
 	-DWITH_IP \
+	-DLIBVIRTD \
 	$(NULL)
=20
 libvirtd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS)
=20
 libvirtd_LDADD =3D $(REMOTE_DAEMON_LD_ADD)
=20
+virtproxyd_SOURCES =3D $(REMOTE_DAEMON_SOURCES)
+virtproxyd_CFLAGS =3D \
+	$(REMOTE_DAEMON_CFLAGS) \
+	-DSOCK_PREFIX=3D"\"libvirt\"" \
+	-DDAEMON_NAME=3D"\"virtproxyd\"" \
+	-DENABLE_IP \
+	$(NULL)
+virtproxyd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS)
+virtproxyd_LDADD =3D $(REMOTE_DAEMON_LD_ADD)
+
 remote/libvirtd.conf: remote/libvirtd.conf.in
 	$(AM_V_GEN)$(SED) \
 		-e '/[@]CUT_ENABLE_IP[@]/d' \
@@ -201,6 +247,13 @@ remote/libvirtd.conf: remote/libvirtd.conf.in
 		-e 's|[@]DAEMON_NAME[@]|libvirtd|' \
 		$< > $@
=20
+remote/virtproxyd.conf: remote/libvirtd.conf.in
+	$(AM_V_GEN)sed \
+		-e '/[@]CUT_ENABLE_IP[@]/d' \
+		-e '/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtproxyd/' \
+		$< > $@
+
 INSTALL_DATA_DIRS +=3D remote
=20
 install-data-remote:
@@ -218,6 +271,14 @@ remote/libvirtd.aug: remote/libvirtd.aug.in
 		-e 's|[@]DAEMON_NAME_UC[@]|Libvirtd|' \
 		$< > $@
=20
+remote/virtproxyd.aug: remote/libvirtd.aug.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/d' \
+		-e '/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtproxyd/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtproxyd/' \
+		$< > $@
+
 remote/test_libvirtd.aug: remote/test_libvirtd.aug.in \
 		remote/libvirtd.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) remote/libvirtd.conf \
@@ -230,6 +291,17 @@ remote/test_libvirtd.aug: remote/test_libvirtd.aug.in \
 		-e 's|[@]DAEMON_NAME_UC[@]|Libvirtd|' \
 		> $@ || rm -f $@
=20
+remote/test_virtproxyd.aug: remote/test_libvirtd.aug.in \
+		remote/virtproxyd.conf $(AUG_GENTEST)
+	$(AM_V_GEN)$(AUG_GENTEST) remote/virtproxyd.conf \
+		$(srcdir)/remote/test_libvirtd.aug.in | \
+		$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/d' \
+		-e '/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtproxyd/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtproxyd/' \
+		> $@ || rm -f $@
+
 if WITH_SYSCTL
 # Use $(prefix)/lib rather than $(libdir), since man sysctl.d insists on
 # /usr/lib/sysctl.d/ even when libdir is /usr/lib64
@@ -304,12 +376,30 @@ LIBVIRTD_UNIT_VARS =3D \
 	-e 's|[@]deps[@]||g' \
 	$(NULL)
=20
+VIRTD_UNIT_VARS =3D \
+	$(COMMON_UNIT_VARS) \
+	-e 's|[@]deps[@]|Conflicts=3D$(LIBVIRTD_SOCKET_UNIT_FILES)|g' \
+	$(NULL)
+
+VIRTPROXYD_UNIT_VARS =3D \
+	$(VIRTD_UNIT_VARS) \
+	-e 's|[@]name[@]|Libvirt proxy|g' \
+	-e 's|[@]service[@]|virtproxyd|g' \
+	-e 's|[@]sockprefix[@]|libvirt|g' \
+	$(NULL)
+
 libvirtd.service: remote/libvirtd.service.in $(top_builddir)/config.status
 	$(AM_V_GEN)$(SED) $(LIBVIRTD_UNIT_VARS) $< > $@-t && mv $@-t $@
=20
 libvirt%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
 	$(AM_V_GEN)$(SED) $(LIBVIRTD_UNIT_VARS) $< > $@-t && mv $@-t $@
=20
+virtproxyd.service: remote/virtproxyd.service.in $(top_builddir)/config.st=
atus
+	$(AM_V_GEN)$(SED) $(VIRTPROXYD_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+virtproxy%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
+	$(AM_V_GEN)$(SED) $(VIRTPROXYD_UNIT_VARS) $< > $@-t && mv $@-t $@
+
 virt-guest-shutdown.target: remote/virt-guest-shutdown.target.in \
 			$(top_builddir)/config.status
 	$(AM_V_GEN)cp $< $@
diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index ad3c163120..8da2f16fb1 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -311,10 +311,16 @@ static int daemonErrorLogFilter(virErrorPtr err, int =
priority)
=20
 static int daemonInitialize(void)
 {
-#ifdef MODULE_NAME
+#ifndef LIBVIRTD
+# ifdef MODULE_NAME
     /* This a dedicated per-driver daemon build */
     if (virDriverLoadModule(MODULE_NAME, MODULE_NAME "Register", true) < 0)
         return -1;
+# else
+    /* This is virtproxyd which merely proxies to the per-driver
+     * daemons for back compat, and also allows IP connectivity.
+     */
+# endif
 #else
     /* This is the legacy monolithic libvirtd built with all drivers
      *
@@ -906,9 +912,9 @@ daemonUsage(const char *argv0, bool privileged)
         { "-h | --help", N_("Display program help") },
         { "-v | --verbose", N_("Verbose messages") },
         { "-d | --daemon", N_("Run as a daemon & write PID file") },
-#ifdef WITH_IP
+#if defined(WITH_IP) && defined(LIBVIRTD)
         { "-l | --listen", N_("Listen for TCP/IP connections") },
-#endif /* !WITH_IP */
+#endif /* !WITH_IP && !LIBVIRTD */
         { "-t | --timeout <secs>", N_("Exit after timeout period") },
         { "-f | --config <file>", N_("Configuration file") },
         { "-V | --version", N_("Display version information") },
@@ -986,7 +992,11 @@ int main(int argc, char **argv) {
     int verbose =3D 0;
     int godaemon =3D 0;
 #ifdef WITH_IP
+# ifdef LIBVIRTD
     int ipsock =3D 0;
+# else /* ! LIBVIRTD */
+    int ipsock =3D 1; /* listen_tcp/listen_tls default to 0 */
+# endif /* ! LIBVIRTD */
 #endif /* ! WITH_IP */
     struct daemonConfig *config;
     bool privileged =3D geteuid() =3D=3D 0 ? true : false;
@@ -997,9 +1007,9 @@ int main(int argc, char **argv) {
     struct option opts[] =3D {
         { "verbose", no_argument, &verbose, 'v'},
         { "daemon", no_argument, &godaemon, 'd'},
-#ifdef WITH_IP
+#if defined(WITH_IP) && defined(LIBVIRTD)
         { "listen", no_argument, &ipsock, 'l'},
-#endif /* ! WITH_IP */
+#endif /* !WITH_IP && !LIBVIRTD */
         { "config", required_argument, NULL, 'f'},
         { "timeout", required_argument, NULL, 't'},
         { "pid-file", required_argument, NULL, 'p'},
@@ -1022,11 +1032,11 @@ int main(int argc, char **argv) {
         int optidx =3D 0;
         int c;
         char *tmp;
-#ifdef WITH_IP
+#if defined(WITH_IP) && defined(LIBVIRTD)
         const char *optstr =3D "ldf:p:t:vVh";
-#else /* ! WITH_IP */
+#else /* ! WITH_IP && ! LIBVIRTD */
         const char *optstr =3D "df:p:t:vVh";
-#endif /* ! WITH_IP */
+#endif /* ! WITH_IP && ! LIBVIRTD */
=20
         c =3D getopt_long(argc, argv, optstr, opts, &optidx);
=20
@@ -1044,11 +1054,11 @@ int main(int argc, char **argv) {
             godaemon =3D 1;
             break;
=20
-#ifdef WITH_IP
+#if defined(WITH_IP) && defined(LIBVIRTD)
         case 'l':
             ipsock =3D 1;
             break;
-#endif /* ! WITH_IP */
+#endif /* ! WITH_IP && ! LIBVIRTD */
=20
         case 't':
             if (virStrToLong_i(optarg, &tmp, 10, &timeout) !=3D 0
diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_c=
onfig.c
index b74a1c242d..b224e75a18 100644
--- a/src/remote/remote_daemon_config.c
+++ b/src/remote/remote_daemon_config.c
@@ -108,7 +108,11 @@ daemonConfigNew(bool privileged ATTRIBUTE_UNUSED)
         return NULL;
=20
 #ifdef WITH_IP
-    data->listen_tls =3D 1;
+# ifdef LIBVIRTD
+    data->listen_tls =3D 1; /* Only honoured if --listen is set */
+# else /* ! LIBVIRTD */
+    data->listen_tls =3D 0; /* Always honoured, --listen doesn't exist. */
+# endif /* ! LIBVIRTD */
     data->listen_tcp =3D 0;
=20
     if (VIR_STRDUP(data->tls_port, LIBVIRTD_TLS_PORT) < 0 ||
diff --git a/src/remote/virtproxyd.service.in b/src/remote/virtproxyd.servi=
ce.in
new file mode 100644
index 0000000000..e99e2af19c
--- /dev/null
+++ b/src/remote/virtproxyd.service.in
@@ -0,0 +1,24 @@
+[Unit]
+Description=3DVirtualization daemon
+Conflicts=3Dlibvirtd.service
+Requires=3Dvirtproxyd.socket
+Requires=3Dvirtproxyd-ro.socket
+Requires=3Dvirtproxyd-admin.socket
+After=3Dnetwork.target
+After=3Ddbus.service
+After=3Dapparmor.service
+After=3Dlocal-fs.target
+Documentation=3Dman:libvirtd(8)
+Documentation=3Dhttps://libvirt.org
+
+[Service]
+Type=3Dnotify
+ExecStart=3D@sbindir@/virtproxyd --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+Restart=3Don-failure
+
+[Install]
+WantedBy=3Dmulti-user.target
+Also=3Dvirtproxyd.socket
+Also=3Dvirtproxyd-ro.socket
+Also=3Dvirtproxyd-admin.socket
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277220; cv=none;
	d=zoho.com; s=zohoarc;
	b=Jm54yx9pkErurYvLLqLcKCwrMAnwnpyGKfGu66cvrL6q6u96faZP0e6f9/7SFQ4KDS7RoqSY8lAWo8bC2qKKxo3+ei+InOnHwRzON7Umy6PLd68V3ukj6a5isihUeRNbOtntkKiFyy8cTk/77cfSHgSiGXrx9gajqM1tD1BVUqc=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277220;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=x02NjPl0oCsn9USn4RVjEXJ3ofnS0TscvVVB0rZ8umA=;
	b=c8/Ln4sOHvO/bk0v4W6OrEnPSHqK62T51gf3+x8+JkKTbJZuEh8oYkFE1GakikiysZSokeRjrJyGAwG+L8g0crxDK5EvrbRyR5QrSd4fSEC2HwTtQDNZLxkiuxckRR986GObklewyAmDh76tvxv2UDWmbdDFmMSlT6DvTkLO+Qw=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277220495301.91141032964117;
 Thu, 8 Aug 2019 08:13:40 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id 5F6578553D;
	Thu,  8 Aug 2019 15:13:39 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 3647360BE1;
	Thu,  8 Aug 2019 15:13:39 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id E179D180BA9B;
	Thu,  8 Aug 2019 15:13:38 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBb8J027515 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:37 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 3D6561001284; Thu,  8 Aug 2019 15:11:37 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 049CD1001948;
	Thu,  8 Aug 2019 15:11:35 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:23 +0100
Message-Id: <20190808151044.11385-22-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Christophe de Dinechin <dinechin@redhat.com>,
	Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 21/42] secret: introduce virtsecretd daemon
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]);
 Thu, 08 Aug 2019 15:13:39 +0000 (UTC)

The virtsecretd daemon will be responsible for providing the secret API
driver functionality. The secret driver is still loaded by the main
libvirtd daemon at this stage, so virtsecretd must not be running at
the same time.

Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                        |  4 ++
 libvirt.spec.in                   |  8 ++++
 src/secret/Makefile.inc.am        | 63 +++++++++++++++++++++++++++++++
 src/secret/virtsecretd.service.in | 24 ++++++++++++
 4 files changed, 99 insertions(+)
 create mode 100644 src/secret/virtsecretd.service.in

diff --git a/.gitignore b/.gitignore
index 9ad159ecfd..cf39177250 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,6 +166,9 @@
 /src/remote/virtproxyd.conf
 /src/rpc/virkeepaliveprotocol.[ch]
 /src/rpc/virnetprotocol.[ch]
+/src/secret/test_virtsecretd.aug
+/src/secret/virtsecretd.aug
+/src/secret/virtsecretd.conf
 /src/test*.aug
 /src/util/virkeycodetable*.h
 /src/util/virkeynametable*.h
@@ -173,6 +176,7 @@
 /src/virtlockd
 /src/virtlogd
 /src/virtproxyd
+/src/virtsecretd
 /src/virt-guest-shutdown.target
 /tests/*.log
 /tests/*.pid
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 2acff40ea7..31da3f7581 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1634,6 +1634,14 @@ exit 0
 %{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so
=20
 %files daemon-driver-secret
+%config(noreplace) %{_sysconfdir}/libvirt/virtsecretd.conf
+%{_datadir}/augeas/lenses/virtsecretd.aug
+%{_datadir}/augeas/lenses/tests/test_virtsecretd.aug
+%{_unitdir}/virtsecretd.service
+%{_unitdir}/virtsecretd.socket
+%{_unitdir}/virtsecretd-ro.socket
+%{_unitdir}/virtsecretd-admin.socket
+%attr(0755, root, root) %{_sbindir}/virtsecretd
 %{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so
=20
 %files daemon-driver-storage
diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am
index 7a1c8f8e1a..37f816406e 100644
--- a/src/secret/Makefile.inc.am
+++ b/src/secret/Makefile.inc.am
@@ -37,4 +37,67 @@ libvirt_driver_secret_la_LIBADD =3D \
 	$(NULL)
 libvirt_driver_secret_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF)
 libvirt_driver_secret_la_SOURCES =3D $(SECRET_DRIVER_SOURCES)
+
+sbin_PROGRAMS +=3D virtsecretd
+
+nodist_conf_DATA +=3D secret/virtsecretd.conf
+augeas_DATA +=3D secret/virtsecretd.aug
+augeastest_DATA +=3D secret/test_virtsecretd.aug
+CLEANFILES +=3D secret/virtsecretd.aug
+
+virtsecretd_SOURCES =3D $(REMOTE_DAEMON_SOURCES)
+virtsecretd_CFLAGS =3D \
+	$(REMOTE_DAEMON_CFLAGS) \
+	-DDAEMON_NAME=3D"\"virtsecretd\"" \
+	-DMODULE_NAME=3D"\"secret\"" \
+	$(NULL)
+virtsecretd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS)
+virtsecretd_LDADD =3D $(REMOTE_DAEMON_LD_ADD)
+
+SYSTEMD_UNIT_FILES +=3D \
+	virtsecretd.service \
+	virtsecretd.socket \
+	virtsecretd-ro.socket \
+	virtsecretd-admin.socket \
+	$(NULL)
+SYSTEMD_UNIT_FILES_IN +=3D \
+	secret/virtsecretd.service.in \
+	$(NULL)
+
+VIRTSECRETD_UNIT_VARS =3D \
+	$(VIRTD_UNIT_VARS) \
+	-e 's|[@]name[@]|Libvirt secret|g' \
+	-e 's|[@]service[@]|virtsecretd|g' \
+	-e 's|[@]sockprefix[@]|virtsecretd|g' \
+	$(NULL)
+
+virtsecretd.service: secret/virtsecretd.service.in $(top_builddir)/config.=
status
+	$(AM_V_GEN)$(SED) $(VIRTSECRETD_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+virtsecret%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
+	$(AM_V_GEN)$(SED) $(VIRTSECRETD_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+secret/virtsecretd.conf: remote/libvirtd.conf.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtsecretd/' \
+		$< > $@
+
+secret/virtsecretd.aug: remote/libvirtd.aug.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtsecretd/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtsecretd/' \
+		$< > $@
+
+secret/test_virtsecretd.aug: remote/test_libvirtd.aug.in \
+		secret/virtsecretd.conf $(AUG_GENTEST)
+	$(AM_V_GEN)$(AUG_GENTEST) secret/virtsecretd.conf \
+		$(srcdir)/remote/test_libvirtd.aug.in | \
+		$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtsecretd/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtsecretd/' \
+		> $@ || rm -f $@
+
 endif WITH_SECRETS
diff --git a/src/secret/virtsecretd.service.in b/src/secret/virtsecretd.ser=
vice.in
new file mode 100644
index 0000000000..00cdc26b97
--- /dev/null
+++ b/src/secret/virtsecretd.service.in
@@ -0,0 +1,24 @@
+[Unit]
+Description=3DVirtualization secret daemon
+Conflicts=3Dlibvirtd.service
+Requires=3Dvirtsecretd.socket
+Requires=3Dvirtsecretd-ro.socket
+Requires=3Dvirtsecretd-admin.socket
+After=3Dnetwork.target
+After=3Ddbus.service
+After=3Dapparmor.service
+After=3Dlocal-fs.target
+Documentation=3Dman:libvirtd(8)
+Documentation=3Dhttps://libvirt.org
+
+[Service]
+Type=3Dnotify
+ExecStart=3D@sbindir@/virtsecretd --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+Restart=3Don-failure
+
+[Install]
+WantedBy=3Dmulti-user.target
+Also=3Dvirtsecretd.socket
+Also=3Dvirtsecretd-ro.socket
+Also=3Dvirtsecretd-admin.socket
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277224; cv=none;
	d=zoho.com; s=zohoarc;
	b=J7bThi/xNrJuyK85x6E2PlYru7zTz39N41d+6ePY7tbUphuXVMF/t8BuweNO6q9MYE7/urhUy8RpzBPgckHmrDJhDctkfPaJiIffuZrqB1lk9uyItyn6lykRawYQvQn+yLKZArjp3AkgsotvrVkVyJdI7v2dqHRkfQVepV+wM80=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277224;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=FE5UHrizlPdmTwtxNWiUyVMr+HNYd4I8ypQs5lTu80Y=;
	b=g9U1DzLhsToCOrYtXvc0YeQ2gRQPkA8di1cDwCShI41/cM19vCHsA12dw6o0v3tPbOGY6bUEmUoJFpIVfzczDQSn5TGcbMVQ/+JLVkAzqxAtkeBykyuG1jI7HrcXR7WTuN0FqxW4C7EaRUXggGV2M/UeM1pcZCMbHVMvux04uOU=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277224914937.4933346467028;
 Thu, 8 Aug 2019 08:13:44 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
 [10.5.11.22])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 26C1A316EFEC;
	Thu,  8 Aug 2019 15:13:43 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id EF9F31001955;
	Thu,  8 Aug 2019 15:13:42 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id B0565180BAA1;
	Thu,  8 Aug 2019 15:13:42 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBfB4027526 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:41 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id D900F100EBD3; Thu,  8 Aug 2019 15:11:41 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id A07B210002B9;
	Thu,  8 Aug 2019 15:11:37 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:24 +0100
Message-Id: <20190808151044.11385-23-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Christophe de Dinechin <dinechin@redhat.com>,
	Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 22/42] network: introduce virtnetworkd daemon
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]);
 Thu, 08 Aug 2019 15:13:44 +0000 (UTC)

The virtnetworkd daemon will be responsible for providing the network API
driver functionality. The network driver is still loaded by the main
libvirtd daemon at this stage, so virtnetworkd must not be running at
the same time.

Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                          |  4 ++
 libvirt.spec.in                     |  8 ++++
 src/network/Makefile.inc.am         | 62 +++++++++++++++++++++++++++++
 src/network/virtnetworkd.service.in | 25 ++++++++++++
 4 files changed, 99 insertions(+)
 create mode 100644 src/network/virtnetworkd.service.in

diff --git a/.gitignore b/.gitignore
index cf39177250..60713f6a5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -154,6 +154,9 @@
 /src/lxc/lxc_monitor_protocol.h
 /src/lxc/lxc_protocol.[ch]
 /src/lxc/test_libvirtd_lxc.aug
+/src/network/test_virtnetworkd.aug
+/src/network/virtnetworkd.aug
+/src/network/virtnetworkd.conf
 /src/qemu/test_libvirtd_qemu.aug
 /src/remote/*_client_bodies.h
 /src/remote/*_protocol.[ch]
@@ -175,6 +178,7 @@
 /src/virt-aa-helper
 /src/virtlockd
 /src/virtlogd
+/src/virtnetworkd
 /src/virtproxyd
 /src/virtsecretd
 /src/virt-guest-shutdown.target
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 31da3f7581..5c936d9de4 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1612,6 +1612,14 @@ exit 0
 %{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so
=20
 %files daemon-driver-network
+%config(noreplace) %{_sysconfdir}/libvirt/virtnetworkd.conf
+%{_datadir}/augeas/lenses/virtnetworkd.aug
+%{_datadir}/augeas/lenses/tests/test_virtnetworkd.aug
+%{_unitdir}/virtnetworkd.service
+%{_unitdir}/virtnetworkd.socket
+%{_unitdir}/virtnetworkd-ro.socket
+%{_unitdir}/virtnetworkd-admin.socket
+%attr(0755, root, root) %{_sbindir}/virtnetworkd
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart
diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
index 23cf39b6f4..091b722172 100644
--- a/src/network/Makefile.inc.am
+++ b/src/network/Makefile.inc.am
@@ -49,6 +49,68 @@ libvirt_driver_network_impl_la_CFLAGS =3D \
 libvirt_driver_network_impl_la_SOURCES =3D $(NETWORK_DRIVER_SOURCES)
 libvirt_driver_network_impl_la_LIBADD  =3D $(DBUS_LIBS) $(LIBXML_LIBS)
=20
+sbin_PROGRAMS +=3D virtnetworkd
+
+nodist_conf_DATA +=3D network/virtnetworkd.conf
+augeas_DATA +=3D network/virtnetworkd.aug
+augeastest_DATA +=3D network/test_virtnetworkd.aug
+CLEANFILES +=3D network/virtnetworkd.aug
+
+virtnetworkd_SOURCES =3D $(REMOTE_DAEMON_SOURCES)
+virtnetworkd_CFLAGS =3D \
+       $(REMOTE_DAEMON_CFLAGS) \
+       -DDAEMON_NAME=3D"\"virtnetworkd\"" \
+       -DMODULE_NAME=3D"\"network\"" \
+       $(NULL)
+virtnetworkd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS)
+virtnetworkd_LDADD =3D $(REMOTE_DAEMON_LD_ADD)
+
+SYSTEMD_UNIT_FILES +=3D \
+	virtnetworkd.service \
+	virtnetworkd.socket \
+	virtnetworkd-ro.socket \
+	virtnetworkd-admin.socket \
+	$(NULL)
+SYSTEMD_UNIT_FILES_IN +=3D \
+	network/virtnetworkd.service.in \
+	$(NULL)
+
+VIRTNETWORKD_UNIT_VARS =3D \
+	$(VIRTD_UNIT_VARS) \
+	-e 's|[@]name[@]|Libvirt network|g' \
+	-e 's|[@]service[@]|virtnetworkd|g' \
+	-e 's|[@]sockprefix[@]|virtnetworkd|g' \
+	$(NULL)
+
+virtnetworkd.service: network/virtnetworkd.service.in $(top_builddir)/conf=
ig.status
+	$(AM_V_GEN)$(SED) $(VIRTNETWORKD_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+virtnetwork%.socket: remote/libvirt%.socket.in $(top_builddir)/config.stat=
us
+	$(AM_V_GEN)$(SED) $(VIRTNETWORKD_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+network/virtnetworkd.conf: remote/libvirtd.conf.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtnetworkd/' \
+		$< > $@
+
+network/virtnetworkd.aug: remote/libvirtd.aug.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtnetworkd/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtnetworkd/' \
+		$< > $@
+
+network/test_virtnetworkd.aug: remote/test_libvirtd.aug.in \
+		network/virtnetworkd.conf $(AUG_GENTEST)
+	$(AM_V_GEN)$(AUG_GENTEST) network/virtnetworkd.conf \
+		$(srcdir)/remote/test_libvirtd.aug.in | \
+		$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtnetworkd/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtnetworkd/' \
+		> $@ || rm -f $@
+
 libexec_PROGRAMS +=3D libvirt_leaseshelper
 libvirt_leaseshelper_SOURCES =3D $(NETWORK_LEASES_HELPER_SOURCES)
 libvirt_leaseshelper_LDFLAGS =3D \
diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd=
.service.in
new file mode 100644
index 0000000000..656e8b4f84
--- /dev/null
+++ b/src/network/virtnetworkd.service.in
@@ -0,0 +1,25 @@
+[Unit]
+Description=3DVirtualization network daemon
+Conflicts=3Dlibvirtd.service
+Requires=3Dvirtnetworkd.socket
+Requires=3Dvirtnetworkd-ro.socket
+Requires=3Dvirtnetworkd-admin.socket
+After=3Dnetwork.target
+After=3Ddbus.service
+After=3Dapparmor.service
+After=3Dlocal-fs.target
+Documentation=3Dman:libvirtd(8)
+Documentation=3Dhttps://libvirt.org
+
+[Service]
+Type=3Dnotify
+ExecStart=3D@sbindir@/virtnetworkd --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+Restart=3Don-failure
+KillMode=3Dprocess
+
+[Install]
+WantedBy=3Dmulti-user.target
+Also=3Dvirtnetworkd.socket
+Also=3Dvirtnetworkd-ro.socket
+Also=3Dvirtnetworkd-admin.socket
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277228; cv=none;
	d=zoho.com; s=zohoarc;
	b=oFXOvTpKlVi+VTNmiqxpTshOCTG3XVQ8Yc/gmG4JH1Klxku0YT+YKiDqRUmGbaxW8MWAgmBiqkN+ACBu/BL6BkyzQHJ7e9jFq08iFhdmzYiZjCLin0ERurGgQM3XZY6/UZq+3Hc4Ch3bAJ+A0zord7F/TrrXetztDnlv07ZZlgg=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277228;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=pyilYHDoMMvhmv+INAXSLxA6JCJYLcUQ0oJKssJmgJk=;
	b=dgUNpZ64EdDzF1pvF1PeVRBEU3VLrf2lk/xu4zk1JTQdCfBnYrKeDWfBs/C/WqMy6Ty6Gou3q2ZbvrW2cT0MHxP+v6tsmXQdLOc4VDx/jNAQ/ifbl7QXaWYZ7/z3YLqHmNZyWEDByMXGHJheegZUyIZ8Z6Dsejz/XZz1ho52z44=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277228971491.7331576763802;
 Thu, 8 Aug 2019 08:13:48 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com
 [10.5.11.23])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 473CD30C62A7;
	Thu,  8 Aug 2019 15:13:47 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 1B0F4194B9;
	Thu,  8 Aug 2019 15:13:47 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id C9F98180BAA3;
	Thu,  8 Aug 2019 15:13:46 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBk3o027536 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:46 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 53CFF1001948; Thu,  8 Aug 2019 15:11:46 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 311041057F22;
	Thu,  8 Aug 2019 15:11:42 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:25 +0100
Message-Id: <20190808151044.11385-24-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Christophe de Dinechin <dinechin@redhat.com>,
	Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 23/42] interface: introduce virtinterfaced
	daemon
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]);
 Thu, 08 Aug 2019 15:13:48 +0000 (UTC)

The virtinterfaced daemon will be responsible for providing the interface A=
PI
driver functionality. The interface driver is still loaded by the main
libvirtd daemon at this stage, so virtinterfaced must not be running at
the same time.

Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                              |  4 ++
 libvirt.spec.in                         |  8 ++++
 src/interface/Makefile.inc.am           | 63 +++++++++++++++++++++++++
 src/interface/virtinterfaced.service.in | 24 ++++++++++
 4 files changed, 99 insertions(+)
 create mode 100644 src/interface/virtinterfaced.service.in

diff --git a/.gitignore b/.gitignore
index 60713f6a5f..02d657d54f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -120,6 +120,9 @@
 /src/admin/admin_server_dispatch_stubs.h
 /src/esx/*.generated.*
 /src/hyperv/*.generated.*
+/src/interface/test_virtinterfaced.aug
+/src/interface/virtinterfaced.aug
+/src/interface/virtinterfaced.conf
 /src/libvirt*.def
 /src/libvirt.syms
 /src/libvirt_access.syms
@@ -176,6 +179,7 @@
 /src/util/virkeycodetable*.h
 /src/util/virkeynametable*.h
 /src/virt-aa-helper
+/src/virtinterfaced
 /src/virtlockd
 /src/virtlogd
 /src/virtnetworkd
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 5c936d9de4..1458c4708d 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1609,6 +1609,14 @@ exit 0
 %ghost %{_sysconfdir}/libvirt/nwfilter/*.xml
=20
 %files daemon-driver-interface
+%config(noreplace) %{_sysconfdir}/libvirt/virtinterfaced.conf
+%{_datadir}/augeas/lenses/virtinterfaced.aug
+%{_datadir}/augeas/lenses/tests/test_virtinterfaced.aug
+%{_unitdir}/virtinterfaced.service
+%{_unitdir}/virtinterfaced.socket
+%{_unitdir}/virtinterfaced-ro.socket
+%{_unitdir}/virtinterfaced-admin.socket
+%attr(0755, root, root) %{_sbindir}/virtinterfaced
 %{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so
=20
 %files daemon-driver-network
diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am
index 339a92786b..a88df0bd11 100644
--- a/src/interface/Makefile.inc.am
+++ b/src/interface/Makefile.inc.am
@@ -41,4 +41,67 @@ libvirt_driver_interface_la_LIBADD +=3D $(UDEV_LIBS)
 libvirt_driver_interface_la_SOURCES +=3D $(INTERFACE_DRIVER_UDEV_SOURCES)
 endif WITH_UDEV
 libvirt_driver_interface_la_LIBADD +=3D ../gnulib/lib/libgnu.la
+
+sbin_PROGRAMS +=3D virtinterfaced
+
+nodist_conf_DATA +=3D interface/virtinterfaced.conf
+augeas_DATA +=3D interface/virtinterfaced.aug
+augeastest_DATA +=3D interface/test_virtinterfaced.aug
+CLEANFILES +=3D interface/virtinterfaced.aug
+
+virtinterfaced_SOURCES =3D $(REMOTE_DAEMON_SOURCES)
+virtinterfaced_CFLAGS =3D \
+       $(REMOTE_DAEMON_CFLAGS) \
+       -DDAEMON_NAME=3D"\"virtinterfaced\"" \
+       -DMODULE_NAME=3D"\"interface\"" \
+       $(NULL)
+virtinterfaced_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS)
+virtinterfaced_LDADD =3D $(REMOTE_DAEMON_LD_ADD)
+
+SYSTEMD_UNIT_FILES +=3D \
+	virtinterfaced.service \
+	virtinterfaced.socket \
+	virtinterfaced-ro.socket \
+	virtinterfaced-admin.socket \
+	$(NULL)
+SYSTEMD_UNIT_FILES_IN +=3D \
+	interface/virtinterfaced.service.in \
+	$(NULL)
+
+VIRTINTERFACED_UNIT_VARS =3D \
+	$(VIRTD_UNIT_VARS) \
+	-e 's|[@]name[@]|Libvirt interface|g' \
+	-e 's|[@]service[@]|virtinterfaced|g' \
+	-e 's|[@]sockprefix[@]|virtinterfaced|g' \
+	$(NULL)
+
+virtinterfaced.service: interface/virtinterfaced.service.in $(top_builddir=
)/config.status
+	$(AM_V_GEN)$(SED) $(VIRTINTERFACED_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+virtinterface%.socket: remote/libvirt%.socket.in $(top_builddir)/config.st=
atus
+	$(AM_V_GEN)$(SED) $(VIRTINTERFACED_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+interface/virtinterfaced.conf: remote/libvirtd.conf.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtinterfaced/' \
+		$< > $@
+
+interface/virtinterfaced.aug: remote/libvirtd.aug.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtinterfaced/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtinterfaced/' \
+		$< > $@
+
+interface/test_virtinterfaced.aug: remote/test_libvirtd.aug.in \
+		interface/virtinterfaced.conf $(AUG_GENTEST)
+	$(AM_V_GEN)$(AUG_GENTEST) interface/virtinterfaced.conf \
+		$(srcdir)/remote/test_libvirtd.aug.in | \
+		$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtinterfaced/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtinterfaced/' \
+		> $@ || rm -f $@
+
 endif WITH_INTERFACE
diff --git a/src/interface/virtinterfaced.service.in b/src/interface/virtin=
terfaced.service.in
new file mode 100644
index 0000000000..ff3a611d16
--- /dev/null
+++ b/src/interface/virtinterfaced.service.in
@@ -0,0 +1,24 @@
+[Unit]
+Description=3DVirtualization interface daemon
+Conflicts=3Dlibvirtd.service
+Requires=3Dvirtinterfaced.socket
+Requires=3Dvirtinterfaced-ro.socket
+Requires=3Dvirtinterfaced-admin.socket
+After=3Dnetwork.target
+After=3Ddbus.service
+After=3Dapparmor.service
+After=3Dlocal-fs.target
+Documentation=3Dman:libvirtd(8)
+Documentation=3Dhttps://libvirt.org
+
+[Service]
+Type=3Dnotify
+ExecStart=3D@sbindir@/virtinterfaced --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+Restart=3Don-failure
+
+[Install]
+WantedBy=3Dmulti-user.target
+Also=3Dvirtinterfaced.socket
+Also=3Dvirtinterfaced-ro.socket
+Also=3Dvirtinterfaced-admin.socket
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277307; cv=none;
	d=zoho.com; s=zohoarc;
	b=PzqtEc2y2v5cb+C0F36j+NBKdv13T3PVGi8GfDTboUG2679Y/E7iux1mBy3KwPbH16J5CBvnf3uVplCcNimFQtWgIG8NgSTRkyXML3kWGmRSzrXdyVWSL5s9OWWTp+QXPIfV61CMbHsugODlh4uhN1oz4bhfGL0GBu8+Z4A51yg=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277307;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=CN7tzhjSaDaYtlMF5ZKhqylQTcDRZs6SQGgTwk8T/jI=;
	b=l1qTXLWhiLa89yhXqNnhHcYnYq+fu3410eFhVeA8rcJxh1VYxAp88KtvVrl9fWbowxz85oGLq6iY0p7KzVShmmokHhT1xtKxeeRBgjyJNuXfk1Fh5jxrYY11rwTAvGXuKNnBKtoheVooZzG2drCIOSkIct2POaqRgYMGn27kLco=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 156527730726163.38550444321845;
 Thu, 8 Aug 2019 08:15:07 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 67C41308A958;
	Thu,  8 Aug 2019 15:15:05 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 2A60C6012A;
	Thu,  8 Aug 2019 15:15:05 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id B4793180221F;
	Thu,  8 Aug 2019 15:15:04 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBl4O027545 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:47 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id D6D871001955; Thu,  8 Aug 2019 15:11:47 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id A844E1001948;
	Thu,  8 Aug 2019 15:11:46 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:26 +0100
Message-Id: <20190808151044.11385-25-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Christophe de Dinechin <dinechin@redhat.com>,
	Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 24/42] storage: introduce virtstoraged daemon
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]);
 Thu, 08 Aug 2019 15:15:06 +0000 (UTC)

The virtstoraged daemon will be responsible for providing the storage API
driver functionality. The storage driver is still loaded by the main
libvirtd daemon at this stage, so virtstoraged must not be running at
the same time.

Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                          |  4 ++
 libvirt.spec.in                     |  8 ++++
 src/storage/Makefile.inc.am         | 62 +++++++++++++++++++++++++++++
 src/storage/virtstoraged.service.in | 26 ++++++++++++
 4 files changed, 100 insertions(+)
 create mode 100644 src/storage/virtstoraged.service.in

diff --git a/.gitignore b/.gitignore
index 02d657d54f..58a1ef1293 100644
--- a/.gitignore
+++ b/.gitignore
@@ -175,6 +175,9 @@
 /src/secret/test_virtsecretd.aug
 /src/secret/virtsecretd.aug
 /src/secret/virtsecretd.conf
+/src/storage/test_virtstoraged.aug
+/src/storage/virtstoraged.aug
+/src/storage/virtstoraged.conf
 /src/test*.aug
 /src/util/virkeycodetable*.h
 /src/util/virkeynametable*.h
@@ -185,6 +188,7 @@
 /src/virtnetworkd
 /src/virtproxyd
 /src/virtsecretd
+/src/virtstoraged
 /src/virt-guest-shutdown.target
 /tests/*.log
 /tests/*.pid
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 1458c4708d..35288b0e2d 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1663,6 +1663,14 @@ exit 0
 %files daemon-driver-storage
=20
 %files daemon-driver-storage-core
+%config(noreplace) %{_sysconfdir}/libvirt/virtstoraged.conf
+%{_datadir}/augeas/lenses/virtstoraged.aug
+%{_datadir}/augeas/lenses/tests/test_virtstoraged.aug
+%{_unitdir}/virtstoraged.service
+%{_unitdir}/virtstoraged.socket
+%{_unitdir}/virtstoraged-ro.socket
+%{_unitdir}/virtstoraged-admin.socket
+%attr(0755, root, root) %{_sbindir}/virtstoraged
 %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
 %{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so
 %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_fs.so
diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index 538709256d..fd0d57d2b6 100644
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -142,6 +142,68 @@ mod_LTLIBRARIES +=3D libvirt_driver_storage.la
 libvirt_driver_storage_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF)
 libvirt_driver_storage_impl_la_SOURCES +=3D $(STORAGE_DRIVER_SOURCES)
=20
+sbin_PROGRAMS +=3D virtstoraged
+
+nodist_conf_DATA +=3D storage/virtstoraged.conf
+augeas_DATA +=3D storage/virtstoraged.aug
+augeastest_DATA +=3D storage/test_virtstoraged.aug
+CLEANFILES +=3D storage/virtstoraged.aug
+
+virtstoraged_SOURCES =3D $(REMOTE_DAEMON_SOURCES)
+virtstoraged_CFLAGS =3D \
+       $(REMOTE_DAEMON_CFLAGS) \
+       -DDAEMON_NAME=3D"\"virtstoraged\"" \
+       -DMODULE_NAME=3D"\"storage\"" \
+       $(NULL)
+virtstoraged_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS)
+virtstoraged_LDADD =3D $(REMOTE_DAEMON_LD_ADD)
+
+SYSTEMD_UNIT_FILES +=3D \
+	virtstoraged.service \
+	virtstoraged.socket \
+	virtstoraged-ro.socket \
+	virtstoraged-admin.socket \
+	$(NULL)
+SYSTEMD_UNIT_FILES_IN +=3D \
+	storage/virtstoraged.service.in \
+	$(NULL)
+
+VIRTSTORAGED_UNIT_VARS =3D \
+	$(VIRTD_UNIT_VARS) \
+	-e 's|[@]name[@]|Libvirt storage|g' \
+	-e 's|[@]service[@]|virtstoraged|g' \
+	-e 's|[@]sockprefix[@]|virtstoraged|g' \
+	$(NULL)
+
+virtstoraged.service: storage/virtstoraged.service.in $(top_builddir)/conf=
ig.status
+	$(AM_V_GEN)$(SED) $(VIRTSTORAGED_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+virtstorage%.socket: remote/libvirt%.socket.in $(top_builddir)/config.stat=
us
+	$(AM_V_GEN)$(SED) $(VIRTSTORAGED_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+storage/virtstoraged.conf: remote/libvirtd.conf.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtstoraged/' \
+		$< > $@
+
+storage/virtstoraged.aug: remote/libvirtd.aug.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtstoraged/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtstoraged/' \
+		$< > $@
+
+storage/test_virtstoraged.aug: remote/test_libvirtd.aug.in \
+		storage/virtstoraged.conf $(AUG_GENTEST)
+	$(AM_V_GEN)$(AUG_GENTEST) storage/virtstoraged.conf \
+		$(srcdir)/remote/test_libvirtd.aug.in | \
+		$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtstoraged/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtstoraged/' \
+		> $@ || rm -f $@
+
=20
 libvirt_storage_backend_fs_la_SOURCES =3D $(STORAGE_DRIVER_FS_SOURCES)
 libvirt_storage_backend_fs_la_CFLAGS =3D \
diff --git a/src/storage/virtstoraged.service.in b/src/storage/virtstoraged=
.service.in
new file mode 100644
index 0000000000..9aa26764a9
--- /dev/null
+++ b/src/storage/virtstoraged.service.in
@@ -0,0 +1,26 @@
+[Unit]
+Description=3DVirtualization storage daemon
+Conflicts=3Dlibvirtd.service
+Requires=3Dvirtstoraged.socket
+Requires=3Dvirtstoraged-ro.socket
+Requires=3Dvirtstoraged-admin.socket
+After=3Dnetwork.target
+After=3Ddbus.service
+After=3Discsid.service
+After=3Dapparmor.service
+After=3Dlocal-fs.target
+After=3Dremote-fs.target
+Documentation=3Dman:libvirtd(8)
+Documentation=3Dhttps://libvirt.org
+
+[Service]
+Type=3Dnotify
+ExecStart=3D@sbindir@/virtstoraged --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+Restart=3Don-failure
+
+[Install]
+WantedBy=3Dmulti-user.target
+Also=3Dvirtstoraged.socket
+Also=3Dvirtstoraged-ro.socket
+Also=3Dvirtstoraged-admin.socket
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277258; cv=none;
	d=zoho.com; s=zohoarc;
	b=jNZHss8UUwNvinZm5v5yRTR8gHW63bIIY0My4viGFrDWR/HgNhdsCacjAUyTZ6337qF+mekX8VyeSy7yzjRUwxFWkKcsSrgFxhj/la1y+RXEjDcVAwxbNifXc2jomCObFd4bwDTFtaIlN+i135djPcI7OqsLLSg2SeBoX+s5tek=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277258;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=YfALX+gfG+VROZNKTUXUQUOrzDv6aFpEobwAHqUBWps=;
	b=Abdfj8Xoh11+ucqVcPFEPrH2mXt4Y+fhy+EiPX1nrYUsRFh7MUq0LXGdwrA9lJEs5zNObOwj7pnQtheBOjec4V7d9jjo0UXY7oRW6nYIp1wDgMj6ctVnW02vm6MVnJzCHUFgtG/0+errmMFN2gf8AJKe7OugmRKFnQUnSLLuOX4=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277258315835.807915555806;
 Thu, 8 Aug 2019 08:14:18 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com
 [10.5.11.23])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 1204230A5418;
	Thu,  8 Aug 2019 15:14:17 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id DF12B17F85;
	Thu,  8 Aug 2019 15:14:16 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9B6A11803B4D;
	Thu,  8 Aug 2019 15:14:16 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBngm027555 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:49 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 4CCE91001948; Thu,  8 Aug 2019 15:11:49 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 3E3A31001284;
	Thu,  8 Aug 2019 15:11:48 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:27 +0100
Message-Id: <20190808151044.11385-26-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 25/42] nodedev: introduce virtnodedevd daemon
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]);
 Thu, 08 Aug 2019 15:14:17 +0000 (UTC)

The virtnodedevd daemon will be responsible for providing the nodedev API
driver functionality. The nodedev driver is still loaded by the main
libvirtd daemon at this stage, so virtnodedevd must not be running at
the same time.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                              |  4 ++
 libvirt.spec.in                         |  8 ++++
 src/node_device/Makefile.inc.am         | 63 +++++++++++++++++++++++++
 src/node_device/virtnodedevd.service.in | 24 ++++++++++
 4 files changed, 99 insertions(+)
 create mode 100644 src/node_device/virtnodedevd.service.in

diff --git a/.gitignore b/.gitignore
index 58a1ef1293..c4f6c0ab2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -160,6 +160,9 @@
 /src/network/test_virtnetworkd.aug
 /src/network/virtnetworkd.aug
 /src/network/virtnetworkd.conf
+/src/node_device/test_virtnodedevd.aug
+/src/node_device/virtnodedevd.aug
+/src/node_device/virtnodedevd.conf
 /src/qemu/test_libvirtd_qemu.aug
 /src/remote/*_client_bodies.h
 /src/remote/*_protocol.[ch]
@@ -186,6 +189,7 @@
 /src/virtlockd
 /src/virtlogd
 /src/virtnetworkd
+/src/virtnodedevd
 /src/virtproxyd
 /src/virtsecretd
 /src/virtstoraged
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 35288b0e2d..a3c01e7d21 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1642,6 +1642,14 @@ exit 0
 %endif
=20
 %files daemon-driver-nodedev
+%config(noreplace) %{_sysconfdir}/libvirt/virtnodedevd.conf
+%{_datadir}/augeas/lenses/virtnodedevd.aug
+%{_datadir}/augeas/lenses/tests/test_virtnodedevd.aug
+%{_unitdir}/virtnodedevd.service
+%{_unitdir}/virtnodedevd.socket
+%{_unitdir}/virtnodedevd-ro.socket
+%{_unitdir}/virtnodedevd-admin.socket
+%attr(0755, root, root) %{_sbindir}/virtnodedevd
 %{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so
=20
 %files daemon-driver-nwfilter
diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc=
.am
index 3e04651e8c..5a6525d843 100644
--- a/src/node_device/Makefile.inc.am
+++ b/src/node_device/Makefile.inc.am
@@ -64,4 +64,67 @@ libvirt_driver_nodedev_la_LIBADD +=3D \
 endif WITH_UDEV
=20
 libvirt_driver_nodedev_la_LIBADD +=3D ../gnulib/lib/libgnu.la
+
+sbin_PROGRAMS +=3D virtnodedevd
+
+nodist_conf_DATA +=3D node_device/virtnodedevd.conf
+augeas_DATA +=3D node_device/virtnodedevd.aug
+augeastest_DATA +=3D node_device/test_virtnodedevd.aug
+CLEANFILES +=3D node_device/virtnodedevd.aug
+
+virtnodedevd_SOURCES =3D $(REMOTE_DAEMON_SOURCES)
+virtnodedevd_CFLAGS =3D \
+       $(REMOTE_DAEMON_CFLAGS) \
+       -DDAEMON_NAME=3D"\"virtnodedevd\"" \
+       -DMODULE_NAME=3D"\"nodedev\"" \
+       $(NULL)
+virtnodedevd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS)
+virtnodedevd_LDADD =3D $(REMOTE_DAEMON_LD_ADD)
+
+SYSTEMD_UNIT_FILES +=3D \
+	virtnodedevd.service \
+	virtnodedevd.socket \
+	virtnodedevd-ro.socket \
+	virtnodedevd-admin.socket \
+	$(NULL)
+SYSTEMD_UNIT_FILES_IN +=3D \
+	node_device/virtnodedevd.service.in \
+	$(NULL)
+
+VIRTNODEDEVD_UNIT_VARS =3D \
+	$(VIRTD_UNIT_VARS) \
+	-e 's|[@]name[@]|Libvirt nodedev|g' \
+	-e 's|[@]service[@]|virtnodedevd|g' \
+	-e 's|[@]sockprefix[@]|virtnodedevd|g' \
+	$(NULL)
+
+virtnodedevd.service: node_device/virtnodedevd.service.in $(top_builddir)/=
config.status
+	$(AM_V_GEN)$(SED) $(VIRTNODEDEVD_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+virtnodedev%.socket: remote/libvirt%.socket.in $(top_builddir)/config.stat=
us
+	$(AM_V_GEN)$(SED) $(VIRTNODEDEVD_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+node_device/virtnodedevd.conf: remote/libvirtd.conf.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtnodedevd/' \
+		$< > $@
+
+node_device/virtnodedevd.aug: remote/libvirtd.aug.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtnodedevd/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtnodedevd/' \
+		$< > $@
+
+node_device/test_virtnodedevd.aug: remote/test_libvirtd.aug.in \
+		node_device/virtnodedevd.conf $(AUG_GENTEST)
+	$(AM_V_GEN)$(AUG_GENTEST) node_device/virtnodedevd.conf \
+		$(srcdir)/remote/test_libvirtd.aug.in | \
+		$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtnodedevd/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtnodedevd/' \
+		> $@ || rm -f $@
+
 endif WITH_NODE_DEVICES
diff --git a/src/node_device/virtnodedevd.service.in b/src/node_device/virt=
nodedevd.service.in
new file mode 100644
index 0000000000..132ee05a7f
--- /dev/null
+++ b/src/node_device/virtnodedevd.service.in
@@ -0,0 +1,24 @@
+[Unit]
+Description=3DVirtualization nodedev daemon
+Conflicts=3Dlibvirtd.service
+Requires=3Dvirtnodedevd.socket
+Requires=3Dvirtnodedevd-ro.socket
+Requires=3Dvirtnodedevd-admin.socket
+After=3Dnetwork.target
+After=3Ddbus.service
+After=3Dapparmor.service
+After=3Dlocal-fs.target
+Documentation=3Dman:libvirtd(8)
+Documentation=3Dhttps://libvirt.org
+
+[Service]
+Type=3Dnotify
+ExecStart=3D@sbindir@/virtnodedevd --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+Restart=3Don-failure
+
+[Install]
+WantedBy=3Dmulti-user.target
+Also=3Dvirtnodedevd.socket
+Also=3Dvirtnodedevd-ro.socket
+Also=3Dvirtnodedevd-admin.socket
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277262; cv=none;
	d=zoho.com; s=zohoarc;
	b=N+MA4KsN20ML6Nz6JZ714fn3fD8p5rvmhUluCEksW8Rs41y+y0NkqfjFyCDnqbkq1UcKX0n8flCblKtksnlgCdEWY1F8Bij5Y8C4H46D1HeUZWLlH0uJkTQXYZcIzVbAY9shZiIpDdIkGKI+RcorYLtS4LWhGwm/SYXu2Rzp04s=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277262;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=W2kiTzSQcHTSyBh01WCyaP6Ehk6Iv6z1aQ2B3/Cuvoc=;
	b=Olyd7t6JtErlJFzxgYUcshXXyIOcCJj/bF4OIVBVUOqGvF9j0z+VrvunL7WTauTRoPdEVmZ2cik1VFi4Ie7eyQ6b+ouY8WWlnNo3RFKi2ppChUXtsNfwYZ+jUIo6b403jlOQrF5GZp03vPb2NqKQjRpM+6Sjyz25gohV7HF+Zsg=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 156527726253468.57517964397243;
 Thu, 8 Aug 2019 08:14:22 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com
 [10.5.11.23])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 50CAB3172D8B;
	Thu,  8 Aug 2019 15:14:21 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 0E11BF6DA;
	Thu,  8 Aug 2019 15:14:21 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id A78841C8A;
	Thu,  8 Aug 2019 15:14:20 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBod6027567 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:50 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id B6C911001956; Thu,  8 Aug 2019 15:11:50 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id A32911001948;
	Thu,  8 Aug 2019 15:11:49 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:28 +0100
Message-Id: <20190808151044.11385-27-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 26/42] nwfilter: introduce virtnwfilterd daemon
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]);
 Thu, 08 Aug 2019 15:14:21 +0000 (UTC)

The virtnwfilterd daemon will be responsible for providing the nwfilter API
driver functionality. The nwfilter driver is still loaded by the main
libvirtd daemon at this stage, so virtnwfilterd must not be running at
the same time.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                            |  4 ++
 libvirt.spec.in                       |  8 ++++
 src/nwfilter/Makefile.inc.am          | 63 +++++++++++++++++++++++++++
 src/nwfilter/virtnwfilterd.service.in | 24 ++++++++++
 4 files changed, 99 insertions(+)
 create mode 100644 src/nwfilter/virtnwfilterd.service.in

diff --git a/.gitignore b/.gitignore
index c4f6c0ab2f..e726ecff98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -163,6 +163,9 @@
 /src/node_device/test_virtnodedevd.aug
 /src/node_device/virtnodedevd.aug
 /src/node_device/virtnodedevd.conf
+/src/nwfilter/test_virtnwfilterd.aug
+/src/nwfilter/virtnwfilterd.aug
+/src/nwfilter/virtnwfilterd.conf
 /src/qemu/test_libvirtd_qemu.aug
 /src/remote/*_client_bodies.h
 /src/remote/*_protocol.[ch]
@@ -190,6 +193,7 @@
 /src/virtlogd
 /src/virtnetworkd
 /src/virtnodedevd
+/src/virtnwfilterd
 /src/virtproxyd
 /src/virtsecretd
 /src/virtstoraged
diff --git a/libvirt.spec.in b/libvirt.spec.in
index a3c01e7d21..6f94ccaf32 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1653,6 +1653,14 @@ exit 0
 %{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so
=20
 %files daemon-driver-nwfilter
+%config(noreplace) %{_sysconfdir}/libvirt/virtnwfilterd.conf
+%{_datadir}/augeas/lenses/virtnwfilterd.aug
+%{_datadir}/augeas/lenses/tests/test_virtnwfilterd.aug
+%{_unitdir}/virtnwfilterd.service
+%{_unitdir}/virtnwfilterd.socket
+%{_unitdir}/virtnwfilterd-ro.socket
+%{_unitdir}/virtnwfilterd-admin.socket
+%attr(0755, root, root) %{_sbindir}/virtnwfilterd
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/
 %ghost %dir %{_localstatedir}/run/libvirt/network/
 %{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so
diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am
index 810ca54bcc..277f75a9bd 100644
--- a/src/nwfilter/Makefile.inc.am
+++ b/src/nwfilter/Makefile.inc.am
@@ -41,4 +41,67 @@ libvirt_driver_nwfilter_impl_la_LIBADD =3D \
 	../gnulib/lib/libgnu.la \
 	$(NULL)
 libvirt_driver_nwfilter_impl_la_SOURCES =3D $(NWFILTER_DRIVER_SOURCES)
+
+sbin_PROGRAMS +=3D virtnwfilterd
+
+nodist_conf_DATA +=3D nwfilter/virtnwfilterd.conf
+augeas_DATA +=3D nwfilter/virtnwfilterd.aug
+augeastest_DATA +=3D nwfilter/test_virtnwfilterd.aug
+CLEANFILES +=3D nwfilter/virtnwfilterd.aug
+
+virtnwfilterd_SOURCES =3D $(REMOTE_DAEMON_SOURCES)
+virtnwfilterd_CFLAGS =3D \
+       $(REMOTE_DAEMON_CFLAGS) \
+       -DDAEMON_NAME=3D"\"virtnwfilterd\"" \
+       -DMODULE_NAME=3D"\"nwfilter\"" \
+       $(NULL)
+virtnwfilterd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS)
+virtnwfilterd_LDADD =3D $(REMOTE_DAEMON_LD_ADD)
+
+SYSTEMD_UNIT_FILES +=3D \
+	virtnwfilterd.service \
+	virtnwfilterd.socket \
+	virtnwfilterd-ro.socket \
+	virtnwfilterd-admin.socket \
+	$(NULL)
+SYSTEMD_UNIT_FILES_IN +=3D \
+	nwfilter/virtnwfilterd.service.in \
+	$(NULL)
+
+VIRTNWFILTERD_UNIT_VARS =3D \
+	$(VIRTD_UNIT_VARS) \
+	-e 's|[@]name[@]|Libvirt nwfilter|g' \
+	-e 's|[@]service[@]|virtnwfilterd|g' \
+	-e 's|[@]sockprefix[@]|virtnwfilterd|g' \
+	$(NULL)
+
+virtnwfilterd.service: nwfilter/virtnwfilterd.service.in $(top_builddir)/c=
onfig.status
+	$(AM_V_GEN)$(SED) $(VIRTNWFILTERD_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+virtnwfilter%.socket: remote/libvirt%.socket.in $(top_builddir)/config.sta=
tus
+	$(AM_V_GEN)$(SED) $(VIRTNWFILTERD_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+nwfilter/virtnwfilterd.conf: remote/libvirtd.conf.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtnwfilterd/' \
+		$< > $@
+
+nwfilter/virtnwfilterd.aug: remote/libvirtd.aug.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtnwfilterd/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtnwfilterd/' \
+		$< > $@
+
+nwfilter/test_virtnwfilterd.aug: remote/test_libvirtd.aug.in \
+		nwfilter/virtnwfilterd.conf $(AUG_GENTEST)
+	$(AM_V_GEN)$(AUG_GENTEST) nwfilter/virtnwfilterd.conf \
+		$(srcdir)/remote/test_libvirtd.aug.in | \
+		$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtnwfilterd/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtnwfilterd/' \
+		> $@ || rm -f $@
+
 endif WITH_NWFILTER
diff --git a/src/nwfilter/virtnwfilterd.service.in b/src/nwfilter/virtnwfil=
terd.service.in
new file mode 100644
index 0000000000..57c2fafe43
--- /dev/null
+++ b/src/nwfilter/virtnwfilterd.service.in
@@ -0,0 +1,24 @@
+[Unit]
+Description=3DVirtualization nwfilter daemon
+Conflicts=3Dlibvirtd.service
+Requires=3Dvirtnwfilterd.socket
+Requires=3Dvirtnwfilterd-ro.socket
+Requires=3Dvirtnwfilterd-admin.socket
+After=3Dnetwork.target
+After=3Ddbus.service
+After=3Dapparmor.service
+After=3Dlocal-fs.target
+Documentation=3Dman:libvirtd(8)
+Documentation=3Dhttps://libvirt.org
+
+[Service]
+Type=3Dnotify
+ExecStart=3D@sbindir@/virtnwfilterd --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+Restart=3Don-failure
+
+[Install]
+WantedBy=3Dmulti-user.target
+Also=3Dvirtnwfilterd.socket
+Also=3Dvirtnwfilterd-ro.socket
+Also=3Dvirtnwfilterd-admin.socket
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277312; cv=none;
	d=zoho.com; s=zohoarc;
	b=oW7mBnvpugAuQUIa8or51H90tlpGRegoygW6p0oZZtFcJw1y1aaXInUYBzGvFRYekl0WtWOeJbTujlHiimqVgzyu/hmJm13Gijb5mqrLkQwQWeme22+8YDhgr7PXo6BZKoxM1kSwpzPH0z9dlCwi64buK/bVs+SqXOfNkLtQWtw=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277312;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=a7vq5B9uO04eDTFJEqI1J9PpWKomBR3WZUBMHUp3FeY=;
	b=N2i6C9fi3ZS43/CJWKKUz6E1/SswJTsSOc8ggyoXRUi7SafJ+HSghv6C3mSZ6ENr9ExTRa0sptUFfcK0LNP270IiSAIE12omHfa970JOqbijhHZNv+ue/3/ORoTYsZAWTVuwf5wjR6xpHo5bKhdL0ekDEtmp7uFX2sJRG29eftI=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277312337564.9794982112004;
 Thu, 8 Aug 2019 08:15:12 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id E17CA30C75B1;
	Thu,  8 Aug 2019 15:15:10 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 9C7C06012A;
	Thu,  8 Aug 2019 15:15:10 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3804418037CA;
	Thu,  8 Aug 2019 15:15:10 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBqKn027572 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:52 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 315551001956; Thu,  8 Aug 2019 15:11:52 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 17E821001948;
	Thu,  8 Aug 2019 15:11:50 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:29 +0100
Message-Id: <20190808151044.11385-28-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 27/42] libxl: introduce virtxend daemon
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]);
 Thu, 08 Aug 2019 15:15:11 +0000 (UTC)

The virtxend daemon will be responsible for providing the libxl API
driver functionality. The libxl driver is still loaded by the main
libvirtd daemon at this stage, so virtxend must not be running at
the same time.

This naming is slightly different than other drivers. With the libxl
driver, the user still has a 'xen:///system' URI, and we provide it
in a libvirt-daemon-xen RPM, which pulls in a
libvirt-daemon-driver-libxl RPM.

Arguably we could rename the libxl driver to "xen" since it is the
only xen driver we have these days, and that matches how we expose it
to users in the URI naming.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                    |  4 +++
 libvirt.spec.in               |  8 +++++
 src/libxl/Makefile.inc.am     | 63 +++++++++++++++++++++++++++++++++++
 src/libxl/virtxend.service.in | 29 ++++++++++++++++
 4 files changed, 104 insertions(+)
 create mode 100644 src/libxl/virtxend.service.in

diff --git a/.gitignore b/.gitignore
index e726ecff98..0c6fa0c771 100644
--- a/.gitignore
+++ b/.gitignore
@@ -139,6 +139,9 @@
 /src/libvirtd
 /src/libvirtd*.logrotate
 /src/libxl/test_libvirtd_libxl.aug
+/src/libxl/test_virtxend.aug
+/src/libxl/virtxend.aug
+/src/libxl/virtxend.conf
 /src/locking/libxl-lockd.conf
 /src/locking/libxl-sanlock.conf
 /src/locking/lock_daemon_dispatch_stubs.h
@@ -189,6 +192,7 @@
 /src/util/virkeynametable*.h
 /src/virt-aa-helper
 /src/virtinterfaced
+/src/virtxend
 /src/virtlockd
 /src/virtlogd
 /src/virtnetworkd
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 6f94ccaf32..9615fff19b 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1765,6 +1765,14 @@ exit 0
=20
 %if %{with_libxl}
 %files daemon-driver-libxl
+%config(noreplace) %{_sysconfdir}/libvirt/virtxend.conf
+%{_datadir}/augeas/lenses/virtxend.aug
+%{_datadir}/augeas/lenses/tests/test_virtxend.aug
+%{_unitdir}/virtxend.service
+%{_unitdir}/virtxend.socket
+%{_unitdir}/virtxend-ro.socket
+%{_unitdir}/virtxend-admin.socket
+%attr(0755, root, root) %{_sbindir}/virtxend
 %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl
 %config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf
diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index 467c2720b2..1587404586 100644
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -65,6 +65,69 @@ libvirt_driver_libxl_impl_la_LIBADD =3D \
 	$(NULL)
 libvirt_driver_libxl_impl_la_SOURCES =3D $(LIBXL_DRIVER_SOURCES)
=20
+sbin_PROGRAMS +=3D virtxend
+
+nodist_conf_DATA +=3D libxl/virtxend.conf
+augeas_DATA +=3D libxl/virtxend.aug
+augeastest_DATA +=3D libxl/test_virtxend.aug
+CLEANFILES +=3D libxl/virtxend.aug
+
+virtxend_SOURCES =3D $(REMOTE_DAEMON_SOURCES)
+virtxend_CFLAGS =3D \
+       $(REMOTE_DAEMON_CFLAGS) \
+       -DDAEMON_NAME=3D"\"virtxend\"" \
+       -DMODULE_NAME=3D"\"libxl\"" \
+       $(NULL)
+virtxend_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS)
+virtxend_LDADD =3D $(REMOTE_DAEMON_LD_ADD)
+
+SYSTEMD_UNIT_FILES +=3D \
+	virtxend.service \
+	virtxend.socket \
+	virtxend-ro.socket \
+	virtxend-admin.socket \
+	$(NULL)
+SYSTEMD_UNIT_FILES_IN +=3D \
+	libxl/virtxend.service.in \
+	$(NULL)
+
+VIRTXEND_UNIT_VARS =3D \
+	$(COMMON_UNIT_VARS) \
+	-e 's|[@]deps[@]|Conflicts=3D$(LIBVIRTD_SOCKET_UNIT_FILES)\nConditionPath=
Exists=3D/proc/xen/capabilities|g' \
+	-e 's|[@]name[@]|Libvirt libxl|g' \
+	-e 's|[@]service[@]|virtxend|g' \
+	-e 's|[@]sockprefix[@]|virtxend|g' \
+	$(NULL)
+
+virtxend.service: libxl/virtxend.service.in $(top_builddir)/config.status
+	$(AM_V_GEN)$(SED) $(VIRTXEND_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+virtxen%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
+	$(AM_V_GEN)$(SED) $(VIRTXEND_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+libxl/virtxend.conf: remote/libvirtd.conf.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtxend/' \
+		$< > $@
+
+libxl/virtxend.aug: remote/libvirtd.aug.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtxend/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtxend/' \
+		$< > $@
+
+libxl/test_virtxend.aug: remote/test_libvirtd.aug.in \
+		libxl/virtxend.conf $(AUG_GENTEST)
+	$(AM_V_GEN)$(AUG_GENTEST) libxl/virtxend.conf \
+		$(srcdir)/remote/test_libvirtd.aug.in | \
+		$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtxend/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtxend/' \
+		> $@ || rm -f $@
+
 conf_DATA +=3D libxl/libxl.conf
 augeas_DATA +=3D libxl/libvirtd_libxl.aug
 augeastest_DATA +=3D libxl/test_libvirtd_libxl.aug
diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in
new file mode 100644
index 0000000000..b4b6ce6d8c
--- /dev/null
+++ b/src/libxl/virtxend.service.in
@@ -0,0 +1,29 @@
+[Unit]
+Description=3DVirtualization xen daemon
+Conflicts=3Dlibvirtd.service
+Requires=3Dvirtxend.socket
+Requires=3Dvirtxend-ro.socket
+Requires=3Dvirtxend-admin.socket
+After=3Dnetwork.target
+After=3Ddbus.service
+After=3Dapparmor.service
+After=3Dlocal-fs.target
+After=3Dremote-fs.target
+After=3Dxencommons.service
+Conflicts=3Dxendomains.service
+Documentation=3Dman:libvirtd(8)
+Documentation=3Dhttps://libvirt.org
+ConditionPathExists=3D/proc/xen/capabilities
+
+[Service]
+Type=3Dnotify
+ExecStart=3D@sbindir@/virtxend --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+Restart=3Don-failure
+KillMode=3Dprocess
+
+[Install]
+WantedBy=3Dmulti-user.target
+Also=3Dvirtxend.socket
+Also=3Dvirtxend-ro.socket
+Also=3Dvirtxend-admin.socket
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277319; cv=none;
	d=zoho.com; s=zohoarc;
	b=Jqd0Q70+RmWxANRaSIfDoSXIkXil58+sELFfulvs0t4NRm8iE0xY+xZ60JMfq3AU7NiMUD29lHJQcP7T+eiQcFNwAlN5MSQaMm1Jg5KQf+yvDAeliIIvKdofJzpnhFO1+a2MAul60vh5DLPr7vx4K2dmzZjA4RdED0oyU0Np9uA=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277319;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=hGgiOSf3mHlEp3T7FPJhGWtqgZhOHDtjR7AkdnkFTfY=;
	b=AYhTG7hyB/LlN8p+QXuDL6ypaKIUt5QAS/Xp/49RtoY05tJXoDeQIXjZFEDl6vIBQJzHumeGza8+BeqVY2GgsfPfZOlSwE89W+Q2EDXo2tBlEZ1Xln7eJcBSEtGYpVDCWwzLl/iBMIH42QGzEl0coBa+Xx82BhF0Lk5MMWMkwJg=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277319161746.8226288872379;
 Thu, 8 Aug 2019 08:15:19 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id CE79489C42;
	Thu,  8 Aug 2019 15:15:16 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 8BBAC6012A;
	Thu,  8 Aug 2019 15:15:16 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3212BE202;
	Thu,  8 Aug 2019 15:15:16 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBrc9027601 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:53 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 9A2F51001284; Thu,  8 Aug 2019 15:11:53 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 93FFF1001948;
	Thu,  8 Aug 2019 15:11:52 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:30 +0100
Message-Id: <20190808151044.11385-29-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 28/42] qemu: introduce virtqemud daemon
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]);
 Thu, 08 Aug 2019 15:15:18 +0000 (UTC)

The virtqemud daemon will be responsible for providing the qemu API
driver functionality. The qemu driver is still loaded by the main
libvirtd daemon at this stage, so virtqemud must not be running at
the same time.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                    |  4 +++
 libvirt.spec.in               |  8 +++++
 src/qemu/Makefile.inc.am      | 62 +++++++++++++++++++++++++++++++++++
 src/qemu/virtqemud.service.in | 40 ++++++++++++++++++++++
 4 files changed, 114 insertions(+)
 create mode 100644 src/qemu/virtqemud.service.in

diff --git a/.gitignore b/.gitignore
index 0c6fa0c771..67962a696e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -170,6 +170,9 @@
 /src/nwfilter/virtnwfilterd.aug
 /src/nwfilter/virtnwfilterd.conf
 /src/qemu/test_libvirtd_qemu.aug
+/src/qemu/test_virtqemud.aug
+/src/qemu/virtqemud.aug
+/src/qemu/virtqemud.conf
 /src/remote/*_client_bodies.h
 /src/remote/*_protocol.[ch]
 /src/remote/*_stubs.h
@@ -199,6 +202,7 @@
 /src/virtnodedevd
 /src/virtnwfilterd
 /src/virtproxyd
+/src/virtqemud
 /src/virtsecretd
 /src/virtstoraged
 /src/virt-guest-shutdown.target
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 9615fff19b..d1093db847 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1735,6 +1735,14 @@ exit 0
=20
 %if %{with_qemu}
 %files daemon-driver-qemu
+%config(noreplace) %{_sysconfdir}/libvirt/virtqemud.conf
+%{_datadir}/augeas/lenses/virtqemud.aug
+%{_datadir}/augeas/lenses/tests/test_virtqemud.aug
+%{_unitdir}/virtqemud.service
+%{_unitdir}/virtqemud.socket
+%{_unitdir}/virtqemud-ro.socket
+%{_unitdir}/virtqemud-admin.socket
+%attr(0755, root, root) %{_sbindir}/virtqemud
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
 %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index 12236a9e7b..30a9751cfd 100644
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -112,6 +112,68 @@ CLEANFILES +=3D \
=20
 endif WITH_DTRACE_PROBES
=20
+sbin_PROGRAMS +=3D virtqemud
+
+nodist_conf_DATA +=3D qemu/virtqemud.conf
+augeas_DATA +=3D qemu/virtqemud.aug
+augeastest_DATA +=3D qemu/test_virtqemud.aug
+CLEANFILES +=3D qemu/virtqemud.aug
+
+virtqemud_SOURCES =3D $(REMOTE_DAEMON_SOURCES)
+virtqemud_CFLAGS =3D \
+       $(REMOTE_DAEMON_CFLAGS) \
+       -DDAEMON_NAME=3D"\"virtqemud\"" \
+       -DMODULE_NAME=3D"\"qemu\"" \
+       $(NULL)
+virtqemud_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS)
+virtqemud_LDADD =3D $(REMOTE_DAEMON_LD_ADD)
+
+SYSTEMD_UNIT_FILES +=3D \
+	virtqemud.service \
+	virtqemud.socket \
+	virtqemud-ro.socket \
+	virtqemud-admin.socket \
+	$(NULL)
+SYSTEMD_UNIT_FILES_IN +=3D \
+	qemu/virtqemud.service.in \
+	$(NULL)
+
+VIRTQEMUD_UNIT_VARS =3D \
+	$(VIRTD_UNIT_VARS) \
+	-e 's|[@]name[@]|Libvirt qemu|g' \
+	-e 's|[@]service[@]|virtqemud|g' \
+	-e 's|[@]sockprefix[@]|virtqemud|g' \
+	$(NULL)
+
+virtqemud.service: qemu/virtqemud.service.in $(top_builddir)/config.status
+	$(AM_V_GEN)$(SED) $(VIRTQEMUD_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+virtqemu%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
+	$(AM_V_GEN)$(SED) $(VIRTQEMUD_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+qemu/virtqemud.conf: remote/libvirtd.conf.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtqemud/' \
+		$< > $@
+
+qemu/virtqemud.aug: remote/libvirtd.aug.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtqemud/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtqemud/' \
+		$< > $@
+
+qemu/test_virtqemud.aug: remote/test_libvirtd.aug.in \
+		qemu/virtqemud.conf $(AUG_GENTEST)
+	$(AM_V_GEN)$(AUG_GENTEST) qemu/virtqemud.conf \
+		$(srcdir)/remote/test_libvirtd.aug.in | \
+		$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtqemud/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtqemud/' \
+		> $@ || rm -f $@
+
 conf_DATA +=3D qemu/qemu.conf
=20
 augeas_DATA +=3D qemu/libvirtd_qemu.aug
diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in
new file mode 100644
index 0000000000..44eb2a2bf7
--- /dev/null
+++ b/src/qemu/virtqemud.service.in
@@ -0,0 +1,40 @@
+[Unit]
+Description=3DVirtualization qemu daemon
+Conflicts=3Dlibvirtd.service
+Requires=3Dvirtqemud.socket
+Requires=3Dvirtqemud-ro.socket
+Requires=3Dvirtqemud-admin.socket
+Wants=3Dsystemd-machined.service
+Before=3Dlibvirt-guests.service
+After=3Dnetwork.target
+After=3Ddbus.service
+After=3Dapparmor.service
+After=3Dlocal-fs.target
+After=3Dremote-fs.target
+After=3Dsystemd-logind.service
+After=3Dsystemd-machined.service
+Documentation=3Dman:libvirtd(8)
+Documentation=3Dhttps://libvirt.org
+
+[Service]
+Type=3Dnotify
+ExecStart=3D@sbindir@/virtqemud --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+KillMode=3Dprocess
+Restart=3Don-failure
+# At least 1 FD per guest, often 2 (eg qemu monitor + qemu agent).
+# eg if we want to support 4096 guests, we'll typically need 8192 FDs
+# If changing this, also consider virtlogd.service & virtlockd.service
+# limits which are also related to number of guests
+LimitNOFILE=3D8192
+# The cgroups pids controller can limit the number of tasks started by
+# the daemon, which can limit the number of domains for some hypervisors.
+# A conservative default of 8 tasks per guest results in a TasksMax of
+# 32k to support 4096 guests.
+TasksMax=3D32768
+
+[Install]
+WantedBy=3Dmulti-user.target
+Also=3Dvirtqemud.socket
+Also=3Dvirtqemud-ro.socket
+Also=3Dvirtqemud-admin.socket
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277232; cv=none;
	d=zoho.com; s=zohoarc;
	b=ZPWwKjV2nHuo2PcMJ5NnL7K2ClBAuTLMx5tNTYklDwMu2+GarVqWmQEyCiP83qf+1t4KqZQuh6clIMO3GFN58v92i82e1t4e/9MxBmLX0Qv/DcE3OG1PYd5CUQjULOfphWnlX2sZjBjatgTRuKivUP+dcSAIjreNvCgoUmSEaFk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277232;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=B9fpaJSsi61wNJ9dPP7Ca1gzD1Ahf5jJIsfhmfZAEuY=;
	b=P9df6x+1ntW2KLFnuY5kKc2sMkFAxYcRWiYLK1dMFe0IYasDqj4bVloSOU4yv4ffqgGjacXwfjeWnaz0ii3O573MKLtvHN42opCXYxNiX+74sSEH/aUMgkZtkuejvcMnpJpGye6/zHnP6mrRDap0i6sqPyzmhQdsiEDHWzX9+TY=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277232855830.5891959753087;
 Thu, 8 Aug 2019 08:13:52 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com
 [10.5.11.23])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id F3ED6315C005;
	Thu,  8 Aug 2019 15:13:50 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id C10C72A174;
	Thu,  8 Aug 2019 15:13:50 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 72A3E24F36;
	Thu,  8 Aug 2019 15:13:50 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBtr9027719 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:55 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 0C47610016F3; Thu,  8 Aug 2019 15:11:55 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 05CB01001948;
	Thu,  8 Aug 2019 15:11:53 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:31 +0100
Message-Id: <20190808151044.11385-30-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 29/42] lxc: introduce virtlxcd daemon
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]);
 Thu, 08 Aug 2019 15:13:52 +0000 (UTC)

The virtlxcd daemon will be responsible for providing the lxc API
driver functionality. The lxc driver is still loaded by the main
libvirtd daemon at this stage, so virtlxcd must not be running at
the same time.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                  |  4 +++
 libvirt.spec.in             |  8 +++++
 src/lxc/Makefile.inc.am     | 63 +++++++++++++++++++++++++++++++++++++
 src/lxc/virtlxcd.service.in | 40 +++++++++++++++++++++++
 4 files changed, 115 insertions(+)
 create mode 100644 src/lxc/virtlxcd.service.in

diff --git a/.gitignore b/.gitignore
index 67962a696e..8e396d6127 100644
--- a/.gitignore
+++ b/.gitignore
@@ -160,6 +160,9 @@
 /src/lxc/lxc_monitor_protocol.h
 /src/lxc/lxc_protocol.[ch]
 /src/lxc/test_libvirtd_lxc.aug
+/src/lxc/test_virtlxcd.aug
+/src/lxc/virtlxcd.aug
+/src/lxc/virtlxcd.conf
 /src/network/test_virtnetworkd.aug
 /src/network/virtnetworkd.aug
 /src/network/virtnetworkd.conf
@@ -198,6 +201,7 @@
 /src/virtxend
 /src/virtlockd
 /src/virtlogd
+/src/virtlxcd
 /src/virtnetworkd
 /src/virtnodedevd
 /src/virtnwfilterd
diff --git a/libvirt.spec.in b/libvirt.spec.in
index d1093db847..1c3d988136 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1760,6 +1760,14 @@ exit 0
=20
 %if %{with_lxc}
 %files daemon-driver-lxc
+%config(noreplace) %{_sysconfdir}/libvirt/virtlxcd.conf
+%{_datadir}/augeas/lenses/virtlxcd.aug
+%{_datadir}/augeas/lenses/tests/test_virtlxcd.aug
+%{_unitdir}/virtlxcd.service
+%{_unitdir}/virtlxcd.socket
+%{_unitdir}/virtlxcd-ro.socket
+%{_unitdir}/virtlxcd-admin.socket
+%attr(0755, root, root) %{_sbindir}/virtlxcd
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/
 %config(noreplace) %{_sysconfdir}/libvirt/lxc.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.lxc
diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index 0c241fc5c1..22c582c380 100644
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -110,6 +110,69 @@ endif WITH_BLKID
 libvirt_driver_lxc_impl_la_LIBADD +=3D $(SECDRIVER_LIBS)
 libvirt_driver_lxc_impl_la_SOURCES =3D $(LXC_DRIVER_SOURCES)
=20
+
+sbin_PROGRAMS +=3D virtlxcd
+
+nodist_conf_DATA +=3D lxc/virtlxcd.conf
+augeas_DATA +=3D lxc/virtlxcd.aug
+augeastest_DATA +=3D lxc/test_virtlxcd.aug
+CLEANFILES +=3D lxc/virtlxcd.aug
+
+virtlxcd_SOURCES =3D $(REMOTE_DAEMON_SOURCES)
+virtlxcd_CFLAGS =3D \
+       $(REMOTE_DAEMON_CFLAGS) \
+       -DDAEMON_NAME=3D"\"virtlxcd\"" \
+       -DMODULE_NAME=3D"\"lxc\"" \
+       $(NULL)
+virtlxcd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS)
+virtlxcd_LDADD =3D $(REMOTE_DAEMON_LD_ADD)
+
+SYSTEMD_UNIT_FILES +=3D \
+	virtlxcd.service \
+	virtlxcd.socket \
+	virtlxcd-ro.socket \
+	virtlxcd-admin.socket \
+	$(NULL)
+SYSTEMD_UNIT_FILES_IN +=3D \
+	lxc/virtlxcd.service.in \
+	$(NULL)
+
+VIRTLXCD_UNIT_VARS =3D \
+	$(VIRTD_UNIT_VARS) \
+	-e 's|[@]name[@]|Libvirt lxc|g' \
+	-e 's|[@]service[@]|virtlxcd|g' \
+	-e 's|[@]sockprefix[@]|virtlxcd|g' \
+	$(NULL)
+
+virtlxcd.service: lxc/virtlxcd.service.in $(top_builddir)/config.status
+	$(AM_V_GEN)$(SED) $(VIRTLXCD_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+virtlxc%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
+	$(AM_V_GEN)$(SED) $(VIRTLXCD_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+lxc/virtlxcd.conf: remote/libvirtd.conf.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtlxcd/' \
+		$< > $@
+
+lxc/virtlxcd.aug: remote/libvirtd.aug.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtlxcd/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtlxcd/' \
+		$< > $@
+
+lxc/test_virtlxcd.aug: remote/test_libvirtd.aug.in \
+		lxc/virtlxcd.conf $(AUG_GENTEST)
+	$(AM_V_GEN)$(AUG_GENTEST) lxc/virtlxcd.conf \
+		$(srcdir)/remote/test_libvirtd.aug.in | \
+		$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtlxcd/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtlxcd/' \
+		> $@ || rm -f $@
+
 libexec_PROGRAMS +=3D libvirt_lxc
=20
 libvirt_lxc_SOURCES =3D \
diff --git a/src/lxc/virtlxcd.service.in b/src/lxc/virtlxcd.service.in
new file mode 100644
index 0000000000..c732499a64
--- /dev/null
+++ b/src/lxc/virtlxcd.service.in
@@ -0,0 +1,40 @@
+[Unit]
+Description=3DVirtualization lxc daemon
+Conflicts=3Dlibvirtd.service
+Requires=3Dvirtlxcd.socket
+Requires=3Dvirtlxcd-ro.socket
+Requires=3Dvirtlxcd-admin.socket
+Wants=3Dsystemd-machined.service
+Before=3Dlibvirt-guests.service
+After=3Dnetwork.target
+After=3Ddbus.service
+After=3Dapparmor.service
+After=3Dlocal-fs.target
+After=3Dremote-fs.target
+After=3Dsystemd-logind.service
+After=3Dsystemd-machined.service
+Documentation=3Dman:libvirtd(8)
+Documentation=3Dhttps://libvirt.org
+
+[Service]
+Type=3Dnotify
+ExecStart=3D@sbindir@/virtlxcd --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+KillMode=3Dprocess
+Restart=3Don-failure
+# At least 1 FD per guest, often 2 (eg qemu monitor + qemu agent).
+# eg if we want to support 4096 guests, we'll typically need 8192 FDs
+# If changing this, also consider virtlogd.service & virtlockd.service
+# limits which are also related to number of guests
+LimitNOFILE=3D8192
+# The cgroups pids controller can limit the number of tasks started by
+# the daemon, which can limit the number of domains for some hypervisors.
+# A conservative default of 8 tasks per guest results in a TasksMax of
+# 32k to support 4096 guests.
+TasksMax=3D32768
+
+[Install]
+WantedBy=3Dmulti-user.target
+Also=3Dvirtlxcd.socket
+Also=3Dvirtlxcd-ro.socket
+Also=3Dvirtlxcd-admin.socket
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277324; cv=none;
	d=zoho.com; s=zohoarc;
	b=jgGYdhfh8cAkhTNGuBF/MxYqvi6UfKqwUSOmPiBt9mwuSe29SwPfUVXeidcqJHhHQfhnY0HM6VwF3JRJgBinNPEdSfEHISDtQp1hrvDax0LdKvL1qZ1cw1pvHsIEwaSxBbCcA1EWkGLA7axRMWDmIieOZ+YOX/4a1vz7WHEOHZw=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277324;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=lGrdyPn+VgSV7Lz271b4R3mOlvzbAKbcVtRHbMOgn2M=;
	b=a6onCBwDf+Ql2sspFhnI+WwITxGH05WRKmqo8KAB5C5Dnfh2r3LJrid1aSawoU8NLcGd+/kDMkdpjSBBPXA7vrqZ35ZYV1+MK8jiBhDhJK6cSwM5oQLL/o+NqXzu+Rp3X/PPkWkkU45fNd0jChIvS6zN6BPbmuhRR+ZHPi7yRgk=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277324410174.94504810632657;
 Thu, 8 Aug 2019 08:15:24 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id 0A76160AD4;
	Thu,  8 Aug 2019 15:15:23 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id C2B6160610;
	Thu,  8 Aug 2019 15:15:22 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5E97D18034E6;
	Thu,  8 Aug 2019 15:15:22 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBuHq027767 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:56 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 728FA10016F3; Thu,  8 Aug 2019 15:11:56 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 7CA611001956;
	Thu,  8 Aug 2019 15:11:55 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:32 +0100
Message-Id: <20190808151044.11385-31-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 30/42] vbox: introduce virtvboxd daemon
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]);
 Thu, 08 Aug 2019 15:15:23 +0000 (UTC)

The virtvboxd daemon will be responsible for providing the vbox API
driver functionality. The vbox driver is still loaded by the main
libvirtd daemon at this stage, so virtvboxd must not be running at
the same time.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                    |  4 +++
 libvirt.spec.in               |  8 +++++
 src/vbox/Makefile.inc.am      | 63 +++++++++++++++++++++++++++++++++++
 src/vbox/virtvboxd.service.in | 25 ++++++++++++++
 4 files changed, 100 insertions(+)
 create mode 100644 src/vbox/virtvboxd.service.in

diff --git a/.gitignore b/.gitignore
index 8e396d6127..e0f8bc3518 100644
--- a/.gitignore
+++ b/.gitignore
@@ -196,6 +196,9 @@
 /src/test*.aug
 /src/util/virkeycodetable*.h
 /src/util/virkeynametable*.h
+/src/vbox/test_virtvboxd.aug
+/src/vbox/virtvboxd.aug
+/src/vbox/virtvboxd.conf
 /src/virt-aa-helper
 /src/virtinterfaced
 /src/virtxend
@@ -209,6 +212,7 @@
 /src/virtqemud
 /src/virtsecretd
 /src/virtstoraged
+/src/virtvboxd
 /src/virt-guest-shutdown.target
 /tests/*.log
 /tests/*.pid
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 1c3d988136..184268b596 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1802,6 +1802,14 @@ exit 0
=20
 %if %{with_vbox}
 %files daemon-driver-vbox
+%config(noreplace) %{_sysconfdir}/libvirt/virtvboxd.conf
+%{_datadir}/augeas/lenses/virtvboxd.aug
+%{_datadir}/augeas/lenses/tests/test_virtvboxd.aug
+%{_unitdir}/virtvboxd.service
+%{_unitdir}/virtvboxd.socket
+%{_unitdir}/virtvboxd-ro.socket
+%{_unitdir}/virtvboxd-admin.socket
+%attr(0755, root, root) %{_sbindir}/virtvboxd
 %{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so
 %endif
=20
diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am
index 95407778f7..178c360b99 100644
--- a/src/vbox/Makefile.inc.am
+++ b/src/vbox/Makefile.inc.am
@@ -63,4 +63,67 @@ libvirt_driver_vbox_impl_la_LIBADD =3D \
 	$(LIBXML_LIBS) \
 	$(NULL)
 libvirt_driver_vbox_impl_la_SOURCES =3D $(VBOX_DRIVER_SOURCES)
+
+sbin_PROGRAMS +=3D virtvboxd
+
+nodist_conf_DATA +=3D vbox/virtvboxd.conf
+augeas_DATA +=3D vbox/virtvboxd.aug
+augeastest_DATA +=3D vbox/test_virtvboxd.aug
+CLEANFILES +=3D vbox/virtvboxd.aug
+
+virtvboxd_SOURCES =3D $(REMOTE_DAEMON_SOURCES)
+virtvboxd_CFLAGS =3D \
+       $(REMOTE_DAEMON_CFLAGS) \
+       -DDAEMON_NAME=3D"\"virtvboxd\"" \
+       -DMODULE_NAME=3D"\"vbox\"" \
+       $(NULL)
+virtvboxd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS)
+virtvboxd_LDADD =3D $(REMOTE_DAEMON_LD_ADD)
+
+SYSTEMD_UNIT_FILES +=3D \
+	virtvboxd.service \
+	virtvboxd.socket \
+	virtvboxd-ro.socket \
+	virtvboxd-admin.socket \
+	$(NULL)
+SYSTEMD_UNIT_FILES_IN +=3D \
+	vbox/virtvboxd.service.in \
+	$(NULL)
+
+VIRTVBOXD_UNIT_VARS =3D \
+	$(VIRTD_UNIT_VARS) \
+	-e 's|[@]name[@]|Libvirt vbox|g' \
+	-e 's|[@]service[@]|virtvboxd|g' \
+	-e 's|[@]sockprefix[@]|virtvboxd|g' \
+	$(NULL)
+
+virtvboxd.service: vbox/virtvboxd.service.in $(top_builddir)/config.status
+	$(AM_V_GEN)$(SED) $(VIRTVBOXD_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+virtvbox%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
+	$(AM_V_GEN)$(SED) $(VIRTVBOXD_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+vbox/virtvboxd.conf: remote/libvirtd.conf.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtvboxd/' \
+		$< > $@
+
+vbox/virtvboxd.aug: remote/libvirtd.aug.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtvboxd/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtvboxd/' \
+		$< > $@
+
+vbox/test_virtvboxd.aug: remote/test_libvirtd.aug.in \
+		vbox/virtvboxd.conf $(AUG_GENTEST)
+	$(AM_V_GEN)$(AUG_GENTEST) vbox/virtvboxd.conf \
+		$(srcdir)/remote/test_libvirtd.aug.in | \
+		$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtvboxd/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtvboxd/' \
+		> $@ || rm -f $@
+
 endif WITH_VBOX
diff --git a/src/vbox/virtvboxd.service.in b/src/vbox/virtvboxd.service.in
new file mode 100644
index 0000000000..7e0f7518d6
--- /dev/null
+++ b/src/vbox/virtvboxd.service.in
@@ -0,0 +1,25 @@
+[Unit]
+Description=3DVirtualization vbox daemon
+Conflicts=3Dlibvirtd.service
+Requires=3Dvirtvboxd.socket
+Requires=3Dvirtvboxd-ro.socket
+Requires=3Dvirtvboxd-admin.socket
+After=3Dnetwork.target
+After=3Ddbus.service
+After=3Dapparmor.service
+After=3Dlocal-fs.target
+After=3Dremote-fs.target
+Documentation=3Dman:libvirtd(8)
+Documentation=3Dhttps://libvirt.org
+
+[Service]
+Type=3Dnotify
+ExecStart=3D@sbindir@/virtvboxd --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+Restart=3Don-failure
+
+[Install]
+WantedBy=3Dmulti-user.target
+Also=3Dvirtvboxd.socket
+Also=3Dvirtvboxd-ro.socket
+Also=3Dvirtvboxd-admin.socket
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277266; cv=none;
	d=zoho.com; s=zohoarc;
	b=QrhKJfo6tBzNur+/69W5mvqcNcN1ZJ9KppsXqaWqdjeC+vzqfwCa+eQDPlLQaqi6ntkGHU2A5vLvqNG6gIRtMnZyW0bZFD5XbMFlOeIERRwL6Ejheb+SvvlD/rNqKGswfIZi/ksehpEWWdBJZKmec419V1mxUMzvp72+rBTEbzA=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277266;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=bTqrdLrxZ/gK9Y5Xvp2fC/pQQ3rW2jTboUj2W/MXdOU=;
	b=J4+08/MsvLd1Ly2TigvGccwy/2/1uJUlRklw/icKAmmet4p7INSVO2zSgKyGeSjM8SX8oJUf278CfWsBZEfqQ8Cj4qu5x+LtqmMhznoD+tDAdn9h1oNDrn2g4dUoPsfhPJYOgft8zyXfzFFJCaK9KaE2i+967lw2Q1cFaAus7ks=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277266648233.5732217195001;
 Thu, 8 Aug 2019 08:14:26 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
 [10.5.11.22])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 4E4023098428;
	Thu,  8 Aug 2019 15:14:25 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 1F64B1001955;
	Thu,  8 Aug 2019 15:14:25 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id D1B99EEFE;
	Thu,  8 Aug 2019 15:14:24 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBvvc027926 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:57 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id E43FA1001956; Thu,  8 Aug 2019 15:11:57 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id DCAB610016F3;
	Thu,  8 Aug 2019 15:11:56 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:33 +0100
Message-Id: <20190808151044.11385-32-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 31/42] bhyve: introduce virtbhyved daemon
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]);
 Thu, 08 Aug 2019 15:14:25 +0000 (UTC)

The virtbhyved daemon will be responsible for providing the bhyve API
driver functionality. The bhyve driver is still loaded by the main
libvirtd daemon at this stage, so virtbhyved must not be running at
the same time.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                |  4 ++++
 src/bhyve/Makefile.inc.am | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/.gitignore b/.gitignore
index e0f8bc3518..5a7ca221e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -118,6 +118,9 @@
 /src/admin/admin_client.h
 /src/admin/admin_protocol.[ch]
 /src/admin/admin_server_dispatch_stubs.h
+/src/bhyve/test_virtbhyved.aug
+/src/bhyve/virtbhyved.aug
+/src/bhyve/virtbhyved.conf
 /src/esx/*.generated.*
 /src/hyperv/*.generated.*
 /src/interface/test_virtinterfaced.aug
@@ -200,6 +203,7 @@
 /src/vbox/virtvboxd.aug
 /src/vbox/virtvboxd.conf
 /src/virt-aa-helper
+/src/virtbhyved
 /src/virtinterfaced
 /src/virtxend
 /src/virtlockd
diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am
index 8b662e9775..195069872a 100644
--- a/src/bhyve/Makefile.inc.am
+++ b/src/bhyve/Makefile.inc.am
@@ -47,6 +47,45 @@ libvirt_driver_bhyve_impl_la_CFLAGS =3D \
 libvirt_driver_bhyve_impl_la_LDFLAGS =3D $(AM_LDFLAGS)
 libvirt_driver_bhyve_impl_la_SOURCES =3D $(BHYVE_DRIVER_SOURCES)
=20
+sbin_PROGRAMS +=3D virtbhyved
+
+nodist_conf_DATA +=3D bhyve/virtbhyved.conf
+augeas_DATA +=3D bhyve/virtbhyved.aug
+augeastest_DATA +=3D bhyve/test_virtbhyved.aug
+CLEANFILES +=3D bhyve/virtbhyved.aug
+
+virtbhyved_SOURCES =3D $(REMOTE_DAEMON_SOURCES)
+virtbhyved_CFLAGS =3D \
+       $(REMOTE_DAEMON_CFLAGS) \
+       -DDAEMON_NAME=3D"\"virtbhyved\"" \
+       -DMODULE_NAME=3D"\"bhyve\"" \
+       $(NULL)
+virtbhyved_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS)
+virtbhyved_LDADD =3D $(REMOTE_DAEMON_LD_ADD)
+
+bhyve/virtbhyved.conf: remote/libvirtd.conf.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtbhyved/' \
+		$< > $@
+
+bhyve/virtbhyved.aug: remote/libvirtd.aug.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtbhyved/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtbhyved/' \
+		$< > $@
+
+bhyve/test_virtbhyved.aug: remote/test_libvirtd.aug.in \
+		bhyve/virtbhyved.conf $(AUG_GENTEST)
+	$(AM_V_GEN)$(AUG_GENTEST) bhyve/virtbhyved.conf \
+		$(srcdir)/remote/test_libvirtd.aug.in | \
+		$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtbhyved/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtbhyved/' \
+		> $@ || rm -f $@
+
 conf_DATA +=3D bhyve/bhyve.conf
 augeas_DATA +=3D bhyve/libvirtd_bhyve.aug
 augeastest_DATA +=3D bhyve/test_libvirtd_bhyve.aug
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277329; cv=none;
	d=zoho.com; s=zohoarc;
	b=HqXpf3Jr+PfG6kb/WVuHQ0HDchXBrLvAwJkOF2p/oWwCFuIxo23m9D3GYuNAg4InIhZBLxvuvjIS8xEcj4DL0eYVOYs9lUkUH49G1nJAKxMfpId1+Pc29BxBXf3vNWShSKSHhrQmCTt0fNxqFWtXMIt8j4ufYUF9zIMbMI7RRb8=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277329;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=O1hFMCtCrQ+evEyPZG8MfLp10rG8F35Id9Sr1xPrq/0=;
	b=GIvaKnktIjmOicvw5atVZ7vFnPytLhK+M+0bpRo7ayUroEpd29TdxSUXgsKVrfV5J0vI3gaH6TJEOn/0Mqd/GWLnEg9ohy/GAb0k4c5tzd7bOxr/QcZ95kv3Zft01jpEKYmET6FR1ZoUThzoKRAsZbT2KsD1vk6a9tTLjnVwTTk=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277329331565.3284310414949;
 Thu, 8 Aug 2019 08:15:29 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com
 [10.5.11.15])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id E52C4554E3;
	Thu,  8 Aug 2019 15:15:27 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id BC92E62699;
	Thu,  8 Aug 2019 15:15:27 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7279B18005A4;
	Thu,  8 Aug 2019 15:15:27 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FBxDn027949 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:11:59 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 502951001955; Thu,  8 Aug 2019 15:11:59 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 589AF1001284;
	Thu,  8 Aug 2019 15:11:58 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:34 +0100
Message-Id: <20190808151044.11385-33-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 32/42] vz: introduce virtvzd daemon
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]);
 Thu, 08 Aug 2019 15:15:28 +0000 (UTC)

The virtvzd daemon will be responsible for providing the vz API
driver functionality. The vz driver is still loaded by the main
libvirtd daemon at this stage, so virtvzd must not be running at
the same time.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                |  4 +++
 src/vz/Makefile.inc.am    | 63 +++++++++++++++++++++++++++++++++++++++
 src/vz/virtvzd.service.in | 25 ++++++++++++++++
 3 files changed, 92 insertions(+)
 create mode 100644 src/vz/virtvzd.service.in

diff --git a/.gitignore b/.gitignore
index 5a7ca221e8..dd5d35c762 100644
--- a/.gitignore
+++ b/.gitignore
@@ -217,7 +217,11 @@
 /src/virtsecretd
 /src/virtstoraged
 /src/virtvboxd
+/src/virtvzd
 /src/virt-guest-shutdown.target
+/src/vz/test_virtvzd.aug
+/src/vz/virtvzd.aug
+/src/vz/virtvzd.conf
 /tests/*.log
 /tests/*.pid
 /tests/*.trs
diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am
index a3a146c627..f56fceb8f7 100644
--- a/src/vz/Makefile.inc.am
+++ b/src/vz/Makefile.inc.am
@@ -37,4 +37,67 @@ libvirt_driver_vz_impl_la_LIBADD =3D \
 	$(PARALLELS_SDK_LIBS) \
 	$(LIBNL_LIBS) \
 	$(NULL)
+
+sbin_PROGRAMS +=3D virtvzd
+
+nodist_conf_DATA +=3D vz/virtvzd.conf
+augeas_DATA +=3D vz/virtvzd.aug
+augeastest_DATA +=3D vz/test_virtvzd.aug
+CLEANFILES +=3D vz/virtvzd.aug
+
+virtvzd_SOURCES =3D $(REMOTE_DAEMON_SOURCES)
+virtvzd_CFLAGS =3D \
+       $(REMOTE_DAEMON_CFLAGS) \
+       -DDAEMON_NAME=3D"\"virtvzd\"" \
+       -DMODULE_NAME=3D"\"vz\"" \
+       $(NULL)
+virtvzd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS)
+virtvzd_LDADD =3D $(REMOTE_DAEMON_LD_ADD)
+
+SYSTEMD_UNIT_FILES +=3D \
+	virtvzd.service \
+	virtvzd.socket \
+	virtvzd-ro.socket \
+	virtvzd-admin.socket \
+	$(NULL)
+SYSTEMD_UNIT_FILES_IN +=3D \
+	vz/virtvzd.service.in \
+	$(NULL)
+
+VIRTVZD_UNIT_VARS =3D \
+	$(VIRTD_UNIT_VARS) \
+	-e 's|[@]name[@]|Libvirt vz|g' \
+	-e 's|[@]service[@]|virtvzd|g' \
+	-e 's|[@]sockprefix[@]|virtvzd|g' \
+	$(NULL)
+
+virtvzd.service: vz/virtvzd.service.in $(top_builddir)/config.status
+	$(AM_V_GEN)$(SED) $(VIRTVZD_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+virtvz%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
+	$(AM_V_GEN)$(SED) $(VIRTVZD_UNIT_VARS) $< > $@-t && mv $@-t $@
+
+vz/virtvzd.conf: remote/libvirtd.conf.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtvzd/' \
+		$< > $@
+
+vz/virtvzd.aug: remote/libvirtd.aug.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtvzd/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtvzd/' \
+		$< > $@
+
+vz/test_virtvzd.aug: remote/test_libvirtd.aug.in \
+		vz/virtvzd.conf $(AUG_GENTEST)
+	$(AM_V_GEN)$(AUG_GENTEST) vz/virtvzd.conf \
+		$(srcdir)/remote/test_libvirtd.aug.in | \
+		$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtvzd/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtvzd/' \
+		> $@ || rm -f $@
+
 endif WITH_VZ
diff --git a/src/vz/virtvzd.service.in b/src/vz/virtvzd.service.in
new file mode 100644
index 0000000000..cd0f558768
--- /dev/null
+++ b/src/vz/virtvzd.service.in
@@ -0,0 +1,25 @@
+[Unit]
+Description=3DVirtualization vz daemon
+Conflicts=3Dlibvirtd.service
+Requires=3Dvirtvzd.socket
+Requires=3Dvirtvzd-ro.socket
+Requires=3Dvirtvzd-admin.socket
+After=3Dnetwork.target
+After=3Ddbus.service
+After=3Dapparmor.service
+After=3Dlocal-fs.target
+After=3Dremote-fs.target
+Documentation=3Dman:libvirtd(8)
+Documentation=3Dhttps://libvirt.org
+
+[Service]
+Type=3Dnotify
+ExecStart=3D@sbindir@/virtvzd --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+Restart=3Don-failure
+
+[Install]
+WantedBy=3Dmulti-user.target
+Also=3Dvirtvzd.socket
+Also=3Dvirtvzd-ro.socket
+Also=3Dvirtvzd-admin.socket
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277236; cv=none;
	d=zoho.com; s=zohoarc;
	b=d6dndKMbdVP40LVjNp8BgFr81wBJwhuzHExSaiLXY0/quN3iziLB2IPKLWK1MyRF0lPUFbUIkoivbMRgXUi9VRJz++GYySS/6Wvr1gRRr43ebpJeagOqyDJmAqRbvBpPzl3inCl+aSZgGM3aYCEQ9RITg/ZD4AlKhXuNzRYzID0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277236;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=eMQLkO2uKGhQeVHr1AUgjpa8rfVPBNuRt5bVeUoRF34=;
	b=Dz2UkqgmJUNr8BGkAh1EvOory9o2V693bYlw9qy/vjhtDvrpPneE1WEvhm2mFeLLekr3r3t31UAVaxOGPPuC1hsc2Ap74m3pIkRxFICpZ0oPtRTAmCtMLXmVK4nRYgo0ciyq21MVg8GR34QztGuxLNFEsus6bmrTp9tymhQ0A/8=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 15652772362921002.718812464201;
 Thu, 8 Aug 2019 08:13:56 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com
 [10.5.11.23])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id D2BEE315C01F;
	Thu,  8 Aug 2019 15:13:54 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id A1549F6E8;
	Thu,  8 Aug 2019 15:13:54 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 61EFB180BAA9;
	Thu,  8 Aug 2019 15:13:54 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FC0np027958 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:12:00 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 951E710002B9; Thu,  8 Aug 2019 15:12:00 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id A3E8A1001948;
	Thu,  8 Aug 2019 15:11:59 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:35 +0100
Message-Id: <20190808151044.11385-34-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 33/42] admin: add ability to connect to the
	per-driver daemon sockets
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]);
 Thu, 08 Aug 2019 15:13:55 +0000 (UTC)

The admin client now supports addressing the per-driver daemons using
the obvious URI schemes for each daemon. eg virtqemud:///system
virtqemud:///session, etc.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/libvirt-admin.c | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c
index 4ae50b188f..e102506948 100644
--- a/src/libvirt-admin.c
+++ b/src/libvirt-admin.c
@@ -36,10 +36,6 @@
=20
 #define VIR_FROM_THIS VIR_FROM_ADMIN
=20
-#define LIBVIRTD_ADMIN_SOCK_NAME "libvirt-admin-sock"
-#define VIRTLOGD_ADMIN_SOCK_NAME "virtlogd-admin-sock"
-#define VIRTLOCKD_ADMIN_SOCK_NAME "virtlockd-admin-sock"
-
=20
 VIR_LOG_INIT("libvirt-admin");
=20
@@ -127,20 +123,31 @@ getSocketPath(virURIPtr uri)
     }
=20
     if (!sock_path) {
-        const char *sockbase =3D NULL;
-        if (STREQ_NULLABLE(uri->scheme, "libvirtd")) {
-            sockbase =3D LIBVIRTD_ADMIN_SOCK_NAME;
-        } else if (STREQ_NULLABLE(uri->scheme, "virtlogd")) {
-            sockbase =3D VIRTLOGD_ADMIN_SOCK_NAME;
-        } else if (STREQ_NULLABLE(uri->scheme, "virtlockd")) {
-            sockbase =3D VIRTLOCKD_ADMIN_SOCK_NAME;
-        } else {
+        VIR_AUTOFREE(char *) sockbase =3D NULL;
+        bool legacy =3D false;
+
+        if (!uri->scheme) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           "%s", _("No URI scheme specified"));
+            goto error;
+        }
+        if (STREQ(uri->scheme, "libvirtd")) {
+            legacy =3D true;
+        } else if (!STRPREFIX(uri->scheme, "virt")) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("Unsupported URI scheme '%s'"),
-                           NULLSTR(uri->scheme));
+                           uri->scheme);
             goto error;
         }
=20
+        if (legacy) {
+            if (VIR_STRDUP(sockbase, "libvirt-admin-sock") < 0)
+                goto error;
+        } else {
+            if (virAsprintf(&sockbase, "%s-admin-sock", uri->scheme) < 0)
+                goto error;
+        }
+
         if (STREQ_NULLABLE(uri->path, "/system")) {
             if (virAsprintf(&sock_path, LOCALSTATEDIR "/run/libvirt/%s",
                             sockbase) < 0)
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277270; cv=none;
	d=zoho.com; s=zohoarc;
	b=Eqk2c/VPI3KKgoLJljp4o/8pV9sIxnsfilUmO51Fwm01HUUGWfiKbvItYyAzXdNteeGiQEXH+4btlEKBZqzlS+L5aBc4a2mmmE9rAw/w4Me3gHLx5542STYDtEy2opyqMK0Mkyf4rdNE67M6SA2q4s4ulTN92BVt1B5n3JYq/Mc=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277270;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=+U93zzTFz+XJMhlmE2qtnV7BVsCnjk4hLKVye6xUxwY=;
	b=RBjkXWNLDz6mWu9VJqOmqyIf86FLVFOOcsus7AdiSUr7UOifMZPsNtiSFePFg8FzAP+8CjPfoh71ctJBhR0GLA0Y3AxvM4hL6VAnlCgzvEVgoWdX2UtbGNaERswbj3sUOnAjtIkJpTYcqEebo487lTlV8xAYBf5sax0qRM6lx64=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277270325188.05016320177913;
 Thu, 8 Aug 2019 08:14:30 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id 00A362F3683;
	Thu,  8 Aug 2019 15:14:29 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id BFBA560619;
	Thu,  8 Aug 2019 15:14:28 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 83BBF1803B52;
	Thu,  8 Aug 2019 15:14:28 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FC4n8027975 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:12:04 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id DF4181001284; Thu,  8 Aug 2019 15:12:04 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 81D701001948;
	Thu,  8 Aug 2019 15:12:00 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:36 +0100
Message-Id: <20190808151044.11385-35-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 34/42] remote: get rid of bogus
	ATTRIBUTE_UNUSED annotation client param
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]);
 Thu, 08 Aug 2019 15:14:29 +0000 (UTC)

The client parameter is always used to get access to the private data
struct.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/remote_daemon_dispatch.c | 98 ++++++++++++++---------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon=
_dispatch.c
index 444c03a644..0145279d72 100644
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -2006,7 +2006,7 @@ remoteDispatchConnectOpen(virNetServerPtr server ATTR=
IBUTE_UNUSED,
=20
 static int
 remoteDispatchConnectClose(virNetServerPtr server ATTRIBUTE_UNUSED,
-                           virNetServerClientPtr client ATTRIBUTE_UNUSED,
+                           virNetServerClientPtr client,
                            virNetMessagePtr msg ATTRIBUTE_UNUSED,
                            virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED)
 {
@@ -2017,7 +2017,7 @@ remoteDispatchConnectClose(virNetServerPtr server ATT=
RIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainGetSchedulerType(virNetServerPtr server ATTRIBUTE_UNUS=
ED,
-                                     virNetServerClientPtr client ATTRIBUT=
E_UNUSED,
+                                     virNetServerClientPtr client,
                                      virNetMessagePtr msg ATTRIBUTE_UNUSED,
                                      virNetMessageErrorPtr rerr,
                                      remote_domain_get_scheduler_type_args=
 *args,
@@ -2054,7 +2054,7 @@ remoteDispatchDomainGetSchedulerType(virNetServerPtr =
server ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainGetSchedulerParameters(virNetServerPtr server ATTRIBUT=
E_UNUSED,
-                                           virNetServerClientPtr client AT=
TRIBUTE_UNUSED,
+                                           virNetServerClientPtr client,
                                            virNetMessagePtr msg ATTRIBUTE_=
UNUSED,
                                            virNetMessageErrorPtr rerr,
                                            remote_domain_get_scheduler_par=
ameters_args *args,
@@ -2104,7 +2104,7 @@ remoteDispatchDomainGetSchedulerParameters(virNetServ=
erPtr server ATTRIBUTE_UNUS
=20
 static int
 remoteDispatchDomainGetSchedulerParametersFlags(virNetServerPtr server ATT=
RIBUTE_UNUSED,
-                                                virNetServerClientPtr clie=
nt ATTRIBUTE_UNUSED,
+                                                virNetServerClientPtr clie=
nt,
                                                 virNetMessagePtr msg ATTRI=
BUTE_UNUSED,
                                                 virNetMessageErrorPtr rerr,
                                                 remote_domain_get_schedule=
r_parameters_flags_args *args,
@@ -2155,7 +2155,7 @@ remoteDispatchDomainGetSchedulerParametersFlags(virNe=
tServerPtr server ATTRIBUTE
=20
 static int
 remoteDispatchDomainMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED,
-                                virNetServerClientPtr client ATTRIBUTE_UNU=
SED,
+                                virNetServerClientPtr client,
                                 virNetMessagePtr msg ATTRIBUTE_UNUSED,
                                 virNetMessageErrorPtr rerr,
                                 remote_domain_memory_stats_args *args,
@@ -2213,7 +2213,7 @@ remoteDispatchDomainMemoryStats(virNetServerPtr serve=
r ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainBlockPeek(virNetServerPtr server ATTRIBUTE_UNUSED,
-                              virNetServerClientPtr client ATTRIBUTE_UNUSE=
D,
+                              virNetServerClientPtr client,
                               virNetMessagePtr msg ATTRIBUTE_UNUSED,
                               virNetMessageErrorPtr rerr,
                               remote_domain_block_peek_args *args,
@@ -2267,7 +2267,7 @@ remoteDispatchDomainBlockPeek(virNetServerPtr server =
ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainBlockStatsFlags(virNetServerPtr server ATTRIBUTE_UNUSE=
D,
-                                    virNetServerClientPtr client ATTRIBUTE=
_UNUSED,
+                                    virNetServerClientPtr client,
                                     virNetMessagePtr msg ATTRIBUTE_UNUSED,
                                     virNetMessageErrorPtr rerr,
                                     remote_domain_block_stats_flags_args *=
args,
@@ -2330,7 +2330,7 @@ remoteDispatchDomainBlockStatsFlags(virNetServerPtr s=
erver ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainMemoryPeek(virNetServerPtr server ATTRIBUTE_UNUSED,
-                               virNetServerClientPtr client ATTRIBUTE_UNUS=
ED,
+                               virNetServerClientPtr client,
                                virNetMessagePtr msg ATTRIBUTE_UNUSED,
                                virNetMessageErrorPtr rerr,
                                remote_domain_memory_peek_args *args,
@@ -2382,7 +2382,7 @@ remoteDispatchDomainMemoryPeek(virNetServerPtr server=
 ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainGetSecurityLabel(virNetServerPtr server ATTRIBUTE_UNUS=
ED,
-                                     virNetServerClientPtr client ATTRIBUT=
E_UNUSED,
+                                     virNetServerClientPtr client,
                                      virNetMessagePtr msg ATTRIBUTE_UNUSED,
                                      virNetMessageErrorPtr rerr,
                                      remote_domain_get_security_label_args=
 *args,
@@ -2426,7 +2426,7 @@ remoteDispatchDomainGetSecurityLabel(virNetServerPtr =
server ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainGetSecurityLabelList(virNetServerPtr server ATTRIBUTE_=
UNUSED,
-                                         virNetServerClientPtr client ATTR=
IBUTE_UNUSED,
+                                         virNetServerClientPtr client,
                                          virNetMessagePtr msg ATTRIBUTE_UN=
USED,
                                          virNetMessageErrorPtr rerr,
                                          remote_domain_get_security_label_=
list_args *args,
@@ -2483,7 +2483,7 @@ remoteDispatchDomainGetSecurityLabelList(virNetServer=
Ptr server ATTRIBUTE_UNUSED
=20
 static int
 remoteDispatchNodeGetSecurityModel(virNetServerPtr server ATTRIBUTE_UNUSED,
-                                   virNetServerClientPtr client ATTRIBUTE_=
UNUSED,
+                                   virNetServerClientPtr client,
                                    virNetMessagePtr msg ATTRIBUTE_UNUSED,
                                    virNetMessageErrorPtr rerr,
                                    remote_node_get_security_model_ret *ret)
@@ -2522,7 +2522,7 @@ remoteDispatchNodeGetSecurityModel(virNetServerPtr se=
rver ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainGetVcpuPinInfo(virNetServerPtr server ATTRIBUTE_UNUSED,
-                                   virNetServerClientPtr client ATTRIBUTE_=
UNUSED,
+                                   virNetServerClientPtr client,
                                    virNetMessagePtr msg ATTRIBUTE_UNUSED,
                                    virNetMessageErrorPtr rerr,
                                    remote_domain_get_vcpu_pin_info_args *a=
rgs,
@@ -2623,7 +2623,7 @@ remoteDispatchDomainPinEmulator(virNetServerPtr serve=
r ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainGetEmulatorPinInfo(virNetServerPtr server ATTRIBUTE_UN=
USED,
-                                       virNetServerClientPtr client ATTRIB=
UTE_UNUSED,
+                                       virNetServerClientPtr client,
                                        virNetMessagePtr msg ATTRIBUTE_UNUS=
ED,
                                        virNetMessageErrorPtr rerr,
                                        remote_domain_get_emulator_pin_info=
_args *args,
@@ -2672,7 +2672,7 @@ remoteDispatchDomainGetEmulatorPinInfo(virNetServerPt=
r server ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainGetVcpus(virNetServerPtr server ATTRIBUTE_UNUSED,
-                             virNetServerClientPtr client ATTRIBUTE_UNUSED,
+                             virNetServerClientPtr client,
                              virNetMessagePtr msg ATTRIBUTE_UNUSED,
                              virNetMessageErrorPtr rerr,
                              remote_domain_get_vcpus_args *args,
@@ -2825,7 +2825,7 @@ remoteDispatchDomainGetIOThreadInfo(virNetServerPtr s=
erver ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainMigratePrepare(virNetServerPtr server ATTRIBUTE_UNUSED,
-                                   virNetServerClientPtr client ATTRIBUTE_=
UNUSED,
+                                   virNetServerClientPtr client,
                                    virNetMessagePtr msg ATTRIBUTE_UNUSED,
                                    virNetMessageErrorPtr rerr,
                                    remote_domain_migrate_prepare_args *arg=
s,
@@ -2880,7 +2880,7 @@ remoteDispatchDomainMigratePrepare(virNetServerPtr se=
rver ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainMigratePrepare2(virNetServerPtr server ATTRIBUTE_UNUSE=
D,
-                                    virNetServerClientPtr client ATTRIBUTE=
_UNUSED,
+                                    virNetServerClientPtr client,
                                     virNetMessagePtr msg ATTRIBUTE_UNUSED,
                                     virNetMessageErrorPtr rerr,
                                     remote_domain_migrate_prepare2_args *a=
rgs,
@@ -2932,7 +2932,7 @@ remoteDispatchDomainMigratePrepare2(virNetServerPtr s=
erver ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainGetMemoryParameters(virNetServerPtr server ATTRIBUTE_U=
NUSED,
-                                        virNetServerClientPtr client ATTRI=
BUTE_UNUSED,
+                                        virNetServerClientPtr client,
                                         virNetMessagePtr msg ATTRIBUTE_UNU=
SED,
                                         virNetMessageErrorPtr rerr,
                                         remote_domain_get_memory_parameter=
s_args *args,
@@ -2994,7 +2994,7 @@ remoteDispatchDomainGetMemoryParameters(virNetServerP=
tr server ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainGetNumaParameters(virNetServerPtr server ATTRIBUTE_UNU=
SED,
-                                      virNetServerClientPtr client ATTRIBU=
TE_UNUSED,
+                                      virNetServerClientPtr client,
                                       virNetMessagePtr msg ATTRIBUTE_UNUSE=
D,
                                       virNetMessageErrorPtr rerr,
                                       remote_domain_get_numa_parameters_ar=
gs *args,
@@ -3056,7 +3056,7 @@ remoteDispatchDomainGetNumaParameters(virNetServerPtr=
 server ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainGetBlkioParameters(virNetServerPtr server ATTRIBUTE_UN=
USED,
-                                       virNetServerClientPtr client ATTRIB=
UTE_UNUSED,
+                                       virNetServerClientPtr client,
                                        virNetMessagePtr msg ATTRIBUTE_UNUS=
ED,
                                        virNetMessageErrorPtr rerr,
                                        remote_domain_get_blkio_parameters_=
args *args,
@@ -3118,7 +3118,7 @@ remoteDispatchDomainGetBlkioParameters(virNetServerPt=
r server ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchNodeGetCPUStats(virNetServerPtr server ATTRIBUTE_UNUSED,
-                              virNetServerClientPtr client ATTRIBUTE_UNUSE=
D,
+                              virNetServerClientPtr client,
                               virNetMessagePtr msg ATTRIBUTE_UNUSED,
                               virNetMessageErrorPtr rerr,
                               remote_node_get_cpu_stats_args *args,
@@ -3190,7 +3190,7 @@ remoteDispatchNodeGetCPUStats(virNetServerPtr server =
ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchNodeGetMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED,
-                                 virNetServerClientPtr client ATTRIBUTE_UN=
USED,
+                                 virNetServerClientPtr client,
                                  virNetMessagePtr msg ATTRIBUTE_UNUSED,
                                  virNetMessageErrorPtr rerr,
                                  remote_node_get_memory_stats_args *args,
@@ -3262,7 +3262,7 @@ remoteDispatchNodeGetMemoryStats(virNetServerPtr serv=
er ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainGetLaunchSecurityInfo(virNetServerPtr server ATTRIBUTE=
_UNUSED,
-                                          virNetServerClientPtr client ATT=
RIBUTE_UNUSED,
+                                          virNetServerClientPtr client,
                                           virNetMessagePtr msg ATTRIBUTE_U=
NUSED,
                                           virNetMessageErrorPtr rerr,
                                           remote_domain_get_launch_securit=
y_info_args *args,
@@ -3309,7 +3309,7 @@ remoteDispatchDomainGetLaunchSecurityInfo(virNetServe=
rPtr server ATTRIBUTE_UNUSE
=20
 static int
 remoteDispatchDomainGetPerfEvents(virNetServerPtr server ATTRIBUTE_UNUSED,
-                                  virNetServerClientPtr client ATTRIBUTE_U=
NUSED,
+                                  virNetServerClientPtr client,
                                   virNetMessagePtr msg ATTRIBUTE_UNUSED,
                                   virNetMessageErrorPtr rerr,
                                   remote_domain_get_perf_events_args *args,
@@ -3356,7 +3356,7 @@ remoteDispatchDomainGetPerfEvents(virNetServerPtr ser=
ver ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainGetBlockJobInfo(virNetServerPtr server ATTRIBUTE_UNUSE=
D,
-                                    virNetServerClientPtr client ATTRIBUTE=
_UNUSED,
+                                    virNetServerClientPtr client,
                                     virNetMessagePtr msg ATTRIBUTE_UNUSED,
                                     virNetMessageErrorPtr rerr,
                                     remote_domain_get_block_job_info_args =
*args,
@@ -3396,7 +3396,7 @@ remoteDispatchDomainGetBlockJobInfo(virNetServerPtr s=
erver ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainGetBlockIoTune(virNetServerPtr server ATTRIBUTE_UNUSED,
-                                   virNetServerClientPtr client ATTRIBUTE_=
UNUSED,
+                                   virNetServerClientPtr client,
                                    virNetMessagePtr hdr ATTRIBUTE_UNUSED,
                                    virNetMessageErrorPtr rerr,
                                    remote_domain_get_block_io_tune_args *a=
rgs,
@@ -3974,7 +3974,7 @@ remoteDispatchAuthPolkit(virNetServerPtr server,
=20
 static int
 remoteDispatchNodeDeviceGetParent(virNetServerPtr server ATTRIBUTE_UNUSED,
-                                  virNetServerClientPtr client ATTRIBUTE_U=
NUSED,
+                                  virNetServerClientPtr client,
                                   virNetMessagePtr msg ATTRIBUTE_UNUSED,
                                   virNetMessageErrorPtr rerr,
                                   remote_node_device_get_parent_args *args,
@@ -4230,7 +4230,7 @@ remoteDispatchObjectEventSend(virNetServerClientPtr c=
lient,
=20
 static int
 remoteDispatchSecretGetValue(virNetServerPtr server ATTRIBUTE_UNUSED,
-                             virNetServerClientPtr client ATTRIBUTE_UNUSED,
+                             virNetServerClientPtr client,
                              virNetMessagePtr msg ATTRIBUTE_UNUSED,
                              virNetMessageErrorPtr rerr,
                              remote_secret_get_value_args *args,
@@ -4268,7 +4268,7 @@ remoteDispatchSecretGetValue(virNetServerPtr server A=
TTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainGetState(virNetServerPtr server ATTRIBUTE_UNUSED,
-                             virNetServerClientPtr client ATTRIBUTE_UNUSED,
+                             virNetServerClientPtr client,
                              virNetMessagePtr msg ATTRIBUTE_UNUSED,
                              virNetMessageErrorPtr rerr,
                              remote_domain_get_state_args *args,
@@ -4562,7 +4562,7 @@ remoteDispatchConnectDomainEventCallbackDeregisterAny=
(virNetServerPtr server ATT
=20
 static int
 qemuDispatchDomainMonitorCommand(virNetServerPtr server ATTRIBUTE_UNUSED,
-                                 virNetServerClientPtr client ATTRIBUTE_UN=
USED,
+                                 virNetServerClientPtr client,
                                  virNetMessagePtr msg ATTRIBUTE_UNUSED,
                                  virNetMessageErrorPtr rerr,
                                  qemu_domain_monitor_command_args *args,
@@ -4597,7 +4597,7 @@ qemuDispatchDomainMonitorCommand(virNetServerPtr serv=
er ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainMigrateBegin3(virNetServerPtr server ATTRIBUTE_UNUSED,
-                                  virNetServerClientPtr client ATTRIBUTE_U=
NUSED,
+                                  virNetServerClientPtr client,
                                   virNetMessagePtr msg ATTRIBUTE_UNUSED,
                                   virNetMessageErrorPtr rerr,
                                   remote_domain_migrate_begin3_args *args,
@@ -4648,7 +4648,7 @@ remoteDispatchDomainMigrateBegin3(virNetServerPtr ser=
ver ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainMigratePrepare3(virNetServerPtr server ATTRIBUTE_UNUSE=
D,
-                                    virNetServerClientPtr client ATTRIBUTE=
_UNUSED,
+                                    virNetServerClientPtr client,
                                     virNetMessagePtr msg ATTRIBUTE_UNUSED,
                                     virNetMessageErrorPtr rerr,
                                     remote_domain_migrate_prepare3_args *a=
rgs,
@@ -4704,7 +4704,7 @@ remoteDispatchDomainMigratePrepare3(virNetServerPtr s=
erver ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainMigratePerform3(virNetServerPtr server ATTRIBUTE_UNUSE=
D,
-                                    virNetServerClientPtr client ATTRIBUTE=
_UNUSED,
+                                    virNetServerClientPtr client,
                                     virNetMessagePtr msg ATTRIBUTE_UNUSED,
                                     virNetMessageErrorPtr rerr,
                                     remote_domain_migrate_perform3_args *a=
rgs,
@@ -4759,7 +4759,7 @@ remoteDispatchDomainMigratePerform3(virNetServerPtr s=
erver ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainMigrateFinish3(virNetServerPtr server ATTRIBUTE_UNUSED,
-                                   virNetServerClientPtr client ATTRIBUTE_=
UNUSED,
+                                   virNetServerClientPtr client,
                                    virNetMessagePtr msg ATTRIBUTE_UNUSED,
                                    virNetMessageErrorPtr rerr,
                                    remote_domain_migrate_finish3_args *arg=
s,
@@ -4813,7 +4813,7 @@ remoteDispatchDomainMigrateFinish3(virNetServerPtr se=
rver ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainMigrateConfirm3(virNetServerPtr server ATTRIBUTE_UNUSE=
D,
-                                    virNetServerClientPtr client ATTRIBUTE=
_UNUSED,
+                                    virNetServerClientPtr client,
                                     virNetMessagePtr msg ATTRIBUTE_UNUSED,
                                     virNetMessageErrorPtr rerr,
                                     remote_domain_migrate_confirm3_args *a=
rgs)
@@ -4913,7 +4913,7 @@ static int remoteDispatchConnectSupportsFeature(virNe=
tServerPtr server ATTRIBUTE
=20
 static int
 remoteDispatchDomainOpenGraphics(virNetServerPtr server ATTRIBUTE_UNUSED,
-                                 virNetServerClientPtr client ATTRIBUTE_UN=
USED,
+                                 virNetServerClientPtr client,
                                  virNetMessagePtr msg,
                                  virNetMessageErrorPtr rerr,
                                  remote_domain_open_graphics_args *args)
@@ -4954,7 +4954,7 @@ remoteDispatchDomainOpenGraphics(virNetServerPtr serv=
er ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainOpenGraphicsFd(virNetServerPtr server ATTRIBUTE_UNUSED,
-                                   virNetServerClientPtr client ATTRIBUTE_=
UNUSED,
+                                   virNetServerClientPtr client,
                                    virNetMessagePtr msg,
                                    virNetMessageErrorPtr rerr,
                                    remote_domain_open_graphics_fd_args *ar=
gs)
@@ -4997,7 +4997,7 @@ remoteDispatchDomainOpenGraphicsFd(virNetServerPtr se=
rver ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainGetInterfaceParameters(virNetServerPtr server ATTRIBUT=
E_UNUSED,
-                                           virNetServerClientPtr client AT=
TRIBUTE_UNUSED,
+                                           virNetServerClientPtr client,
                                            virNetMessagePtr msg ATTRIBUTE_=
UNUSED,
                                            virNetMessageErrorPtr rerr,
                                            remote_domain_get_interface_par=
ameters_args *args,
@@ -5060,7 +5060,7 @@ remoteDispatchDomainGetInterfaceParameters(virNetServ=
erPtr server ATTRIBUTE_UNUS
=20
 static int
 remoteDispatchDomainGetCPUStats(virNetServerPtr server ATTRIBUTE_UNUSED,
-                                virNetServerClientPtr client ATTRIBUTE_UNU=
SED,
+                                virNetServerClientPtr client,
                                 virNetMessagePtr hdr ATTRIBUTE_UNUSED,
                                 virNetMessageErrorPtr rerr,
                                 remote_domain_get_cpu_stats_args *args,
@@ -5192,7 +5192,7 @@ remoteDispatchDomainGetDiskErrors(virNetServerPtr ser=
ver ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchNodeGetSevInfo(virNetServerPtr server ATTRIBUTE_UNUSED,
-                             virNetServerClientPtr client ATTRIBUTE_UNUSED,
+                             virNetServerClientPtr client,
                              virNetMessagePtr msg ATTRIBUTE_UNUSED,
                              virNetMessageErrorPtr rerr,
                              remote_node_get_sev_info_args *args,
@@ -5236,7 +5236,7 @@ remoteDispatchNodeGetSevInfo(virNetServerPtr server A=
TTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchNodeGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNU=
SED,
-                                      virNetServerClientPtr client ATTRIBU=
TE_UNUSED,
+                                      virNetServerClientPtr client,
                                       virNetMessagePtr msg ATTRIBUTE_UNUSE=
D,
                                       virNetMessageErrorPtr rerr,
                                       remote_node_get_memory_parameters_ar=
gs *args,
@@ -5293,7 +5293,7 @@ remoteDispatchNodeGetMemoryParameters(virNetServerPtr=
 server ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchNodeGetCPUMap(virNetServerPtr server ATTRIBUTE_UNUSED,
-                            virNetServerClientPtr client ATTRIBUTE_UNUSED,
+                            virNetServerClientPtr client,
                             virNetMessagePtr msg ATTRIBUTE_UNUSED,
                             virNetMessageErrorPtr rerr,
                             remote_node_get_cpu_map_args *args,
@@ -5340,7 +5340,7 @@ remoteDispatchNodeGetCPUMap(virNetServerPtr server AT=
TRIBUTE_UNUSED,
=20
 static int
 lxcDispatchDomainOpenNamespace(virNetServerPtr server ATTRIBUTE_UNUSED,
-                               virNetServerClientPtr client ATTRIBUTE_UNUS=
ED,
+                               virNetServerClientPtr client,
                                virNetMessagePtr msg ATTRIBUTE_UNUSED,
                                virNetMessageErrorPtr rerr,
                                lxc_domain_open_namespace_args *args)
@@ -5440,7 +5440,7 @@ remoteDispatchDomainGetJobStats(virNetServerPtr serve=
r ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainMigrateBegin3Params(virNetServerPtr server ATTRIBUTE_U=
NUSED,
-                                        virNetServerClientPtr client ATTRI=
BUTE_UNUSED,
+                                        virNetServerClientPtr client,
                                         virNetMessagePtr msg ATTRIBUTE_UNU=
SED,
                                         virNetMessageErrorPtr rerr,
                                         remote_domain_migrate_begin3_param=
s_args *args,
@@ -5497,7 +5497,7 @@ remoteDispatchDomainMigrateBegin3Params(virNetServerP=
tr server ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchDomainMigratePrepare3Params(virNetServerPtr server ATTRIBUTE=
_UNUSED,
-                                          virNetServerClientPtr client ATT=
RIBUTE_UNUSED,
+                                          virNetServerClientPtr client,
                                           virNetMessagePtr msg ATTRIBUTE_U=
NUSED,
                                           virNetMessageErrorPtr rerr,
                                           remote_domain_migrate_prepare3_p=
arams_args *args,
@@ -5627,7 +5627,7 @@ remoteDispatchDomainMigratePrepareTunnel3Params(virNe=
tServerPtr server ATTRIBUTE
=20
 static int
 remoteDispatchDomainMigratePerform3Params(virNetServerPtr server ATTRIBUTE=
_UNUSED,
-                                          virNetServerClientPtr client ATT=
RIBUTE_UNUSED,
+                                          virNetServerClientPtr client,
                                           virNetMessagePtr msg ATTRIBUTE_U=
NUSED,
                                           virNetMessageErrorPtr rerr,
                                           remote_domain_migrate_perform3_p=
arams_args *args,
@@ -5688,7 +5688,7 @@ remoteDispatchDomainMigratePerform3Params(virNetServe=
rPtr server ATTRIBUTE_UNUSE
=20
 static int
 remoteDispatchDomainMigrateFinish3Params(virNetServerPtr server ATTRIBUTE_=
UNUSED,
-                                         virNetServerClientPtr client ATTR=
IBUTE_UNUSED,
+                                         virNetServerClientPtr client,
                                          virNetMessagePtr msg ATTRIBUTE_UN=
USED,
                                          virNetMessageErrorPtr rerr,
                                          remote_domain_migrate_finish3_par=
ams_args *args,
@@ -5749,7 +5749,7 @@ remoteDispatchDomainMigrateFinish3Params(virNetServer=
Ptr server ATTRIBUTE_UNUSED
=20
 static int
 remoteDispatchDomainMigrateConfirm3Params(virNetServerPtr server ATTRIBUTE=
_UNUSED,
-                                          virNetServerClientPtr client ATT=
RIBUTE_UNUSED,
+                                          virNetServerClientPtr client,
                                           virNetMessagePtr msg ATTRIBUTE_U=
NUSED,
                                           virNetMessageErrorPtr rerr,
                                           remote_domain_migrate_confirm3_p=
arams_args *args)
@@ -5800,7 +5800,7 @@ remoteDispatchDomainMigrateConfirm3Params(virNetServe=
rPtr server ATTRIBUTE_UNUSE
=20
 static int
 remoteDispatchConnectGetCPUModelNames(virNetServerPtr server ATTRIBUTE_UNU=
SED,
-                                      virNetServerClientPtr client ATTRIBU=
TE_UNUSED,
+                                      virNetServerClientPtr client,
                                       virNetMessagePtr msg ATTRIBUTE_UNUSE=
D,
                                       virNetMessageErrorPtr rerr,
                                       remote_connect_get_cpu_model_names_a=
rgs *args,
@@ -7181,7 +7181,7 @@ remoteDispatchStorageVolGetInfoFlags(virNetServerPtr =
server ATTRIBUTE_UNUSED,
=20
 static int
 remoteDispatchNetworkPortGetParameters(virNetServerPtr server ATTRIBUTE_UN=
USED,
-                                       virNetServerClientPtr client ATTRIB=
UTE_UNUSED,
+                                       virNetServerClientPtr client,
                                        virNetMessagePtr msg ATTRIBUTE_UNUS=
ED,
                                        virNetMessageErrorPtr rerr,
                                        remote_network_port_get_parameters_=
args *args,
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277333; cv=none;
	d=zoho.com; s=zohoarc;
	b=OP0JANd5govnN9F2vKCW+LT+GT/oyvn0NBjf3WgU/6RFLudvSZayLL+aT0RKReMew+YCcOtNvxzzTyk+tBSfjbtJFVoFCNKqASljf4YaimyMSASN9Mfi7WRnE/KuCQSidVjLVVTGrBsco43Xsp4z20jGUy+uifcld0UtrQ2GT1M=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277333;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=zjt6FgyZYsf2ByxFdpgoKpZ8suKU7f8kn7RS6VQ+hjk=;
	b=OTou56A/uf5Hvgvk+bYobZ2ogpflRodHRbRXAQwHqvNaW2vWn0jO60hkKrO2odN7Uo/h7y6S1yJ5FNfOu/y7/7pvaVG6ldHyOqYnx7mqwwdISIlaV/kTTkiQAcvEZVJa6CCHf7p948MuCQzAGWnMwWhVSwegXaeuA4o7+uvJCzg=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 156527733396399.42347910326441;
 Thu, 8 Aug 2019 08:15:33 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id B61DE970F1;
	Thu,  8 Aug 2019 15:15:32 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 81BEF60461;
	Thu,  8 Aug 2019 15:15:32 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 30F3AEEFF;
	Thu,  8 Aug 2019 15:15:32 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FC69B027985 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:12:06 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 6BAAA10016F3; Thu,  8 Aug 2019 15:12:06 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 4372C1001284;
	Thu,  8 Aug 2019 15:12:05 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:37 +0100
Message-Id: <20190808151044.11385-36-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 35/42] remote: change generated methods to not
	directly access connection
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]);
 Thu, 08 Aug 2019 15:15:33 +0000 (UTC)

The driver dispatch methods access the priv->conn variables directly.
In future we want to dynamically open the connections for the secondary
driver. Thus we want the methods to call a method to get the connection
handle instead of assuming the private variable is non-NULL.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/admin/admin_server_dispatch.c   |   9 +++
 src/remote/remote_daemon_dispatch.c | 121 ++++++++++++++++++++++++++++
 src/rpc/gendispatch.pl              |  96 ++++++++++++----------
 3 files changed, 183 insertions(+), 43 deletions(-)

diff --git a/src/admin/admin_server_dispatch.c b/src/admin/admin_server_dis=
patch.c
index 6e3b99f97d..1973664488 100644
--- a/src/admin/admin_server_dispatch.c
+++ b/src/admin/admin_server_dispatch.c
@@ -206,6 +206,15 @@ adminConnectGetLibVersion(virNetDaemonPtr dmn ATTRIBUT=
E_UNUSED,
     return 0;
 }
=20
+static virNetDaemonPtr
+adminGetConn(virNetServerClientPtr client)
+{
+    struct daemonAdmClientPrivate *priv =3D
+        virNetServerClientGetPrivateData(client);
+
+    return priv->dmn;
+}
+
 static int
 adminDispatchServerGetThreadpoolParameters(virNetServerPtr server ATTRIBUT=
E_UNUSED,
                                            virNetServerClientPtr client,
diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon=
_dispatch.c
index 0145279d72..90103f5093 100644
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -112,6 +112,22 @@ remoteSerializeDomainDiskErrors(virDomainDiskErrorPtr =
errors,
                                 remote_domain_disk_error **ret_errors_val,
                                 u_int *ret_errors_len);
=20
+static virConnectPtr
+remoteGetHypervisorConn(virNetServerClientPtr client);
+static virConnectPtr
+remoteGetInterfaceConn(virNetServerClientPtr client);
+static virConnectPtr
+remoteGetNetworkConn(virNetServerClientPtr client);
+static virConnectPtr
+remoteGetNodeDevConn(virNetServerClientPtr client);
+static virConnectPtr
+remoteGetNWFilterConn(virNetServerClientPtr client);
+static virConnectPtr
+remoteGetSecretConn(virNetServerClientPtr client);
+static virConnectPtr
+remoteGetStorageConn(virNetServerClientPtr client);
+
+
 #include "remote_daemon_dispatch_stubs.h"
 #include "remote_daemon_dispatch_qemu_stubs.h"
 #include "remote_daemon_dispatch_lxc_stubs.h"
@@ -1925,6 +1941,111 @@ static void remoteClientCloseFunc(virNetServerClien=
tPtr client)
 }
=20
=20
+static virConnectPtr
+remoteGetHypervisorConn(virNetServerClientPtr client)
+{
+    struct daemonClientPrivate *priv =3D
+        virNetServerClientGetPrivateData(client);
+
+    if (!priv->conn) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
+        return NULL;
+    }
+
+    return priv->conn;
+}
+
+
+static virConnectPtr
+remoteGetInterfaceConn(virNetServerClientPtr client)
+{
+    struct daemonClientPrivate *priv =3D
+        virNetServerClientGetPrivateData(client);
+
+    if (!priv->interfaceConn) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
+        return NULL;
+    }
+
+    return priv->interfaceConn;
+}
+
+
+static virConnectPtr
+remoteGetNetworkConn(virNetServerClientPtr client)
+{
+    struct daemonClientPrivate *priv =3D
+        virNetServerClientGetPrivateData(client);
+
+    if (!priv->networkConn) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
+        return NULL;
+    }
+
+    return priv->networkConn;
+}
+
+
+static virConnectPtr
+remoteGetNodeDevConn(virNetServerClientPtr client)
+{
+    struct daemonClientPrivate *priv =3D
+        virNetServerClientGetPrivateData(client);
+
+    if (!priv->nodedevConn) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
+        return NULL;
+    }
+
+    return priv->nodedevConn;
+}
+
+
+static virConnectPtr
+remoteGetNWFilterConn(virNetServerClientPtr client)
+{
+    struct daemonClientPrivate *priv =3D
+        virNetServerClientGetPrivateData(client);
+
+    if (!priv->nwfilterConn) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
+        return NULL;
+    }
+
+    return priv->nwfilterConn;
+}
+
+
+static virConnectPtr
+remoteGetSecretConn(virNetServerClientPtr client)
+{
+    struct daemonClientPrivate *priv =3D
+        virNetServerClientGetPrivateData(client);
+
+    if (!priv->secretConn) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
+        return NULL;
+    }
+
+    return priv->secretConn;
+}
+
+
+static virConnectPtr
+remoteGetStorageConn(virNetServerClientPtr client)
+{
+    struct daemonClientPrivate *priv =3D
+        virNetServerClientGetPrivateData(client);
+
+    if (!priv->storageConn) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
+        return NULL;
+    }
+
+    return priv->storageConn;
+}
+
+
 void *remoteClientNew(virNetServerClientPtr client,
                       void *opaque ATTRIBUTE_UNUSED)
 {
diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
index 4e548e14cd..ff21834091 100755
--- a/src/rpc/gendispatch.pl
+++ b/src/rpc/gendispatch.pl
@@ -111,13 +111,29 @@ sub name_to_TypeName {
     return $typename;
 }
=20
-sub get_conn_arg {
+sub get_conn_type {
+    if ($structprefix eq "admin") {
+        return "virNetDaemonPtr";
+    } else {
+        return "virConnectPtr";
+    }
+}
+
+sub get_conn_var {
+    if ($structprefix eq "admin") {
+        return "dmn";
+    } else {
+        return "conn";
+    }
+}
+
+sub get_conn_method {
     my $proc =3D shift;
     my $args =3D shift;
     my $rets =3D shift;
=20
     if ($structprefix eq "admin") {
-        return "priv->dmn";
+        return "adminGetConn";
     }
=20
     my @types;
@@ -127,22 +143,22 @@ sub get_conn_arg {
     # This correctly detects most APIs
     foreach my $type (@types) {
         if ($type =3D~ /remote_nonnull_interface/) {
-            return "priv->interfaceConn";
+            return "remoteGetInterfaceConn";
         }
         if ($type =3D~ /remote_nonnull_network/) {
-            return "priv->networkConn";
+            return "remoteGetNetworkConn";
         }
         if ($type =3D~ /remote_nonnull_node_device/) {
-            return "priv->nodedevConn";
+            return "remoteGetNodeDevConn";
         }
         if ($type =3D~ /remote_nonnull_nwfilter/) {
-            return "priv->nwfilterConn";
+            return "remoteGetNWFilterConn";
         }
         if ($type =3D~ /remote_nonnull_secret/) {
-            return "priv->secretConn";
+            return "remoteGetSecretConn";
         }
         if ($type =3D~ /remote_nonnull_storage/) {
-            return "priv->storageConn";
+            return "remoteGetStorageConn";
         }
     }
=20
@@ -150,25 +166,25 @@ sub get_conn_arg {
     # return things which aren't objects. eg list
     # of pool names, or number of pools.
     if ($proc =3D~ /Connect.*Interface/ || $proc =3D~ /InterfaceChange/) {
-        return "priv->interfaceConn";
+        return "remoteGetInterfaceConn";
     }
     if ($proc =3D~ /Connect.*Network/) {
-        return "priv->networkConn";
+        return "remoteGetNetworkConn";
     }
     if ($proc =3D~ /Node.*Device/) {
-        return "priv->nodedevConn";
+        return "remoteGetNodeDevConn";
     }
     if ($proc =3D~ /Connect.*NWFilter/) {
-        return "priv->nwfilterConn";
+        return "remoteGetNWFilterConn";
     }
     if ($proc =3D~ /Connect.*Secret/) {
-        return "priv->secretConn";
+        return "remoteGetSecretConn";
     }
     if ($proc =3D~ /Connect.*Storage/) {
-        return "priv->storageConn";
+        return "remoteGetStorageConn";
     }
=20
-    return "priv->conn";
+    return "remoteGetHypervisorConn";
 }
=20
 # Read the input file (usually remote_protocol.x) and form an
@@ -535,7 +551,9 @@ elsif ($mode eq "server") {
         my @free_list =3D ();
         my @free_list_on_error =3D ("virNetMessageSaveError(rerr);");
=20
-        my $conn =3D get_conn_arg($call->{ProcName}, $call->{args_members}=
, $call->{ret_members});
+        my $conn_method =3D get_conn_method($call->{ProcName}, $call->{arg=
s_members}, $call->{ret_members});
+        my $conn_var =3D get_conn_var();
+        my $conn_type =3D get_conn_type();
=20
         # handle arguments to the function
         if ($argtype ne "void") {
@@ -547,7 +565,7 @@ elsif ($mode eq "server") {
                 $has_node_device =3D 1;
                 push(@vars_list, "virNodeDevicePtr dev =3D NULL");
                 push(@getters_list,
-                     "    if (!(dev =3D virNodeDeviceLookupByName($conn, a=
rgs->name)))\n" .
+                     "    if (!(dev =3D virNodeDeviceLookupByName($conn_va=
r, args->name)))\n" .
                      "        goto cleanup;\n");
                 push(@args_list, "dev");
                 push(@free_list,
@@ -563,7 +581,7 @@ elsif ($mode eq "server") {
=20
                     push(@vars_list, "vir${type_name}Ptr $2 =3D NULL");
                     push(@getters_list,
-                         "    if (!($2 =3D get_nonnull_$1($conn, args->$2)=
))\n" .
+                         "    if (!($2 =3D get_nonnull_$1($conn_var, args-=
>$2)))\n" .
                          "        goto cleanup;\n");
                     push(@args_list, "$2");
                     push(@free_list,
@@ -574,7 +592,7 @@ elsif ($mode eq "server") {
                     push(@vars_list, "virDomainPtr dom =3D NULL");
                     push(@vars_list, "virDomain${type_name}Ptr ${1} =3D NU=
LL");
                     push(@getters_list,
-                         "    if (!(dom =3D get_nonnull_domain($conn, args=
->${2}.dom)))\n" .
+                         "    if (!(dom =3D get_nonnull_domain($conn_var, =
args->${2}.dom)))\n" .
                          "        goto cleanup;\n" .
                          "\n" .
                          "    if (!($1 =3D get_nonnull_domain_${1}(dom, ar=
gs->$2)))\n" .
@@ -584,11 +602,11 @@ elsif ($mode eq "server") {
                          "    virObjectUnref($1);\n" .
                          "    virObjectUnref(dom);");
                 } elsif ($args_member =3D~ m/^(?:(?:admin|remote)_string|r=
emote_uuid) (\S+)<\S+>;/) {
-                    push(@args_list, $conn) if !@args_list;
+                    push(@args_list, $conn_var) if !@args_list;
                     push(@args_list, "args->$1.$1_val");
                     push(@args_list, "args->$1.$1_len");
                 } elsif ($args_member =3D~ m/^(?:opaque|(?:admin|remote)_n=
onnull_string) (\S+)<\S+>;(.*)$/) {
-                    push(@args_list, $conn) if !@args_list;
+                    push(@args_list, $conn_var) if !@args_list;
=20
                     my $cast =3D "";
                     my $arg_name =3D $1;
@@ -605,7 +623,7 @@ elsif ($mode eq "server") {
                     push(@args_list, "${cast}args->$arg_name.${arg_name}_v=
al");
                     push(@args_list, "args->$arg_name.${arg_name}_len");
                 } elsif ($args_member =3D~ m/^(?:unsigned )?int (\S+)<\S+>=
;/) {
-                    push(@args_list, $conn) if !@args_list;
+                    push(@args_list, $conn_var) if !@args_list;
=20
                     push(@args_list, "args->$1.$1_val");
                     push(@args_list, "args->$1.$1_len");
@@ -613,7 +631,7 @@ elsif ($mode eq "server") {
                     push(@vars_list, "virTypedParameterPtr $1 =3D NULL");
                     push(@vars_list, "int n$1 =3D 0");
                     if ($call->{ProcName} eq "NodeSetMemoryParameters") {
-                        push(@args_list, "$conn");
+                        push(@args_list, $conn_var);
                     }
                     push(@args_list, "$1");
                     push(@args_list, "n$1");
@@ -628,25 +646,25 @@ elsif ($mode eq "server") {
                     # just make all other array types fail
                     die "unhandled type for argument value: $args_member";
                 } elsif ($args_member =3D~ m/^remote_uuid (\S+);/) {
-                    push(@args_list, $conn) if !@args_list;
+                    push(@args_list, $conn_var) if !@args_list;
=20
                     push(@args_list, "(unsigned char *) args->$1");
                 } elsif ($args_member =3D~ m/^(?:admin|remote)_string (\S+=
);/) {
-                    push(@args_list, $conn) if !@args_list;
+                    push(@args_list, $conn_var) if !@args_list;
=20
                     push(@vars_list, "char *$1");
                     push(@optionals_list, "$1");
                     push(@args_list, "$1");
                 } elsif ($args_member =3D~ m/^(?:admin|remote)_nonnull_str=
ing (\S+);/) {
-                    push(@args_list, $conn) if !@args_list;
+                    push(@args_list, $conn_var) if !@args_list;
=20
                     push(@args_list, "args->$1");
                 } elsif ($args_member =3D~ m/^(unsigned )?int (\S+);/) {
-                    push(@args_list, $conn) if !@args_list;
+                    push(@args_list, $conn_var) if !@args_list;
=20
                     push(@args_list, "args->$2");
                 } elsif ($args_member =3D~ m/^(unsigned )?hyper (\S+);/) {
-                    push(@args_list, $conn) if !@args_list;
+                    push(@args_list, $conn_var) if !@args_list;
=20
                     my $arg_name =3D $2;
=20
@@ -665,7 +683,7 @@ elsif ($mode eq "server") {
=20
                     push(@vars_list, "virNet${type_name}Ptr $2 =3D NULL");
                     push(@getters_list,
-                         "    if (!($2 =3D get_nonnull_$1($conn, args->$2)=
))\n" .
+                         "    if (!($2 =3D get_nonnull_$1($conn_var, args-=
>$2)))\n" .
                          "        goto cleanup;\n");
                     push(@args_list, "$2");
                     push(@free_list,
@@ -676,7 +694,7 @@ elsif ($mode eq "server") {
                     push(@vars_list, "virNetServerPtr srv =3D NULL");
                     push(@vars_list, "virNetServer${type_name}Ptr $2 =3D N=
ULL");
                     push(@getters_list,
-                         "    if (!(srv =3D get_nonnull_server($conn, args=
->$2.srv)))\n" .
+                         "    if (!(srv =3D get_nonnull_server($conn_var, =
args->$2.srv)))\n" .
                          "        goto cleanup;\n");
                     push(@getters_list,
                          "    if (!($2 =3D get_nonnull_$1(srv, args->$2)))=
\n" .
@@ -952,7 +970,7 @@ elsif ($mode eq "server") {
         # select struct type for multi-return-value functions
         if ($multi_ret) {
             if (defined $call->{ret_offset}) {
-                push(@args_list, $conn) if !@args_list;
+                push(@args_list, $conn_var) if !@args_list;
=20
                 if ($modern_ret_as_list) {
                     my $struct_name =3D name_to_TypeName($modern_ret_struc=
t_name);
@@ -1032,13 +1050,6 @@ elsif ($mode eq "server") {
             print "    $var;\n";
         }
=20
-        if ($structprefix eq "admin") {
-            print "    struct daemonAdmClientPrivate *priv =3D\n";
-        } else {
-            print "    struct daemonClientPrivate *priv =3D\n";
-        }
-        print "        virNetServerClientGetPrivateData(client);\n";
-
         if ($call->{streamflag} ne "none") {
             print "    virStreamPtr st =3D NULL;\n";
             print "    daemonClientStreamPtr stream =3D NULL;\n";
@@ -1051,10 +1062,9 @@ elsif ($mode eq "server") {
=20
         print "\n";
=20
-        print "    if (!$conn) {\n";
-        print "        virReportError(VIR_ERR_INTERNAL_ERROR, \"%s\", _(\"=
connection not open\"));\n";
+        print "    $conn_type $conn_var =3D $conn_method(client);\n";
+        print "    if (!$conn_var) \n";
         print "        goto cleanup;\n";
-        print "    }\n";
         print "\n";
=20
         if ($single_ret_as_list) {
@@ -1081,7 +1091,7 @@ elsif ($mode eq "server") {
         }
=20
         if ($call->{streamflag} ne "none") {
-            print "    if (!(st =3D virStreamNew($conn, VIR_STREAM_NONBLOC=
K)))\n";
+            print "    if (!(st =3D virStreamNew($conn_var, VIR_STREAM_NON=
BLOCK)))\n";
             print "        goto cleanup;\n";
             print "\n";
             print "    if (!(stream =3D daemonCreateClientStream(client, s=
t, remoteProgram, &msg->header, sparse)))\n";
@@ -1098,7 +1108,7 @@ elsif ($mode eq "server") {
         } elsif (!$multi_ret) {
             my $proc_name =3D $call->{ProcName};
=20
-            push(@args_list, $conn) if !@args_list;
+            push(@args_list, $conn_var) if !@args_list;
=20
             if ($structprefix eq "qemu" &&
                 $call->{ProcName} =3D~ /^(Connect)?Domain/) {
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277240; cv=none;
	d=zoho.com; s=zohoarc;
	b=X2hpMWunxky2FUcIEkPg89KDnNiftLbbN+pftQwwdS64UMl6URim/zT07HxGjCfjCTRH5ue09olA+23FljR65wd4/iT/+Bmu5hJZGeZHwS9mTxsaQpcq7rYtigfSO5BCZppgLnkDaDfgM+JL5pBPucTcU72moj+l4gyWwJJSV6o=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277240;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=OZnLnu2GXVpBOvmFL6dpg1E5W0mavrRCVeNA2R7yyqo=;
	b=R6ojJIBkt5gCuwmaAB5xryOlMuG7Iq03DJiVzIb+V+lS+iV4JO0WzBDYVYxzvqWhfmJIvVetNcHFiBcAp2dFyUcRCu5WTnsUhIRn5vMkfr4yj5E1Vhu2chMbZ+w+4PgeF8mVsaGirHSVRBRiFtaJprXtgNEIc3X/yOg6ef16L5E=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277240087665.8700902007563;
 Thu, 8 Aug 2019 08:14:00 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id F17F5C001F03;
	Thu,  8 Aug 2019 15:13:58 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id C7BAD60BE1;
	Thu,  8 Aug 2019 15:13:58 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 89C05246A3;
	Thu,  8 Aug 2019 15:13:58 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FC837027996 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:12:08 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 174D51001958; Thu,  8 Aug 2019 15:12:08 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id E4AD9100194E;
	Thu,  8 Aug 2019 15:12:06 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:38 +0100
Message-Id: <20190808151044.11385-37-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>,
	Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 36/42] remote: fix lock ordering mistake in
	event registration
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]);
 Thu, 08 Aug 2019 15:13:59 +0000 (UTC)

If the event (un)registration methods are invoked while no connection is
open, they jump to a cleanup block which unlocks a mutex which is not
currently locked.

Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/remote_daemon_dispatch.c | 64 ++++++++++++++---------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon=
_dispatch.c
index 90103f5093..4a3312a944 100644
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -4212,13 +4212,13 @@ remoteDispatchConnectDomainEventRegister(virNetServ=
erPtr server ATTRIBUTE_UNUSED
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
+    virMutexLock(&priv->lock);
+
     if (!priv->conn) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
         goto cleanup;
     }
=20
-    virMutexLock(&priv->lock);
-
     /* If we call register first, we could append a complete callback
      * to our array, but on OOM append failure, we'd have to then hope
      * deregister works to undo our register.  So instead we append an
@@ -4276,13 +4276,13 @@ remoteDispatchConnectDomainEventDeregister(virNetSe=
rverPtr server ATTRIBUTE_UNUS
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
+    virMutexLock(&priv->lock);
+
     if (!priv->conn) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
         goto cleanup;
     }
=20
-    virMutexLock(&priv->lock);
-
     for (i =3D 0; i < priv->ndomainEventCallbacks; i++) {
         if (priv->domainEventCallbacks[i]->eventID =3D=3D VIR_DOMAIN_EVENT=
_ID_LIFECYCLE) {
             callbackID =3D priv->domainEventCallbacks[i]->callbackID;
@@ -4440,13 +4440,13 @@ remoteDispatchConnectDomainEventRegisterAny(virNetS=
erverPtr server ATTRIBUTE_UNU
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
+    virMutexLock(&priv->lock);
+
     if (!priv->conn) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
         goto cleanup;
     }
=20
-    virMutexLock(&priv->lock);
-
     /* We intentionally do not use VIR_DOMAIN_EVENT_ID_LAST here; any
      * new domain events added after this point should only use the
      * modern callback style of RPC.  */
@@ -4516,13 +4516,13 @@ remoteDispatchConnectDomainEventCallbackRegisterAny=
(virNetServerPtr server ATTRI
         virNetServerClientGetPrivateData(client);
     virDomainPtr dom =3D NULL;
=20
+    virMutexLock(&priv->lock);
+
     if (!priv->conn) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
         goto cleanup;
     }
=20
-    virMutexLock(&priv->lock);
-
     if (args->dom &&
         !(dom =3D get_nonnull_domain(priv->conn, *args->dom)))
         goto cleanup;
@@ -4590,13 +4590,13 @@ remoteDispatchConnectDomainEventDeregisterAny(virNe=
tServerPtr server ATTRIBUTE_U
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
+    virMutexLock(&priv->lock);
+
     if (!priv->conn) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
         goto cleanup;
     }
=20
-    virMutexLock(&priv->lock);
-
     /* We intentionally do not use VIR_DOMAIN_EVENT_ID_LAST here; any
      * new domain events added after this point should only use the
      * modern callback style of RPC.  */
@@ -4647,13 +4647,13 @@ remoteDispatchConnectDomainEventCallbackDeregisterA=
ny(virNetServerPtr server ATT
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
+    virMutexLock(&priv->lock);
+
     if (!priv->conn) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
         goto cleanup;
     }
=20
-    virMutexLock(&priv->lock);
-
     for (i =3D 0; i < priv->ndomainEventCallbacks; i++) {
         if (priv->domainEventCallbacks[i]->callbackID =3D=3D args->callbac=
kID)
             break;
@@ -6089,13 +6089,13 @@ remoteDispatchConnectNetworkEventRegisterAny(virNet=
ServerPtr server ATTRIBUTE_UN
         virNetServerClientGetPrivateData(client);
     virNetworkPtr net =3D NULL;
=20
+    virMutexLock(&priv->lock);
+
     if (!priv->networkConn) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
         goto cleanup;
     }
=20
-    virMutexLock(&priv->lock);
-
     if (args->net &&
         !(net =3D get_nonnull_network(priv->networkConn, *args->net)))
         goto cleanup;
@@ -6162,13 +6162,13 @@ remoteDispatchConnectNetworkEventDeregisterAny(virN=
etServerPtr server ATTRIBUTE_
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
+    virMutexLock(&priv->lock);
+
     if (!priv->networkConn) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
         goto cleanup;
     }
=20
-    virMutexLock(&priv->lock);
-
     for (i =3D 0; i < priv->nnetworkEventCallbacks; i++) {
         if (priv->networkEventCallbacks[i]->callbackID =3D=3D args->callba=
ckID)
             break;
@@ -6211,13 +6211,13 @@ remoteDispatchConnectStoragePoolEventRegisterAny(vi=
rNetServerPtr server ATTRIBUT
         virNetServerClientGetPrivateData(client);
     virStoragePoolPtr  pool =3D NULL;
=20
+    virMutexLock(&priv->lock);
+
     if (!priv->storageConn) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
         goto cleanup;
     }
=20
-    virMutexLock(&priv->lock);
-
     if (args->pool &&
         !(pool =3D get_nonnull_storage_pool(priv->storageConn, *args->pool=
)))
         goto cleanup;
@@ -6283,13 +6283,13 @@ remoteDispatchConnectStoragePoolEventDeregisterAny(=
virNetServerPtr server ATTRIB
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
+    virMutexLock(&priv->lock);
+
     if (!priv->storageConn) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
         goto cleanup;
     }
=20
-    virMutexLock(&priv->lock);
-
     for (i =3D 0; i < priv->nstorageEventCallbacks; i++) {
         if (priv->storageEventCallbacks[i]->callbackID =3D=3D args->callba=
ckID)
             break;
@@ -6332,13 +6332,13 @@ remoteDispatchConnectNodeDeviceEventRegisterAny(vir=
NetServerPtr server ATTRIBUTE
         virNetServerClientGetPrivateData(client);
     virNodeDevicePtr  dev =3D NULL;
=20
+    virMutexLock(&priv->lock);
+
     if (!priv->nodedevConn) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
         goto cleanup;
     }
=20
-    virMutexLock(&priv->lock);
-
     if (args->dev &&
         !(dev =3D get_nonnull_node_device(priv->nodedevConn, *args->dev)))
         goto cleanup;
@@ -6404,13 +6404,13 @@ remoteDispatchConnectNodeDeviceEventDeregisterAny(v=
irNetServerPtr server ATTRIBU
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
+    virMutexLock(&priv->lock);
+
     if (!priv->nodedevConn) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
         goto cleanup;
     }
=20
-    virMutexLock(&priv->lock);
-
     for (i =3D 0; i < priv->nnodeDeviceEventCallbacks; i++) {
         if (priv->nodeDeviceEventCallbacks[i]->callbackID =3D=3D args->cal=
lbackID)
             break;
@@ -6453,13 +6453,13 @@ remoteDispatchConnectSecretEventRegisterAny(virNetS=
erverPtr server ATTRIBUTE_UNU
         virNetServerClientGetPrivateData(client);
     virSecretPtr secret =3D NULL;
=20
+    virMutexLock(&priv->lock);
+
     if (!priv->secretConn) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
         goto cleanup;
     }
=20
-    virMutexLock(&priv->lock);
-
     if (args->secret &&
         !(secret =3D get_nonnull_secret(priv->secretConn, *args->secret)))
         goto cleanup;
@@ -6525,13 +6525,13 @@ remoteDispatchConnectSecretEventDeregisterAny(virNe=
tServerPtr server ATTRIBUTE_U
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
+    virMutexLock(&priv->lock);
+
     if (!priv->secretConn) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
         goto cleanup;
     }
=20
-    virMutexLock(&priv->lock);
-
     for (i =3D 0; i < priv->nsecretEventCallbacks; i++) {
         if (priv->secretEventCallbacks[i]->callbackID =3D=3D args->callbac=
kID)
             break;
@@ -6575,13 +6575,13 @@ qemuDispatchConnectDomainMonitorEventRegister(virNe=
tServerPtr server ATTRIBUTE_U
     virDomainPtr dom =3D NULL;
     const char *event =3D args->event ? *args->event : NULL;
=20
+    virMutexLock(&priv->lock);
+
     if (!priv->conn) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
         goto cleanup;
     }
=20
-    virMutexLock(&priv->lock);
-
     if (args->dom &&
         !(dom =3D get_nonnull_domain(priv->conn, *args->dom)))
         goto cleanup;
@@ -6643,13 +6643,13 @@ qemuDispatchConnectDomainMonitorEventDeregister(vir=
NetServerPtr server ATTRIBUTE
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
+    virMutexLock(&priv->lock);
+
     if (!priv->conn) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
         goto cleanup;
     }
=20
-    virMutexLock(&priv->lock);
-
     for (i =3D 0; i < priv->nqemuEventCallbacks; i++) {
         if (priv->qemuEventCallbacks[i]->callbackID =3D=3D args->callbackI=
D)
             break;
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277244; cv=none;
	d=zoho.com; s=zohoarc;
	b=hpDkNR1Jv1QmTupGAOikM234ysBYkU0hwV1PwImBWvL6MYCCvnlk5gctJNDw/9cH3bW5EWaEqFGnoUq5bEMRLPGY8eNQpU46Yn6yw+pMNAOhC7hatNDmA3Q2Uef77LhQehwpS9DWkhjxl3ksZbtzhD/mri7hCLMRuBHBLjkQ/CE=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277244;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=Ap2Vaictdl9cNuyTlA5o1DkfMol/Yi0AZvLvZQJOKIE=;
	b=YUZDnFDZ+S5BUwwesUiPiP7SuHJ7mSnw/tRbZRAWk30Dmko9oieVOs3qEzEopviRkOslMmkW4Wrtk9bvLy5+N3IDQtDhdWS1cM8CxUImTAo5LVyfUKzEBQ/5iWOchEtD8xXCc1KHK7kBmOWotPheqjTkwuE7M/u5lqTNBhItVu0=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277244318838.3726832634462;
 Thu, 8 Aug 2019 08:14:04 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com
 [10.5.11.14])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id DDBD330084AC;
	Thu,  8 Aug 2019 15:14:02 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id A5ED76D0AD;
	Thu,  8 Aug 2019 15:14:02 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5D8B718005A4;
	Thu,  8 Aug 2019 15:14:02 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FC9iE028001 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:12:10 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id F07181001948; Thu,  8 Aug 2019 15:12:09 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 72A851001955;
	Thu,  8 Aug 2019 15:12:08 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:39 +0100
Message-Id: <20190808151044.11385-38-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 37/42] remote: change hand written methods to
	not directly access connection
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]);
 Thu, 08 Aug 2019 15:14:03 +0000 (UTC)

The driver dispatch methods access the priv->conn variables directly.
In future we want to dynamically open the connections for the secondary
driver. Thus we want the methods to call a method to get the connection
handle instead of assuming the private variable is non-NULL.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/remote_daemon_dispatch.c | 718 ++++++++++------------------
 1 file changed, 257 insertions(+), 461 deletions(-)

diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon=
_dispatch.c
index 4a3312a944..5609eb4caf 100644
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -2148,15 +2148,12 @@ remoteDispatchDomainGetSchedulerType(virNetServerPt=
r server ATTRIBUTE_UNUSED,
     char *type;
     int nparams;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (!(type =3D virDomainGetSchedulerType(dom, &nparams)))
@@ -2185,13 +2182,10 @@ remoteDispatchDomainGetSchedulerParameters(virNetSe=
rverPtr server ATTRIBUTE_UNUS
     virTypedParameterPtr params =3D NULL;
     int nparams =3D 0;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     if (args->nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"=
));
@@ -2201,7 +2195,7 @@ remoteDispatchDomainGetSchedulerParameters(virNetServ=
erPtr server ATTRIBUTE_UNUS
         goto cleanup;
     nparams =3D args->nparams;
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (virDomainGetSchedulerParameters(dom, params, &nparams) < 0)
@@ -2235,13 +2229,10 @@ remoteDispatchDomainGetSchedulerParametersFlags(vir=
NetServerPtr server ATTRIBUTE
     virTypedParameterPtr params =3D NULL;
     int nparams =3D 0;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     if (args->nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"=
));
@@ -2251,7 +2242,7 @@ remoteDispatchDomainGetSchedulerParametersFlags(virNe=
tServerPtr server ATTRIBUTE
         goto cleanup;
     nparams =3D args->nparams;
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (virDomainGetSchedulerParametersFlags(dom, params, &nparams,
@@ -2287,13 +2278,10 @@ remoteDispatchDomainMemoryStats(virNetServerPtr ser=
ver ATTRIBUTE_UNUSED,
     int nr_stats;
     size_t i;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     if (args->maxStats > REMOTE_DOMAIN_MEMORY_STATS_MAX) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -2301,7 +2289,7 @@ remoteDispatchDomainMemoryStats(virNetServerPtr serve=
r ATTRIBUTE_UNUSED,
         goto cleanup;
     }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     /* Allocate stats array for making dispatch call */
@@ -2346,15 +2334,12 @@ remoteDispatchDomainBlockPeek(virNetServerPtr serve=
r ATTRIBUTE_UNUSED,
     size_t size;
     unsigned int flags;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
     path =3D args->path;
     offset =3D args->offset;
@@ -2400,15 +2385,12 @@ remoteDispatchDomainBlockStatsFlags(virNetServerPtr=
 server ATTRIBUTE_UNUSED,
     int nparams =3D 0;
     unsigned int flags;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
     flags =3D args->flags;
=20
@@ -2462,15 +2444,12 @@ remoteDispatchDomainMemoryPeek(virNetServerPtr serv=
er ATTRIBUTE_UNUSED,
     size_t size;
     unsigned int flags;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
     offset =3D args->offset;
     size =3D args->size;
@@ -2512,15 +2491,12 @@ remoteDispatchDomainGetSecurityLabel(virNetServerPt=
r server ATTRIBUTE_UNUSED,
     virDomainPtr dom =3D NULL;
     virSecurityLabelPtr seclabel =3D NULL;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (VIR_ALLOC(seclabel) < 0)
@@ -2557,15 +2533,12 @@ remoteDispatchDomainGetSecurityLabelList(virNetServ=
erPtr server ATTRIBUTE_UNUSED
     virSecurityLabelPtr seclabels =3D NULL;
     int len, rv =3D -1;
     size_t i;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if ((len =3D virDomainGetSecurityLabelList(dom, &seclabels)) < 0) {
@@ -2611,16 +2584,13 @@ remoteDispatchNodeGetSecurityModel(virNetServerPtr =
server ATTRIBUTE_UNUSED,
 {
     virSecurityModel secmodel;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     memset(&secmodel, 0, sizeof(secmodel));
-    if (virNodeGetSecurityModel(priv->conn, &secmodel) < 0)
+    if (virNodeGetSecurityModel(conn, &secmodel) < 0)
         goto cleanup;
=20
     ret->model.model_len =3D strlen(secmodel.model) + 1;
@@ -2653,15 +2623,12 @@ remoteDispatchDomainGetVcpuPinInfo(virNetServerPtr =
server ATTRIBUTE_UNUSED,
     unsigned char *cpumaps =3D NULL;
     int num;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (args->ncpumaps > REMOTE_VCPUINFO_MAX) {
@@ -2715,15 +2682,12 @@ remoteDispatchDomainPinEmulator(virNetServerPtr ser=
ver ATTRIBUTE_UNUSED,
 {
     int rv =3D -1;
     virDomainPtr dom =3D NULL;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (virDomainPinEmulator(dom,
@@ -2754,15 +2718,12 @@ remoteDispatchDomainGetEmulatorPinInfo(virNetServer=
Ptr server ATTRIBUTE_UNUSED,
     unsigned char *cpumaps =3D NULL;
     int r;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     /* Allocate buffers to take the results */
@@ -2805,15 +2766,12 @@ remoteDispatchDomainGetVcpus(virNetServerPtr server=
 ATTRIBUTE_UNUSED,
     int info_len;
     size_t i;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (args->maxinfo > REMOTE_VCPUINFO_MAX) {
@@ -2882,18 +2840,16 @@ remoteDispatchDomainGetIOThreadInfo(virNetServerPtr=
 server ATTRIBUTE_UNUSED,
 {
     int rv =3D -1;
     size_t i;
-    struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(=
client);
     virDomainIOThreadInfoPtr *info =3D NULL;
     virDomainPtr dom =3D NULL;
     remote_domain_iothread_info *dst;
     int ninfo =3D 0;
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if ((ninfo =3D virDomainGetIOThreadInfo(dom, &info, args->flags)) < 0)
@@ -2958,13 +2914,10 @@ remoteDispatchDomainMigratePrepare(virNetServerPtr =
server ATTRIBUTE_UNUSED,
     char **uri_out;
     char *dname;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     uri_in =3D args->uri_in =3D=3D NULL ? NULL : *args->uri_in;
     dname =3D args->dname =3D=3D NULL ? NULL : *args->dname;
@@ -2973,7 +2926,7 @@ remoteDispatchDomainMigratePrepare(virNetServerPtr se=
rver ATTRIBUTE_UNUSED,
     if (VIR_ALLOC(uri_out) < 0)
         goto cleanup;
=20
-    if (virDomainMigratePrepare(priv->conn, &cookie, &cookielen,
+    if (virDomainMigratePrepare(conn, &cookie, &cookielen,
                                 uri_in, uri_out,
                                 args->flags, dname, args->resource) < 0)
         goto cleanup;
@@ -3013,13 +2966,10 @@ remoteDispatchDomainMigratePrepare2(virNetServerPtr=
 server ATTRIBUTE_UNUSED,
     char **uri_out;
     char *dname;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     uri_in =3D args->uri_in =3D=3D NULL ? NULL : *args->uri_in;
     dname =3D args->dname =3D=3D NULL ? NULL : *args->dname;
@@ -3028,7 +2978,7 @@ remoteDispatchDomainMigratePrepare2(virNetServerPtr s=
erver ATTRIBUTE_UNUSED,
     if (VIR_ALLOC(uri_out) < 0)
         goto cleanup;
=20
-    if (virDomainMigratePrepare2(priv->conn, &cookie, &cookielen,
+    if (virDomainMigratePrepare2(conn, &cookie, &cookielen,
                                  uri_in, uri_out,
                                  args->flags, dname, args->resource,
                                  args->dom_xml) < 0)
@@ -3064,13 +3014,10 @@ remoteDispatchDomainGetMemoryParameters(virNetServe=
rPtr server ATTRIBUTE_UNUSED,
     int nparams =3D 0;
     unsigned int flags;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     flags =3D args->flags;
=20
@@ -3082,7 +3029,7 @@ remoteDispatchDomainGetMemoryParameters(virNetServerP=
tr server ATTRIBUTE_UNUSED,
         goto cleanup;
     nparams =3D args->nparams;
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (virDomainGetMemoryParameters(dom, params, &nparams, flags) < 0)
@@ -3126,13 +3073,10 @@ remoteDispatchDomainGetNumaParameters(virNetServerP=
tr server ATTRIBUTE_UNUSED,
     int nparams =3D 0;
     unsigned int flags;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     flags =3D args->flags;
=20
@@ -3144,7 +3088,7 @@ remoteDispatchDomainGetNumaParameters(virNetServerPtr=
 server ATTRIBUTE_UNUSED,
         goto cleanup;
     nparams =3D args->nparams;
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (virDomainGetNumaParameters(dom, params, &nparams, flags) < 0)
@@ -3188,13 +3132,10 @@ remoteDispatchDomainGetBlkioParameters(virNetServer=
Ptr server ATTRIBUTE_UNUSED,
     int nparams =3D 0;
     unsigned int flags;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     flags =3D args->flags;
=20
@@ -3206,7 +3147,7 @@ remoteDispatchDomainGetBlkioParameters(virNetServerPt=
r server ATTRIBUTE_UNUSED,
         goto cleanup;
     nparams =3D args->nparams;
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (virDomainGetBlkioParameters(dom, params, &nparams, flags) < 0)
@@ -3251,13 +3192,10 @@ remoteDispatchNodeGetCPUStats(virNetServerPtr serve=
r ATTRIBUTE_UNUSED,
     int nparams =3D 0;
     unsigned int flags;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     flags =3D args->flags;
=20
@@ -3269,7 +3207,7 @@ remoteDispatchNodeGetCPUStats(virNetServerPtr server =
ATTRIBUTE_UNUSED,
         goto cleanup;
     nparams =3D args->nparams;
=20
-    if (virNodeGetCPUStats(priv->conn, cpuNum, params, &nparams, flags) < =
0)
+    if (virNodeGetCPUStats(conn, cpuNum, params, &nparams, flags) < 0)
         goto cleanup;
=20
     /* In this case, we need to send back the number of stats
@@ -3323,13 +3261,10 @@ remoteDispatchNodeGetMemoryStats(virNetServerPtr se=
rver ATTRIBUTE_UNUSED,
     int nparams =3D 0;
     unsigned int flags;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     flags =3D args->flags;
=20
@@ -3341,7 +3276,7 @@ remoteDispatchNodeGetMemoryStats(virNetServerPtr serv=
er ATTRIBUTE_UNUSED,
         goto cleanup;
     nparams =3D args->nparams;
=20
-    if (virNodeGetMemoryStats(priv->conn, cellNum, params, &nparams, flags=
) < 0)
+    if (virNodeGetMemoryStats(conn, cellNum, params, &nparams, flags) < 0)
         goto cleanup;
=20
     /* In this case, we need to send back the number of parameters
@@ -3393,15 +3328,12 @@ remoteDispatchDomainGetLaunchSecurityInfo(virNetSer=
verPtr server ATTRIBUTE_UNUSE
     virTypedParameterPtr params =3D NULL;
     int nparams =3D 0;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (virDomainGetLaunchSecurityInfo(dom, &params, &nparams, args->flags=
) < 0)
@@ -3440,15 +3372,12 @@ remoteDispatchDomainGetPerfEvents(virNetServerPtr s=
erver ATTRIBUTE_UNUSED,
     virTypedParameterPtr params =3D NULL;
     int nparams =3D 0;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (virDomainGetPerfEvents(dom, &params, &nparams, args->flags) < 0)
@@ -3486,15 +3415,12 @@ remoteDispatchDomainGetBlockJobInfo(virNetServerPtr=
 server ATTRIBUTE_UNUSED,
     virDomainPtr dom =3D NULL;
     virDomainBlockJobInfo tmp;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     rv =3D virDomainGetBlockJobInfo(dom, args->path, &tmp, args->flags);
@@ -3527,13 +3453,10 @@ remoteDispatchDomainGetBlockIoTune(virNetServerPtr =
server ATTRIBUTE_UNUSED,
     int rv =3D -1;
     virTypedParameterPtr params =3D NULL;
     int nparams =3D 0;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     if (args->nparams > REMOTE_DOMAIN_BLOCK_IO_TUNE_PARAMETERS_MAX) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"=
));
@@ -3544,7 +3467,7 @@ remoteDispatchDomainGetBlockIoTune(virNetServerPtr se=
rver ATTRIBUTE_UNUSED,
         goto cleanup;
     nparams =3D args->nparams;
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (virDomainGetBlockIoTune(dom, args->disk ? *args->disk : NULL,
@@ -4104,15 +4027,12 @@ remoteDispatchNodeDeviceGetParent(virNetServerPtr s=
erver ATTRIBUTE_UNUSED,
     virNodeDevicePtr dev =3D NULL;
     const char *parent =3D NULL;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetNodeDevConn(client);
=20
-    if (!priv->nodedevConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dev =3D virNodeDeviceLookupByName(priv->nodedevConn, args->name)=
))
+    if (!(dev =3D virNodeDeviceLookupByName(conn, args->name)))
         goto cleanup;
=20
     parent =3D virNodeDeviceGetParent(dev);
@@ -4144,15 +4064,14 @@ remoteDispatchConnectRegisterCloseCallback(virNetSe=
rverPtr server ATTRIBUTE_UNUS
     int rv =3D -1;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
     virMutexLock(&priv->lock);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (virConnectRegisterCloseCallback(priv->conn,
+    if (virConnectRegisterCloseCallback(conn,
                                         remoteRelayConnectionClosedEvent,
                                         client, NULL) < 0)
         goto cleanup;
@@ -4176,15 +4095,14 @@ remoteDispatchConnectUnregisterCloseCallback(virNet=
ServerPtr server ATTRIBUTE_UN
     int rv =3D -1;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
     virMutexLock(&priv->lock);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (virConnectUnregisterCloseCallback(priv->conn,
+    if (virConnectUnregisterCloseCallback(conn,
                                           remoteRelayConnectionClosedEvent=
) < 0)
         goto cleanup;
=20
@@ -4211,13 +4129,12 @@ remoteDispatchConnectDomainEventRegister(virNetServ=
erPtr server ATTRIBUTE_UNUSED
     daemonClientEventCallbackPtr ref;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
     virMutexLock(&priv->lock);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     /* If we call register first, we could append a complete callback
      * to our array, but on OOM append failure, we'd have to then hope
@@ -4239,7 +4156,7 @@ remoteDispatchConnectDomainEventRegister(virNetServer=
Ptr server ATTRIBUTE_UNUSED
                            callback) < 0)
         goto cleanup;
=20
-    if ((callbackID =3D virConnectDomainEventRegisterAny(priv->conn,
+    if ((callbackID =3D virConnectDomainEventRegisterAny(conn,
                                                        NULL,
                                                        VIR_DOMAIN_EVENT_ID=
_LIFECYCLE,
                                                        VIR_DOMAIN_EVENT_CA=
LLBACK(remoteRelayDomainEventLifecycle),
@@ -4275,13 +4192,12 @@ remoteDispatchConnectDomainEventDeregister(virNetSe=
rverPtr server ATTRIBUTE_UNUS
     size_t i;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
     virMutexLock(&priv->lock);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     for (i =3D 0; i < priv->ndomainEventCallbacks; i++) {
         if (priv->domainEventCallbacks[i]->eventID =3D=3D VIR_DOMAIN_EVENT=
_ID_LIFECYCLE) {
@@ -4297,7 +4213,7 @@ remoteDispatchConnectDomainEventDeregister(virNetServ=
erPtr server ATTRIBUTE_UNUS
         goto cleanup;
     }
=20
-    if (virConnectDomainEventDeregisterAny(priv->conn, callbackID) < 0)
+    if (virConnectDomainEventDeregisterAny(conn, callbackID) < 0)
         goto cleanup;
=20
     VIR_DELETE_ELEMENT(priv->domainEventCallbacks, i,
@@ -4361,15 +4277,12 @@ remoteDispatchSecretGetValue(virNetServerPtr server=
 ATTRIBUTE_UNUSED,
     size_t value_size;
     unsigned char *value;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetSecretConn(client);
=20
-    if (!priv->secretConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(secret =3D get_nonnull_secret(priv->secretConn, args->secret)))
+    if (!(secret =3D get_nonnull_secret(conn, args->secret)))
         goto cleanup;
=20
     if (!(value =3D virSecretGetValue(secret, &value_size, args->flags)))
@@ -4397,15 +4310,12 @@ remoteDispatchDomainGetState(virNetServerPtr server=
 ATTRIBUTE_UNUSED,
 {
     virDomainPtr dom =3D NULL;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (virDomainGetState(dom, &ret->state, &ret->reason, args->flags) < 0)
@@ -4439,13 +4349,12 @@ remoteDispatchConnectDomainEventRegisterAny(virNetS=
erverPtr server ATTRIBUTE_UNU
     daemonClientEventCallbackPtr ref;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
     virMutexLock(&priv->lock);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     /* We intentionally do not use VIR_DOMAIN_EVENT_ID_LAST here; any
      * new domain events added after this point should only use the
@@ -4475,7 +4384,7 @@ remoteDispatchConnectDomainEventRegisterAny(virNetSer=
verPtr server ATTRIBUTE_UNU
                            callback) < 0)
         goto cleanup;
=20
-    if ((callbackID =3D virConnectDomainEventRegisterAny(priv->conn,
+    if ((callbackID =3D virConnectDomainEventRegisterAny(conn,
                                                        NULL,
                                                        args->eventID,
                                                        domainEventCallback=
s[args->eventID],
@@ -4515,16 +4424,15 @@ remoteDispatchConnectDomainEventCallbackRegisterAny=
(virNetServerPtr server ATTRI
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
     virDomainPtr dom =3D NULL;
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
     virMutexLock(&priv->lock);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     if (args->dom &&
-        !(dom =3D get_nonnull_domain(priv->conn, *args->dom)))
+        !(dom =3D get_nonnull_domain(conn, *args->dom)))
         goto cleanup;
=20
     if (args->eventID >=3D VIR_DOMAIN_EVENT_ID_LAST || args->eventID < 0) {
@@ -4550,7 +4458,7 @@ remoteDispatchConnectDomainEventCallbackRegisterAny(v=
irNetServerPtr server ATTRI
                            callback) < 0)
         goto cleanup;
=20
-    if ((callbackID =3D virConnectDomainEventRegisterAny(priv->conn,
+    if ((callbackID =3D virConnectDomainEventRegisterAny(conn,
                                                        dom,
                                                        args->eventID,
                                                        domainEventCallback=
s[args->eventID],
@@ -4589,13 +4497,12 @@ remoteDispatchConnectDomainEventDeregisterAny(virNe=
tServerPtr server ATTRIBUTE_U
     size_t i;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
     virMutexLock(&priv->lock);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     /* We intentionally do not use VIR_DOMAIN_EVENT_ID_LAST here; any
      * new domain events added after this point should only use the
@@ -4619,7 +4526,7 @@ remoteDispatchConnectDomainEventDeregisterAny(virNetS=
erverPtr server ATTRIBUTE_U
         goto cleanup;
     }
=20
-    if (virConnectDomainEventDeregisterAny(priv->conn, callbackID) < 0)
+    if (virConnectDomainEventDeregisterAny(conn, callbackID) < 0)
         goto cleanup;
=20
     VIR_DELETE_ELEMENT(priv->domainEventCallbacks, i,
@@ -4646,13 +4553,12 @@ remoteDispatchConnectDomainEventCallbackDeregisterA=
ny(virNetServerPtr server ATT
     size_t i;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
     virMutexLock(&priv->lock);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     for (i =3D 0; i < priv->ndomainEventCallbacks; i++) {
         if (priv->domainEventCallbacks[i]->callbackID =3D=3D args->callbac=
kID)
@@ -4665,7 +4571,7 @@ remoteDispatchConnectDomainEventCallbackDeregisterAny=
(virNetServerPtr server ATT
         goto cleanup;
     }
=20
-    if (virConnectDomainEventDeregisterAny(priv->conn, args->callbackID) <=
 0)
+    if (virConnectDomainEventDeregisterAny(conn, args->callbackID) < 0)
         goto cleanup;
=20
     VIR_DELETE_ELEMENT(priv->domainEventCallbacks, i,
@@ -4691,15 +4597,12 @@ qemuDispatchDomainMonitorCommand(virNetServerPtr se=
rver ATTRIBUTE_UNUSED,
 {
     virDomainPtr dom =3D NULL;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (virDomainQemuMonitorCommand(dom, args->cmd, &ret->result,
@@ -4731,15 +4634,12 @@ remoteDispatchDomainMigrateBegin3(virNetServerPtr s=
erver ATTRIBUTE_UNUSED,
     char *cookieout =3D NULL;
     int cookieoutlen =3D 0;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     xmlin =3D args->xmlin =3D=3D NULL ? NULL : *args->xmlin;
@@ -4781,13 +4681,10 @@ remoteDispatchDomainMigratePrepare3(virNetServerPtr=
 server ATTRIBUTE_UNUSED,
     char **uri_out;
     char *dname;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     uri_in =3D args->uri_in =3D=3D NULL ? NULL : *args->uri_in;
     dname =3D args->dname =3D=3D NULL ? NULL : *args->dname;
@@ -4796,7 +4693,7 @@ remoteDispatchDomainMigratePrepare3(virNetServerPtr s=
erver ATTRIBUTE_UNUSED,
     if (VIR_ALLOC(uri_out) < 0)
         goto cleanup;
=20
-    if (virDomainMigratePrepare3(priv->conn,
+    if (virDomainMigratePrepare3(conn,
                                  args->cookie_in.cookie_in_val,
                                  args->cookie_in.cookie_in_len,
                                  &cookieout, &cookieoutlen,
@@ -4839,15 +4736,12 @@ remoteDispatchDomainMigratePerform3(virNetServerPtr=
 server ATTRIBUTE_UNUSED,
     char *cookieout =3D NULL;
     int cookieoutlen =3D 0;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     xmlin =3D args->xmlin =3D=3D NULL ? NULL : *args->xmlin;
@@ -4892,18 +4786,15 @@ remoteDispatchDomainMigrateFinish3(virNetServerPtr =
server ATTRIBUTE_UNUSED,
     char *uri;
     char *dconnuri;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     uri =3D args->uri =3D=3D NULL ? NULL : *args->uri;
     dconnuri =3D args->dconnuri =3D=3D NULL ? NULL : *args->dconnuri;
=20
-    if (!(dom =3D virDomainMigrateFinish3(priv->conn, args->dname,
+    if (!(dom =3D virDomainMigrateFinish3(conn, args->dname,
                                         args->cookie_in.cookie_in_val,
                                         args->cookie_in.cookie_in_len,
                                         &cookieout, &cookieoutlen,
@@ -4941,15 +4832,12 @@ remoteDispatchDomainMigrateConfirm3(virNetServerPtr=
 server ATTRIBUTE_UNUSED,
 {
     virDomainPtr dom =3D NULL;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (virDomainMigrateConfirm3(dom,
@@ -4977,8 +4865,7 @@ static int remoteDispatchConnectSupportsFeature(virNe=
tServerPtr server ATTRIBUTE
 {
     int rv =3D -1;
     int supported =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D NULL;
=20
     /* This feature is checked before opening the connection, thus we must
      * check it first.
@@ -4990,10 +4877,10 @@ static int remoteDispatchConnectSupportsFeature(vir=
NetServerPtr server ATTRIBUTE
         goto done;
     }
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    conn =3D remoteGetHypervisorConn(client);
+
+    if (!conn)
         goto cleanup;
-    }
=20
     switch ((virDrvFeature) args->feature) {
     case VIR_DRV_FEATURE_FD_PASSING:
@@ -5013,7 +4900,7 @@ static int remoteDispatchConnectSupportsFeature(virNe=
tServerPtr server ATTRIBUTE
     case VIR_DRV_FEATURE_MIGRATION_OFFLINE:
     case VIR_DRV_FEATURE_MIGRATION_PARAMS:
     default:
-        if ((supported =3D virConnectSupportsFeature(priv->conn, args->fea=
ture)) < 0)
+        if ((supported =3D virConnectSupportsFeature(conn, args->feature))=
 < 0)
             goto cleanup;
         break;
     case VIR_DRV_FEATURE_PROGRAM_KEEPALIVE:
@@ -5042,15 +4929,12 @@ remoteDispatchDomainOpenGraphics(virNetServerPtr se=
rver ATTRIBUTE_UNUSED,
     virDomainPtr dom =3D NULL;
     int rv =3D -1;
     int fd =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if ((fd =3D virNetMessageDupFD(msg, 0)) < 0)
@@ -5083,15 +4967,12 @@ remoteDispatchDomainOpenGraphicsFd(virNetServerPtr =
server ATTRIBUTE_UNUSED,
     virDomainPtr dom =3D NULL;
     int rv =3D -1;
     int fd =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if ((fd =3D virDomainOpenGraphicsFD(dom,
@@ -5130,13 +5011,10 @@ remoteDispatchDomainGetInterfaceParameters(virNetSe=
rverPtr server ATTRIBUTE_UNUS
     int nparams =3D 0;
     unsigned int flags;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     flags =3D args->flags;
=20
@@ -5148,7 +5026,7 @@ remoteDispatchDomainGetInterfaceParameters(virNetServ=
erPtr server ATTRIBUTE_UNUS
         goto cleanup;
     nparams =3D args->nparams;
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (virDomainGetInterfaceParameters(dom, device, params, &nparams, fla=
gs) < 0)
@@ -5188,16 +5066,13 @@ remoteDispatchDomainGetCPUStats(virNetServerPtr ser=
ver ATTRIBUTE_UNUSED,
                                 remote_domain_get_cpu_stats_ret *ret)
 {
     virDomainPtr dom =3D NULL;
-    struct daemonClientPrivate *priv;
     virTypedParameterPtr params =3D NULL;
     int rv =3D -1;
     int percpu_len =3D 0;
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    priv =3D virNetServerClientGetPrivateData(client);
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     if (args->nparams > REMOTE_NODE_CPU_STATS_MAX) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"=
));
@@ -5212,7 +5087,7 @@ remoteDispatchDomainGetCPUStats(virNetServerPtr serve=
r ATTRIBUTE_UNUSED,
         VIR_ALLOC_N(params, args->ncpus * args->nparams) < 0)
         goto cleanup;
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     percpu_len =3D virDomainGetCPUStats(dom, params, args->nparams,
@@ -5262,15 +5137,12 @@ remoteDispatchDomainGetDiskErrors(virNetServerPtr s=
erver ATTRIBUTE_UNUSED,
     virDomainPtr dom =3D NULL;
     virDomainDiskErrorPtr errors =3D NULL;
     int len =3D 0;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (args->maxerrors > REMOTE_DOMAIN_DISK_ERRORS_MAX) {
@@ -5322,15 +5194,12 @@ remoteDispatchNodeGetSevInfo(virNetServerPtr server=
 ATTRIBUTE_UNUSED,
     virTypedParameterPtr params =3D NULL;
     int nparams =3D 0;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (virNodeGetSEVInfo(priv->conn, &params, &nparams, args->flags) < 0)
+    if (virNodeGetSEVInfo(conn, &params, &nparams, args->flags) < 0)
         goto cleanup;
=20
     if (nparams > REMOTE_NODE_SEV_INFO_MAX) {
@@ -5367,13 +5236,10 @@ remoteDispatchNodeGetMemoryParameters(virNetServerP=
tr server ATTRIBUTE_UNUSED,
     int nparams =3D 0;
     unsigned int flags;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     flags =3D args->flags;
=20
@@ -5385,7 +5251,7 @@ remoteDispatchNodeGetMemoryParameters(virNetServerPtr=
 server ATTRIBUTE_UNUSED,
         goto cleanup;
     nparams =3D args->nparams;
=20
-    if (virNodeGetMemoryParameters(priv->conn, params, &nparams, flags) < =
0)
+    if (virNodeGetMemoryParameters(conn, params, &nparams, flags) < 0)
         goto cleanup;
=20
     /* In this case, we need to send back the number of parameters
@@ -5425,17 +5291,14 @@ remoteDispatchNodeGetCPUMap(virNetServerPtr server =
ATTRIBUTE_UNUSED,
     unsigned int flags;
     int cpunum;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     flags =3D args->flags;
=20
-    cpunum =3D virNodeGetCPUMap(priv->conn, args->need_map ? &cpumap : NUL=
L,
+    cpunum =3D virNodeGetCPUMap(conn, args->need_map ? &cpumap : NULL,
                               args->need_online ? &online : NULL, flags);
     if (cpunum < 0)
         goto cleanup;
@@ -5467,19 +5330,16 @@ lxcDispatchDomainOpenNamespace(virNetServerPtr serv=
er ATTRIBUTE_UNUSED,
                                lxc_domain_open_namespace_args *args)
 {
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
     int *fdlist =3D NULL;
     int ret;
     virDomainPtr dom =3D NULL;
     size_t i;
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     ret =3D virDomainLxcOpenNamespace(dom,
@@ -5521,15 +5381,12 @@ remoteDispatchDomainGetJobStats(virNetServerPtr ser=
ver ATTRIBUTE_UNUSED,
     virTypedParameterPtr params =3D NULL;
     int nparams =3D 0;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (virDomainGetJobStats(dom, &ret->type, &params,
@@ -5574,13 +5431,10 @@ remoteDispatchDomainMigrateBegin3Params(virNetServe=
rPtr server ATTRIBUTE_UNUSED,
     char *cookieout =3D NULL;
     int cookieoutlen =3D 0;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     if (args->params.params_len > REMOTE_DOMAIN_MIGRATE_PARAM_LIST_MAX) {
         virReportError(VIR_ERR_RPC,
@@ -5589,7 +5443,7 @@ remoteDispatchDomainMigrateBegin3Params(virNetServerP=
tr server ATTRIBUTE_UNUSED,
         goto cleanup;
     }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (virTypedParamsDeserialize((virTypedParameterRemotePtr) args->param=
s.params_val,
@@ -5630,13 +5484,10 @@ remoteDispatchDomainMigratePrepare3Params(virNetSer=
verPtr server ATTRIBUTE_UNUSE
     int cookieoutlen =3D 0;
     char **uri_out;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     if (args->params.params_len > REMOTE_DOMAIN_MIGRATE_PARAM_LIST_MAX) {
         virReportError(VIR_ERR_RPC,
@@ -5654,7 +5505,7 @@ remoteDispatchDomainMigratePrepare3Params(virNetServe=
rPtr server ATTRIBUTE_UNUSE
     if (VIR_ALLOC(uri_out) < 0)
         goto cleanup;
=20
-    if (virDomainMigratePrepare3Params(priv->conn, params, nparams,
+    if (virDomainMigratePrepare3Params(conn, params, nparams,
                                        args->cookie_in.cookie_in_val,
                                        args->cookie_in.cookie_in_len,
                                        &cookieout, &cookieoutlen,
@@ -5689,15 +5540,12 @@ remoteDispatchDomainMigratePrepareTunnel3Params(vir=
NetServerPtr server ATTRIBUTE
     char *cookieout =3D NULL;
     int cookieoutlen =3D 0;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
     virStreamPtr st =3D NULL;
     daemonClientStreamPtr stream =3D NULL;
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     if (args->params.params_len > REMOTE_DOMAIN_MIGRATE_PARAM_LIST_MAX) {
         virReportError(VIR_ERR_RPC,
@@ -5711,12 +5559,12 @@ remoteDispatchDomainMigratePrepareTunnel3Params(vir=
NetServerPtr server ATTRIBUTE
                                   0, &params, &nparams) < 0)
         goto cleanup;
=20
-    if (!(st =3D virStreamNew(priv->conn, VIR_STREAM_NONBLOCK)) ||
+    if (!(st =3D virStreamNew(conn, VIR_STREAM_NONBLOCK)) ||
         !(stream =3D daemonCreateClientStream(client, st, remoteProgram,
                                             &msg->header, false)))
         goto cleanup;
=20
-    if (virDomainMigratePrepareTunnel3Params(priv->conn, st, params, npara=
ms,
+    if (virDomainMigratePrepareTunnel3Params(conn, st, params, nparams,
                                              args->cookie_in.cookie_in_val,
                                              args->cookie_in.cookie_in_len,
                                              &cookieout, &cookieoutlen,
@@ -5761,13 +5609,10 @@ remoteDispatchDomainMigratePerform3Params(virNetSer=
verPtr server ATTRIBUTE_UNUSE
     int cookieoutlen =3D 0;
     char *dconnuri;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     if (args->params.params_len > REMOTE_DOMAIN_MIGRATE_PARAM_LIST_MAX) {
         virReportError(VIR_ERR_RPC,
@@ -5776,7 +5621,7 @@ remoteDispatchDomainMigratePerform3Params(virNetServe=
rPtr server ATTRIBUTE_UNUSE
         goto cleanup;
     }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (virTypedParamsDeserialize((virTypedParameterRemotePtr) args->param=
s.params_val,
@@ -5821,13 +5666,10 @@ remoteDispatchDomainMigrateFinish3Params(virNetServ=
erPtr server ATTRIBUTE_UNUSED
     char *cookieout =3D NULL;
     int cookieoutlen =3D 0;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     if (args->params.params_len > REMOTE_DOMAIN_MIGRATE_PARAM_LIST_MAX) {
         virReportError(VIR_ERR_RPC,
@@ -5841,7 +5683,7 @@ remoteDispatchDomainMigrateFinish3Params(virNetServer=
Ptr server ATTRIBUTE_UNUSED
                                   0, &params, &nparams) < 0)
         goto cleanup;
=20
-    dom =3D virDomainMigrateFinish3Params(priv->conn, params, nparams,
+    dom =3D virDomainMigrateFinish3Params(conn, params, nparams,
                                         args->cookie_in.cookie_in_val,
                                         args->cookie_in.cookie_in_len,
                                         &cookieout, &cookieoutlen,
@@ -5879,13 +5721,10 @@ remoteDispatchDomainMigrateConfirm3Params(virNetSer=
verPtr server ATTRIBUTE_UNUSE
     int nparams =3D 0;
     virDomainPtr dom =3D NULL;
     int rv =3D -1;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     if (args->params.params_len > REMOTE_DOMAIN_MIGRATE_PARAM_LIST_MAX) {
         virReportError(VIR_ERR_RPC,
@@ -5894,7 +5733,7 @@ remoteDispatchDomainMigrateConfirm3Params(virNetServe=
rPtr server ATTRIBUTE_UNUSE
         goto cleanup;
     }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (virTypedParamsDeserialize((virTypedParameterRemotePtr) args->param=
s.params_val,
@@ -5929,15 +5768,12 @@ remoteDispatchConnectGetCPUModelNames(virNetServerP=
tr server ATTRIBUTE_UNUSED,
 {
     int len, rv =3D -1;
     char **models =3D NULL;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    len =3D virConnectGetCPUModelNames(priv->conn, args->arch,
+    len =3D virConnectGetCPUModelNames(conn, args->arch,
                                      args->need_results ? &models : NULL,
                                      args->flags);
     if (len < 0)
@@ -5981,16 +5817,13 @@ remoteDispatchDomainCreateXMLWithFiles(virNetServer=
Ptr server ATTRIBUTE_UNUSED,
 {
     int rv =3D -1;
     virDomainPtr dom =3D NULL;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
     int *files =3D NULL;
     unsigned int nfiles =3D 0;
     size_t i;
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     if (VIR_ALLOC_N(files, msg->nfds) < 0)
         goto cleanup;
@@ -6000,7 +5833,7 @@ remoteDispatchDomainCreateXMLWithFiles(virNetServerPt=
r server ATTRIBUTE_UNUSED,
         nfiles++;
     }
=20
-    if ((dom =3D virDomainCreateXMLWithFiles(priv->conn, args->xml_desc,
+    if ((dom =3D virDomainCreateXMLWithFiles(conn, args->xml_desc,
                                            nfiles, files,
                                            args->flags)) =3D=3D NULL)
         goto cleanup;
@@ -6030,16 +5863,13 @@ static int remoteDispatchDomainCreateWithFiles(virN=
etServerPtr server ATTRIBUTE_
 {
     int rv =3D -1;
     virDomainPtr dom =3D NULL;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
     int *files =3D NULL;
     unsigned int nfiles =3D 0;
     size_t i;
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     if (VIR_ALLOC_N(files, msg->nfds) < 0)
         goto cleanup;
@@ -6049,7 +5879,7 @@ static int remoteDispatchDomainCreateWithFiles(virNet=
ServerPtr server ATTRIBUTE_
         nfiles++;
     }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (virDomainCreateWithFiles(dom,
@@ -6085,19 +5915,18 @@ remoteDispatchConnectNetworkEventRegisterAny(virNet=
ServerPtr server ATTRIBUTE_UN
     int rv =3D -1;
     daemonClientEventCallbackPtr callback =3D NULL;
     daemonClientEventCallbackPtr ref;
+    virNetworkPtr net =3D NULL;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
-    virNetworkPtr net =3D NULL;
+    virConnectPtr conn =3D remoteGetNetworkConn(client);
=20
     virMutexLock(&priv->lock);
=20
-    if (!priv->networkConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     if (args->net &&
-        !(net =3D get_nonnull_network(priv->networkConn, *args->net)))
+        !(net =3D get_nonnull_network(conn, *args->net)))
         goto cleanup;
=20
     if (args->eventID >=3D VIR_NETWORK_EVENT_ID_LAST || args->eventID < 0)=
 {
@@ -6123,7 +5952,7 @@ remoteDispatchConnectNetworkEventRegisterAny(virNetSe=
rverPtr server ATTRIBUTE_UN
                            callback) < 0)
         goto cleanup;
=20
-    if ((callbackID =3D virConnectNetworkEventRegisterAny(priv->networkCon=
n,
+    if ((callbackID =3D virConnectNetworkEventRegisterAny(conn,
                                                         net,
                                                         args->eventID,
                                                         networkEventCallba=
cks[args->eventID],
@@ -6161,13 +5990,12 @@ remoteDispatchConnectNetworkEventDeregisterAny(virN=
etServerPtr server ATTRIBUTE_
     size_t i;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetNetworkConn(client);
=20
     virMutexLock(&priv->lock);
=20
-    if (!priv->networkConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     for (i =3D 0; i < priv->nnetworkEventCallbacks; i++) {
         if (priv->networkEventCallbacks[i]->callbackID =3D=3D args->callba=
ckID)
@@ -6180,7 +6008,7 @@ remoteDispatchConnectNetworkEventDeregisterAny(virNet=
ServerPtr server ATTRIBUTE_
         goto cleanup;
     }
=20
-    if (virConnectNetworkEventDeregisterAny(priv->networkConn, args->callb=
ackID) < 0)
+    if (virConnectNetworkEventDeregisterAny(conn, args->callbackID) < 0)
         goto cleanup;
=20
     VIR_DELETE_ELEMENT(priv->networkEventCallbacks, i,
@@ -6210,16 +6038,15 @@ remoteDispatchConnectStoragePoolEventRegisterAny(vi=
rNetServerPtr server ATTRIBUT
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
     virStoragePoolPtr  pool =3D NULL;
+    virConnectPtr conn =3D remoteGetStorageConn(client);
=20
     virMutexLock(&priv->lock);
=20
-    if (!priv->storageConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     if (args->pool &&
-        !(pool =3D get_nonnull_storage_pool(priv->storageConn, *args->pool=
)))
+        !(pool =3D get_nonnull_storage_pool(conn, *args->pool)))
         goto cleanup;
=20
     if (args->eventID >=3D VIR_STORAGE_POOL_EVENT_ID_LAST || args->eventID=
 < 0) {
@@ -6245,7 +6072,7 @@ remoteDispatchConnectStoragePoolEventRegisterAny(virN=
etServerPtr server ATTRIBUT
                            callback) < 0)
         goto cleanup;
=20
-    if ((callbackID =3D virConnectStoragePoolEventRegisterAny(priv->storag=
eConn,
+    if ((callbackID =3D virConnectStoragePoolEventRegisterAny(conn,
                                                             pool,
                                                             args->eventID,
                                                             storageEventCa=
llbacks[args->eventID],
@@ -6282,13 +6109,12 @@ remoteDispatchConnectStoragePoolEventDeregisterAny(=
virNetServerPtr server ATTRIB
     size_t i;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetStorageConn(client);
=20
     virMutexLock(&priv->lock);
=20
-    if (!priv->storageConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     for (i =3D 0; i < priv->nstorageEventCallbacks; i++) {
         if (priv->storageEventCallbacks[i]->callbackID =3D=3D args->callba=
ckID)
@@ -6301,7 +6127,7 @@ remoteDispatchConnectStoragePoolEventDeregisterAny(vi=
rNetServerPtr server ATTRIB
         goto cleanup;
     }
=20
-    if (virConnectStoragePoolEventDeregisterAny(priv->storageConn, args->c=
allbackID) < 0)
+    if (virConnectStoragePoolEventDeregisterAny(conn, args->callbackID) < =
0)
         goto cleanup;
=20
     VIR_DELETE_ELEMENT(priv->storageEventCallbacks, i,
@@ -6331,16 +6157,15 @@ remoteDispatchConnectNodeDeviceEventRegisterAny(vir=
NetServerPtr server ATTRIBUTE
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
     virNodeDevicePtr  dev =3D NULL;
+    virConnectPtr conn =3D remoteGetNodeDevConn(client);
=20
     virMutexLock(&priv->lock);
=20
-    if (!priv->nodedevConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     if (args->dev &&
-        !(dev =3D get_nonnull_node_device(priv->nodedevConn, *args->dev)))
+        !(dev =3D get_nonnull_node_device(conn, *args->dev)))
         goto cleanup;
=20
     if (args->eventID >=3D VIR_NODE_DEVICE_EVENT_ID_LAST || args->eventID =
< 0) {
@@ -6366,7 +6191,7 @@ remoteDispatchConnectNodeDeviceEventRegisterAny(virNe=
tServerPtr server ATTRIBUTE
                            callback) < 0)
         goto cleanup;
=20
-    if ((callbackID =3D virConnectNodeDeviceEventRegisterAny(priv->nodedev=
Conn,
+    if ((callbackID =3D virConnectNodeDeviceEventRegisterAny(conn,
                                                            dev,
                                                            args->eventID,
                                                            nodeDeviceEvent=
Callbacks[args->eventID],
@@ -6403,13 +6228,12 @@ remoteDispatchConnectNodeDeviceEventDeregisterAny(v=
irNetServerPtr server ATTRIBU
     size_t i;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetNodeDevConn(client);
=20
     virMutexLock(&priv->lock);
=20
-    if (!priv->nodedevConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     for (i =3D 0; i < priv->nnodeDeviceEventCallbacks; i++) {
         if (priv->nodeDeviceEventCallbacks[i]->callbackID =3D=3D args->cal=
lbackID)
@@ -6422,7 +6246,7 @@ remoteDispatchConnectNodeDeviceEventDeregisterAny(vir=
NetServerPtr server ATTRIBU
         goto cleanup;
     }
=20
-    if (virConnectNodeDeviceEventDeregisterAny(priv->nodedevConn, args->ca=
llbackID) < 0)
+    if (virConnectNodeDeviceEventDeregisterAny(conn, args->callbackID) < 0)
         goto cleanup;
=20
     VIR_DELETE_ELEMENT(priv->nodeDeviceEventCallbacks, i,
@@ -6452,16 +6276,15 @@ remoteDispatchConnectSecretEventRegisterAny(virNetS=
erverPtr server ATTRIBUTE_UNU
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
     virSecretPtr secret =3D NULL;
+    virConnectPtr conn =3D remoteGetSecretConn(client);
=20
     virMutexLock(&priv->lock);
=20
-    if (!priv->secretConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     if (args->secret &&
-        !(secret =3D get_nonnull_secret(priv->secretConn, *args->secret)))
+        !(secret =3D get_nonnull_secret(conn, *args->secret)))
         goto cleanup;
=20
     if (args->eventID >=3D VIR_SECRET_EVENT_ID_LAST || args->eventID < 0) {
@@ -6487,7 +6310,7 @@ remoteDispatchConnectSecretEventRegisterAny(virNetSer=
verPtr server ATTRIBUTE_UNU
                            callback) < 0)
         goto cleanup;
=20
-    if ((callbackID =3D virConnectSecretEventRegisterAny(priv->secretConn,
+    if ((callbackID =3D virConnectSecretEventRegisterAny(conn,
                                                        secret,
                                                        args->eventID,
                                                        secretEventCallback=
s[args->eventID],
@@ -6524,13 +6347,12 @@ remoteDispatchConnectSecretEventDeregisterAny(virNe=
tServerPtr server ATTRIBUTE_U
     size_t i;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetSecretConn(client);
=20
     virMutexLock(&priv->lock);
=20
-    if (!priv->secretConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     for (i =3D 0; i < priv->nsecretEventCallbacks; i++) {
         if (priv->secretEventCallbacks[i]->callbackID =3D=3D args->callbac=
kID)
@@ -6543,7 +6365,7 @@ remoteDispatchConnectSecretEventDeregisterAny(virNetS=
erverPtr server ATTRIBUTE_U
         goto cleanup;
     }
=20
-    if (virConnectSecretEventDeregisterAny(priv->secretConn, args->callbac=
kID) < 0)
+    if (virConnectSecretEventDeregisterAny(conn, args->callbackID) < 0)
         goto cleanup;
=20
     VIR_DELETE_ELEMENT(priv->secretEventCallbacks, i,
@@ -6574,16 +6396,15 @@ qemuDispatchConnectDomainMonitorEventRegister(virNe=
tServerPtr server ATTRIBUTE_U
         virNetServerClientGetPrivateData(client);
     virDomainPtr dom =3D NULL;
     const char *event =3D args->event ? *args->event : NULL;
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
     virMutexLock(&priv->lock);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     if (args->dom &&
-        !(dom =3D get_nonnull_domain(priv->conn, *args->dom)))
+        !(dom =3D get_nonnull_domain(conn, *args->dom)))
         goto cleanup;
=20
     /* If we call register first, we could append a complete callback
@@ -6603,7 +6424,7 @@ qemuDispatchConnectDomainMonitorEventRegister(virNetS=
erverPtr server ATTRIBUTE_U
                            callback) < 0)
         goto cleanup;
=20
-    if ((callbackID =3D virConnectDomainQemuMonitorEventRegister(priv->con=
n,
+    if ((callbackID =3D virConnectDomainQemuMonitorEventRegister(conn,
                                                                dom,
                                                                event,
                                                                remoteRelay=
DomainQemuMonitorEvent,
@@ -6642,13 +6463,12 @@ qemuDispatchConnectDomainMonitorEventDeregister(vir=
NetServerPtr server ATTRIBUTE
     size_t i;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
     virMutexLock(&priv->lock);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     for (i =3D 0; i < priv->nqemuEventCallbacks; i++) {
         if (priv->qemuEventCallbacks[i]->callbackID =3D=3D args->callbackI=
D)
@@ -6661,7 +6481,7 @@ qemuDispatchConnectDomainMonitorEventDeregister(virNe=
tServerPtr server ATTRIBUTE
         goto cleanup;
     }
=20
-    if (virConnectDomainQemuMonitorEventDeregister(priv->conn,
+    if (virConnectDomainQemuMonitorEventDeregister(conn,
                                                    args->callbackID) < 0)
         goto cleanup;
=20
@@ -6689,15 +6509,12 @@ remoteDispatchDomainGetTime(virNetServerPtr server =
ATTRIBUTE_UNUSED,
     virDomainPtr dom =3D NULL;
     long long seconds;
     unsigned int nseconds;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if (virDomainGetTime(dom, &seconds, &nseconds, args->flags) < 0)
@@ -6725,13 +6542,10 @@ remoteDispatchNodeGetFreePages(virNetServerPtr serv=
er ATTRIBUTE_UNUSED,
 {
     int rv =3D -1;
     int len;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     if (args->pages.pages_len * args->cellCount > REMOTE_NODE_MAX_CELLS) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -6744,7 +6558,7 @@ remoteDispatchNodeGetFreePages(virNetServerPtr server=
 ATTRIBUTE_UNUSED,
                     args->pages.pages_len * args->cellCount) < 0)
         goto cleanup;
=20
-    if ((len =3D virNodeGetFreePages(priv->conn,
+    if ((len =3D virNodeGetFreePages(conn,
                                    args->pages.pages_len,
                                    args->pages.pages_val,
                                    args->startCell,
@@ -6838,17 +6652,15 @@ remoteDispatchNetworkGetDHCPLeases(virNetServerPtr =
server ATTRIBUTE_UNUSED,
 {
     int rv =3D -1;
     size_t i;
-    struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(=
client);
     virNetworkDHCPLeasePtr *leases =3D NULL;
     virNetworkPtr net =3D NULL;
     int nleases =3D 0;
+    virConnectPtr conn =3D remoteGetNetworkConn(client);
=20
-    if (!priv->networkConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(net =3D get_nonnull_network(priv->networkConn, args->net)))
+    if (!(net =3D get_nonnull_network(conn, args->net)))
         goto cleanup;
=20
     if ((nleases =3D virNetworkGetDHCPLeases(net,
@@ -6906,22 +6718,20 @@ remoteDispatchConnectGetAllDomainStats(virNetServer=
Ptr server ATTRIBUTE_UNUSED,
 {
     int rv =3D -1;
     size_t i;
-    struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(=
client);
     virDomainStatsRecordPtr *retStats =3D NULL;
     int nrecords =3D 0;
     virDomainPtr *doms =3D NULL;
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
     if (args->doms.doms_len) {
         if (VIR_ALLOC_N(doms, args->doms.doms_len + 1) < 0)
             goto cleanup;
=20
         for (i =3D 0; i < args->doms.doms_len; i++) {
-            if (!(doms[i] =3D get_nonnull_domain(priv->conn, args->doms.do=
ms_val[i])))
+            if (!(doms[i] =3D get_nonnull_domain(conn, args->doms.doms_val=
[i])))
                 goto cleanup;
         }
=20
@@ -6931,7 +6741,7 @@ remoteDispatchConnectGetAllDomainStats(virNetServerPt=
r server ATTRIBUTE_UNUSED,
                                               args->flags)) < 0)
             goto cleanup;
     } else {
-        if ((nrecords =3D virConnectGetAllDomainStats(priv->conn,
+        if ((nrecords =3D virConnectGetAllDomainStats(conn,
                                                     args->stats,
                                                     &retStats,
                                                     args->flags)) < 0)
@@ -6993,15 +6803,12 @@ remoteDispatchNodeAllocPages(virNetServerPtr server=
 ATTRIBUTE_UNUSED,
 {
     int rv =3D -1;
     int len;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if ((len =3D virNodeAllocPages(priv->conn,
+    if ((len =3D virNodeAllocPages(conn,
                                  args->pageSizes.pageSizes_len,
                                  args->pageSizes.pageSizes_val,
                                  (unsigned long long *) args->pageCounts.p=
ageCounts_val,
@@ -7030,19 +6837,17 @@ remoteDispatchDomainGetFSInfo(virNetServerPtr serve=
r ATTRIBUTE_UNUSED,
 {
     int rv =3D -1;
     size_t i, j;
-    struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(=
client);
     virDomainFSInfoPtr *info =3D NULL;
     virDomainPtr dom =3D NULL;
     remote_domain_fsinfo *dst;
     int ninfo =3D 0;
     size_t ndisk;
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if ((ninfo =3D virDomainGetFSInfo(dom, &info, args->flags)) < 0)
@@ -7227,15 +7032,12 @@ remoteDispatchDomainInterfaceAddresses(virNetServer=
Ptr server ATTRIBUTE_UNUSED,
     virDomainPtr dom =3D NULL;
     virDomainInterfacePtr *ifaces =3D NULL;
     int ifaces_count =3D 0;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(dom =3D get_nonnull_domain(priv->conn, args->dom)))
+    if (!(dom =3D get_nonnull_domain(conn, args->dom)))
         goto cleanup;
=20
     if ((ifaces_count =3D virDomainInterfaceAddresses(dom, &ifaces, args->=
source, args->flags)) < 0)
@@ -7273,15 +7075,12 @@ remoteDispatchStorageVolGetInfoFlags(virNetServerPt=
r server ATTRIBUTE_UNUSED,
     int rv =3D -1;
     virStorageVolPtr vol =3D NULL;
     virStorageVolInfo tmp;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetStorageConn(client);
=20
-    if (!priv->storageConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(vol =3D get_nonnull_storage_vol(priv->storageConn, args->vol)))
+    if (!(vol =3D get_nonnull_storage_vol(conn, args->vol)))
         goto cleanup;
=20
     if (virStorageVolGetInfoFlags(vol, &tmp, args->flags) < 0)
@@ -7312,15 +7111,12 @@ remoteDispatchNetworkPortGetParameters(virNetServer=
Ptr server ATTRIBUTE_UNUSED,
     virNetworkPortPtr port =3D NULL;
     virTypedParameterPtr params =3D NULL;
     int nparams =3D 0;
-    struct daemonClientPrivate *priv =3D
-        virNetServerClientGetPrivateData(client);
+    virConnectPtr conn =3D remoteGetNetworkConn(client);
=20
-    if (!priv->networkConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+    if (!conn)
         goto cleanup;
-    }
=20
-    if (!(port =3D get_nonnull_network_port(priv->networkConn, args->port)=
))
+    if (!(port =3D get_nonnull_network_port(conn, args->port)))
         goto cleanup;
=20
     if (virNetworkPortGetParameters(port, &params, &nparams, args->flags) =
< 0)
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277274; cv=none;
	d=zoho.com; s=zohoarc;
	b=m17ZudcASDsfIrVBaPnjaTVS5jhcyiRYRu9veenxgG9OZJKODJsoAiEvlz7NRF9cdCtIu5UZHi0oghK/gm0gu/4HEc6QnyDPr23toQQi3U94Iqm6ThwfF8HxJb7MJPHowcuU6UJWud8pgNqgyL8/9CpEFdWPaUNbYw3E2ZifUFc=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277274;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=UtTrr4BBNcpdbPC6lvC3fPfULhd69zA/qt85CySK4bc=;
	b=CToJiOCSWh4uiho/sWV5NoHzsVTpS4t/o9DmsmH1ghP0pfRjrHHB6P9qod805i36ja1qCeLKyLTeui6uq9sm8+lLLlBSNisUVkozpo5qOtFJ3IIlbOhYyMpEBHEjlTYriZpL/IyNBDzCRxWrqrhbm6a0OuL+XCjQIhtalppAGFQ=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 15652772746131016.4614964802175;
 Thu, 8 Aug 2019 08:14:34 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id D22B1C03BC00;
	Thu,  8 Aug 2019 15:14:32 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id A48606012A;
	Thu,  8 Aug 2019 15:14:32 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 616811802218;
	Thu,  8 Aug 2019 15:14:32 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FCB4i028011 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:12:11 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id AEB0D1001948; Thu,  8 Aug 2019 15:12:11 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 5283710016F3;
	Thu,  8 Aug 2019 15:12:10 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:40 +0100
Message-Id: <20190808151044.11385-39-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 38/42] remote: open secondary drivers via
	remote driver if needed
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]);
 Thu, 08 Aug 2019 15:14:34 +0000 (UTC)

When the client has a connection to one of the hypervisor specific
daemons (eg virtqemud), the app may still expect to use the secondary
driver APIs (storage, network, etc). None of these will be registered in
the hypervisor daemon, so we must explicitly open a connection to each
of the daemons for the secondary drivers we need.

We don't want to open these secondary driver connections at the same
time as the primary connection is opened though. That would mean that
establishing a connection to virtqemud would immediately trigger
activation of virtnetworkd, virnwfilterd, etc despite that that these
drivers may never be used by the app.

Thus we only open the secondary driver connections at time of first use
by an API call.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/remote_daemon.h          |  13 +++
 src/remote/remote_daemon_dispatch.c | 160 +++++++++++++++++++++++-----
 2 files changed, 148 insertions(+), 25 deletions(-)

diff --git a/src/remote/remote_daemon.h b/src/remote/remote_daemon.h
index a403d2593a..a2d9af4036 100644
--- a/src/remote/remote_daemon.h
+++ b/src/remote/remote_daemon.h
@@ -70,12 +70,25 @@ struct daemonClientPrivate {
      * called, it will be set back to NULL if that succeeds.
      */
     virConnectPtr conn;
+
+    /* These secondary drivers may point back to 'conn'
+     * in the monolithic daemon setups. Otherwise they
+     * can be NULL and opened on first use, pointing
+     * to remote driver use of an external daemon
+     */
     virConnectPtr interfaceConn;
+    const char *interfaceURI;
     virConnectPtr networkConn;
+    const char *networkURI;
     virConnectPtr nodedevConn;
+    const char *nodedevURI;
     virConnectPtr nwfilterConn;
+    const char *nwfilterURI;
     virConnectPtr secretConn;
+    const char *secretURI;
     virConnectPtr storageConn;
+    const char *storageURI;
+    bool readonly;
=20
     daemonClientStreamPtr streams;
 };
diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon=
_dispatch.c
index 5609eb4caf..7a66629d5b 100644
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -1941,6 +1941,34 @@ static void remoteClientCloseFunc(virNetServerClient=
Ptr client)
 }
=20
=20
+static int
+remoteOpenConn(const char *uri,
+               bool readonly,
+               virConnectPtr *conn)
+{
+    VIR_DEBUG("Getting secondary uri=3D%s readonly=3D%d conn=3D%p",
+              NULLSTR(uri), readonly, conn);
+    if (*conn)
+        return 0;
+
+    if (!uri) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+        return -1;
+    }
+
+    VIR_DEBUG("Opening driver %s", uri);
+    if (readonly)
+        *conn =3D virConnectOpenReadOnly(uri);
+    else
+        *conn =3D virConnectOpen(uri);
+    if (!*conn)
+        return -1;
+    VIR_DEBUG("Opened driver %p", *conn);
+
+    return 0;
+}
+
+
 static virConnectPtr
 remoteGetHypervisorConn(virNetServerClientPtr client)
 {
@@ -1962,10 +1990,10 @@ remoteGetInterfaceConn(virNetServerClientPtr client)
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
-    if (!priv->interfaceConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
+    if (remoteOpenConn(priv->interfaceURI,
+                       priv->readonly,
+                       &priv->interfaceConn) < 0)
         return NULL;
-    }
=20
     return priv->interfaceConn;
 }
@@ -1977,10 +2005,10 @@ remoteGetNetworkConn(virNetServerClientPtr client)
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
-    if (!priv->networkConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
+    if (remoteOpenConn(priv->networkURI,
+                       priv->readonly,
+                       &priv->networkConn) < 0)
         return NULL;
-    }
=20
     return priv->networkConn;
 }
@@ -1992,10 +2020,10 @@ remoteGetNodeDevConn(virNetServerClientPtr client)
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
-    if (!priv->nodedevConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
+    if (remoteOpenConn(priv->nodedevURI,
+                       priv->readonly,
+                       &priv->nodedevConn) < 0)
         return NULL;
-    }
=20
     return priv->nodedevConn;
 }
@@ -2007,10 +2035,10 @@ remoteGetNWFilterConn(virNetServerClientPtr client)
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
-    if (!priv->nwfilterConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
+    if (remoteOpenConn(priv->nwfilterURI,
+                       priv->readonly,
+                       &priv->nwfilterConn) < 0)
         return NULL;
-    }
=20
     return priv->nwfilterConn;
 }
@@ -2022,10 +2050,10 @@ remoteGetSecretConn(virNetServerClientPtr client)
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
-    if (!priv->secretConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
+    if (remoteOpenConn(priv->secretURI,
+                       priv->readonly,
+                       &priv->secretConn) < 0)
         return NULL;
-    }
=20
     return priv->secretConn;
 }
@@ -2037,10 +2065,10 @@ remoteGetStorageConn(virNetServerClientPtr client)
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
-    if (!priv->storageConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
+    if (remoteOpenConn(priv->storageURI,
+                       priv->readonly,
+                       &priv->storageConn) < 0)
         return NULL;
-    }
=20
     return priv->storageConn;
 }
@@ -2077,6 +2105,9 @@ remoteDispatchConnectOpen(virNetServerPtr server ATTR=
IBUTE_UNUSED,
     unsigned int flags;
     struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(=
client);
     int rv =3D -1;
+#ifdef MODULE_NAME
+    const char *type =3D NULL;
+#endif /* !MODULE_NAME */
=20
     VIR_DEBUG("priv=3D%p conn=3D%p", priv, priv->conn);
     virMutexLock(&priv->lock);
@@ -2095,20 +2126,94 @@ remoteDispatchConnectOpen(virNetServerPtr server AT=
TRIBUTE_UNUSED,
     if (virNetServerClientGetReadonly(client))
         flags |=3D VIR_CONNECT_RO;
=20
-    priv->conn =3D
-        flags & VIR_CONNECT_RO
-        ? virConnectOpenReadOnly(name)
-        : virConnectOpen(name);
+    priv->readonly =3D flags & VIR_CONNECT_RO;
=20
-    if (priv->conn =3D=3D NULL)
-        goto cleanup;
+    VIR_DEBUG("Opening driver %s", name);
+    if (priv->readonly) {
+        if (!(priv->conn =3D virConnectOpenReadOnly(name)))
+            goto cleanup;
+    } else {
+        if (!(priv->conn =3D virConnectOpen(name)))
+            goto cleanup;
+    }
+    VIR_DEBUG("Opened %p", priv->conn);
=20
+#ifdef MODULE_NAME
+    /*
+     * For per-driver daemons, we must setup connection URIs
+     * for sub-drivers.
+     */
+    if (!(type =3D virConnectGetType(priv->conn)))
+        goto cleanup;
+
+    VIR_DEBUG("Primary driver type is '%s'", type);
+    if (STREQ(type, "QEMU") ||
+        STREQ(type, "LIBXL") ||
+        STREQ(type, "LXC") ||
+        STREQ(type, "VBOX") ||
+        STREQ(type, "bhyve") ||
+        STREQ(type, "vz") ||
+        STREQ(type, "Parallels")) {
+        VIR_DEBUG("Hypervisor driver found, setting URIs for secondary dri=
vers");
+        if (getuid() =3D=3D 0) {
+            priv->interfaceURI =3D "interface:///system";
+            priv->networkURI =3D "network:///system";
+            priv->nodedevURI =3D "nodedev:///system";
+            priv->nwfilterURI =3D "nwfilter:///system";
+            priv->secretURI =3D "secret:///system";
+            priv->storageURI =3D "storage:///system";
+        } else {
+            priv->interfaceURI =3D "interface:///session";
+            priv->networkURI =3D "network:///session";
+            priv->nodedevURI =3D "nodedev:///session";
+            /* No nwfilterURI as this is a root-only driver */
+            priv->secretURI =3D "secret:///session";
+            priv->storageURI =3D "storage:///session";
+        }
+    } else if (STREQ(type, "interface")) {
+        VIR_DEBUG("Interface driver found");
+        priv->interfaceConn =3D virObjectRef(priv->conn);
+    } else if (STREQ(type, "network")) {
+        VIR_DEBUG("Network driver found");
+        priv->networkConn =3D virObjectRef(priv->conn);
+    } else if (STREQ(type, "nodedev")) {
+        VIR_DEBUG("Nodedev driver found");
+        priv->nodedevConn =3D virObjectRef(priv->conn);
+    } else if (STREQ(type, "nwfilter")) {
+        VIR_DEBUG("NWFilter driver found");
+        priv->nwfilterConn =3D virObjectRef(priv->conn);
+    } else if (STREQ(type, "secret")) {
+        VIR_DEBUG("Secret driver found");
+        priv->secretConn =3D virObjectRef(priv->conn);
+    } else if (STREQ(type, "storage")) {
+        VIR_DEBUG("Storage driver found");
+        priv->storageConn =3D virObjectRef(priv->conn);
+
+        /* Co-open the secret driver, as apps using the storage driver may=
 well
+         * need access to secrets for storage auth
+         */
+        if (getuid() =3D=3D 0)
+            priv->secretURI =3D "secret:///system";
+        else
+            priv->secretURI =3D "secret:///session";
+    } else {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Unexpected driver type '%s' opened"), type);
+        goto cleanup;
+    }
+#else /* !MODULE_NAME */
+    /*
+     * For libvirtd/virtproxyd one connection handles
+     * all drivers
+     */
+    VIR_DEBUG("Pointing secondary drivers to primary");
     priv->interfaceConn =3D virObjectRef(priv->conn);
     priv->networkConn =3D virObjectRef(priv->conn);
     priv->nodedevConn =3D virObjectRef(priv->conn);
     priv->nwfilterConn =3D virObjectRef(priv->conn);
     priv->secretConn =3D virObjectRef(priv->conn);
     priv->storageConn =3D virObjectRef(priv->conn);
+#endif /* !MODULE_NAME */
=20
     /* force update the @readonly attribute which was inherited from the
      * virNetServerService object - this is important for sockets that are=
 RW
@@ -2118,8 +2223,13 @@ remoteDispatchConnectOpen(virNetServerPtr server ATT=
RIBUTE_UNUSED,
     rv =3D 0;
=20
  cleanup:
-    if (rv < 0)
+    if (rv < 0) {
         virNetMessageSaveError(rerr);
+        if (priv->conn) {
+            virObjectUnref(priv->conn);
+            priv->conn =3D NULL;
+        }
+    }
     virMutexUnlock(&priv->lock);
     return rv;
 }
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277248; cv=none;
	d=zoho.com; s=zohoarc;
	b=UKh8KBe5zirFd2D4rYKkHkAZ3u5VOpse5u/wkJXtIm7OF2bxxu0miYfHMpD/3Xr0yS4Ah9r8RCH9eAYID9Ge0L8GD8RvArZBODvTycvc1Gp8VmJ/vogkMXkDM/iUhT4ahMnRtxro5E9f8TeGJ+82foXfxFP4OBufjns7OprPBms=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277248;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=iV3ApobckfsSU3QCSKjeA8grZlYmPOkugQwF5AtoZ8g=;
	b=Ts120odYOT0n8VsmsUEBNO962U4igzFcyfgipTBr2Z0F8WrMMMXdTEylcJ2KMbF2ugqjmwY8tdprfUOAtpr5aVctGFldpSdocNXPJ6VUmDsUoe5dcO1LRiHN+A4nNAyAYioQDI4x+L8zCvFS+R86ogQ2NsTo9A/ZGR7R+AC+1B4=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277248594430.2435741768786;
 Thu, 8 Aug 2019 08:14:08 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com
 [10.5.11.23])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id BF64530921DC;
	Thu,  8 Aug 2019 15:14:06 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 97182194BB;
	Thu,  8 Aug 2019 15:14:06 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4D0221804762;
	Thu,  8 Aug 2019 15:14:06 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FCDfB028024 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:12:13 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 013651001948; Thu,  8 Aug 2019 15:12:13 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 1395C10002B9;
	Thu,  8 Aug 2019 15:12:11 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:41 +0100
Message-Id: <20190808151044.11385-40-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 39/42] remote: handle autoprobing of driver
	within virtproxyd
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]);
 Thu, 08 Aug 2019 15:14:07 +0000 (UTC)

The virtproxyd daemon is merely responsible for forwarding RPC calls to
one of the other per-driver daemons. As such, it does not have any
drivers loaded and so regular auto-probing logic will not work. We need
it to be able to handle NULL URIs though, so must implement some kind of
alternative probing logic.

When running as root this is quite crude. If a per-driver daemon is
running, its UNIX socket will exist and we can assume it will accept
connections. If the per-driver daemon is not running, but socket
autostart is enabled, we again just assume it will accept connections.

The is not great, however, because a default install may well have
all sockets available for activation. IOW, the virtxend socket may
exist, despite the fact that the libxl driver will not actually work.

When running as non-root this is slightly easier as we only have two
drivers, QEMU and VirtualBox. These daemons will likely not be running
and socket activation won't be used either, as libvirt spawns the
daemon on demand. So we just check whether the daemon actually is
installed.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/Makefile.inc.am          |   1 +
 src/remote/remote_daemon_dispatch.c | 138 ++++++++++++++++++++++++++++
 2 files changed, 139 insertions(+)

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 0a3aef1ec1..09535ee6bb 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -235,6 +235,7 @@ virtproxyd_CFLAGS =3D \
 	-DSOCK_PREFIX=3D"\"libvirt\"" \
 	-DDAEMON_NAME=3D"\"virtproxyd\"" \
 	-DENABLE_IP \
+	-DVIRTPROXYD \
 	$(NULL)
 virtproxyd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS)
 virtproxyd_LDADD =3D $(REMOTE_DAEMON_LD_ADD)
diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon=
_dispatch.c
index 7a66629d5b..c8e353ebd3 100644
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -50,6 +50,7 @@
 #include "viraccessapicheckqemu.h"
 #include "virpolkit.h"
 #include "virthreadjob.h"
+#include "configmake.h"
=20
 #define VIR_FROM_THIS VIR_FROM_RPC
=20
@@ -2094,6 +2095,131 @@ void *remoteClientNew(virNetServerClientPtr client,
=20
 /*----- Functions. -----*/
=20
+#ifdef VIRTPROXYD
+/*
+ * When running in virtproxyd regular auto-probing of drivers
+ * does not work as we don't have any drivers present (except
+ * stateless ones inside libvirt.so). All the interesting
+ * drivers are in separate daemons. Thus when we get a NULL
+ * URI we need to simulate probing that virConnectOpen would
+ * previously do. We use the existance of the UNIX domain
+ * socket as our hook for probing.
+ *
+ * This assumes no stale sockets left over from a now dead
+ * daemon, but that's reasonable since libvirtd unlinks
+ * sockets it creates on shutdown, or uses systemd activation
+ *
+ * We only try to probe for primary hypervisor drivers,
+ * not the secondary drivers.
+ */
+static int
+remoteDispatchProbeURI(bool readonly,
+                       char **probeduri)
+{
+    *probeduri =3D NULL;
+    VIR_DEBUG("Probing for driver daemon sockets");
+
+    /*
+     * If running root, either the daemon is running and the socket
+     * exists, or we're using socket activation so the socket exists
+     * too.
+     *
+     * If running non-root, chances are that the daemon won't be
+     * running, nor any socket activation is used. We need to
+     * be able to auto-spawn the daemon. We thus just check to
+     * see what daemons are installed. This is not a big deal as
+     * only QEMU & VBox run as non-root, anyway.
+     */
+    if (geteuid() !=3D 0) {
+        /* Order these the same as virDriverLoadModule
+         * calls in daemonInitialize */
+        const char *drivers[] =3D {
+# ifdef WITH_QEMU
+            "qemu",
+# endif
+# ifdef WITH_VBOX
+            "vbox",
+# endif
+        };
+        size_t i;
+
+        for (i =3D 0; i < ARRAY_CARDINALITY(drivers) && !*probeduri; i++) {
+            VIR_AUTOFREE(char *) daemonname =3D NULL;
+            VIR_AUTOFREE(char *) daemonpath =3D NULL;
+
+            if (virAsprintf(&daemonname, "virt%sd", drivers[i]) < 0)
+                return -1;
+
+            if (!(daemonpath =3D virFileFindResource(daemonname, "src", SB=
INDIR)))
+                return -1;
+
+            if (!virFileExists(daemonpath)) {
+                VIR_DEBUG("Missing daemon %s for driver %s", daemonpath, d=
rivers[i]);
+                continue;
+            }
+
+            if (virAsprintf(probeduri, "%s:///session", drivers[i]) < 0)
+                return -1;
+
+            VIR_DEBUG("Probed URI %s via daemon %s", *probeduri, daemonpat=
h);
+            return 0;
+        }
+    } else {
+        /* Order these the same as virDriverLoadModule
+         * calls in daemonInitialize */
+        const char *drivers[] =3D {
+# ifdef WITH_LIBXL
+            "libxl",
+# endif
+# ifdef WITH_QEMU
+            "qemu",
+# endif
+# ifdef WITH_LXC
+            "lxc",
+# endif
+# ifdef WITH_VBOX
+            "vbox",
+# endif
+# ifdef WITH_BHYVE
+            "bhyve",
+# endif
+# ifdef WITH_VZ
+            "vz",
+# endif
+        };
+        size_t i;
+
+        for (i =3D 0; i < ARRAY_CARDINALITY(drivers) && !*probeduri; i++) {
+            VIR_AUTOFREE(char *) sockname =3D NULL;
+
+            if (virAsprintf(&sockname, "%s/run/libvirt/virt%sd-%s",
+                            LOCALSTATEDIR, drivers[i],
+                            readonly ? "sock-ro" : "sock") < 0)
+                return -1;
+
+            if (!virFileExists(sockname)) {
+                VIR_DEBUG("Missing sock %s for driver %s", sockname, drive=
rs[i]);
+                continue;
+            }
+
+            if (virAsprintf(probeduri, "%s:///system", drivers[i]) < 0)
+                return -1;
+
+            VIR_DEBUG("Probed URI %s via sock %s", *probeduri, sockname);
+            return 0;
+        }
+    }
+
+    /* Even if we didn't probe any socket, we won't
+     * return error. Just let virConnectOpen's normal
+     * logic run which will likely return an error anyway
+     */
+    VIR_DEBUG("No driver sock exists");
+    return 0;
+}
+#endif /* VIRTPROXYD */
+
+
 static int
 remoteDispatchConnectOpen(virNetServerPtr server ATTRIBUTE_UNUSED,
                           virNetServerClientPtr client,
@@ -2102,6 +2228,9 @@ remoteDispatchConnectOpen(virNetServerPtr server ATTR=
IBUTE_UNUSED,
                           struct remote_connect_open_args *args)
 {
     const char *name;
+#ifdef VIRTPROXYD
+    VIR_AUTOFREE(char *) probeduri =3D NULL;
+#endif
     unsigned int flags;
     struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(=
client);
     int rv =3D -1;
@@ -2128,6 +2257,15 @@ remoteDispatchConnectOpen(virNetServerPtr server ATT=
RIBUTE_UNUSED,
=20
     priv->readonly =3D flags & VIR_CONNECT_RO;
=20
+#ifdef VIRTPROXYD
+    if (!name || STREQ(name, "")) {
+        if (remoteDispatchProbeURI(priv->readonly, &probeduri) < 0)
+            goto cleanup;
+
+        name =3D probeduri;
+    }
+#endif
+
     VIR_DEBUG("Opening driver %s", name);
     if (priv->readonly) {
         if (!(priv->conn =3D virConnectOpenReadOnly(name)))
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277277; cv=none;
	d=zoho.com; s=zohoarc;
	b=HMvmzvW3Y3OGtYud9G61sxiB4OI6aOHrgDfpFP16BpUrnkjwGo7xUh8seFRMgB4TRpWQdb/pTgfVZkuYVaJO9PK3yXGjBvQn6IAij2urOkyEHKony+Hrw2KMVJNhJlKmXtAjM7HBDBJhXjpwDXH2TQpUSPwC4nQIdvM9LweiGY0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277277;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=Tm/NDIFNOWplCC52g+41BT8WcCHBYx/GjI1GOZmBCgQ=;
	b=Vkvabh2+zFdTTLlcaOihb/LcI8DVuhoLI8d9kJqLIPRJLbjL/SOQi0azA4iuGVHRQe1U8wXdsmLsiLgC6ZFBuqDG2m9CvCZ5IW5AxMHEbXcHW3IT7p48rmvqmerS/OETaIDkQOPw8kFq7dgKR7MXTSaC2y+JSLETyX72i8yD2vk=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277277587211.52239751188563;
 Thu, 8 Aug 2019 08:14:37 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com
 [10.5.11.23])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 75B50314519D;
	Thu,  8 Aug 2019 15:14:36 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 4ACDC3DB4;
	Thu,  8 Aug 2019 15:14:36 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0935F180BA9B;
	Thu,  8 Aug 2019 15:14:36 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FCEgT028064 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:12:14 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 63449100194E; Thu,  8 Aug 2019 15:12:14 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 54BA81001948;
	Thu,  8 Aug 2019 15:12:13 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:42 +0100
Message-Id: <20190808151044.11385-41-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 40/42] remote: use enum helpers for parsing
	remote driver transport
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]);
 Thu, 08 Aug 2019 15:14:37 +0000 (UTC)

Instead of open-coding a string -> enum conversion, use the enum helpers
for the remote driver transport. The old code uses STRCASEEQ, so we must
force the URI transport to lowercase for sake of back-compatibility.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/remote_driver.c | 121 +++++++++++++++++++++----------------
 1 file changed, 68 insertions(+), 53 deletions(-)

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index ef240052f1..1b36ef3f05 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -49,11 +49,35 @@
 #include "virauth.h"
 #include "virauthconfig.h"
 #include "virstring.h"
+#include "c-ctype.h"
=20
 #define VIR_FROM_THIS VIR_FROM_REMOTE
=20
 VIR_LOG_INIT("remote.remote_driver");
=20
+typedef enum {
+    REMOTE_DRIVER_TRANSPORT_TLS,
+    REMOTE_DRIVER_TRANSPORT_UNIX,
+    REMOTE_DRIVER_TRANSPORT_SSH,
+    REMOTE_DRIVER_TRANSPORT_LIBSSH2,
+    REMOTE_DRIVER_TRANSPORT_EXT,
+    REMOTE_DRIVER_TRANSPORT_TCP,
+    REMOTE_DRIVER_TRANSPORT_LIBSSH,
+
+    REMOTE_DRIVER_TRANSPORT_LAST,
+} remoteDriverTransport;
+
+VIR_ENUM_DECL(remoteDriverTransport);
+VIR_ENUM_IMPL(remoteDriverTransport,
+              REMOTE_DRIVER_TRANSPORT_LAST,
+              "tls",
+              "unix",
+              "ssh",
+              "libssh2",
+              "ext",
+              "tcp",
+              "libssh");
+
 #if SIZEOF_LONG < 8
 # define HYPER_TO_TYPE(_type, _to, _from) \
     do { \
@@ -176,10 +200,17 @@ static int remoteSplitURIScheme(virURIPtr uri,
     if (VIR_STRNDUP(*driver, uri->scheme, p ? p - uri->scheme : -1) < 0)
         return -1;
=20
-    if (p &&
-        VIR_STRDUP(*transport, p + 1) < 0) {
-        VIR_FREE(*driver);
-        return -1;
+    if (p) {
+        if (VIR_STRDUP(*transport, p + 1) < 0) {
+            VIR_FREE(*driver);
+            return -1;
+        }
+
+        p =3D *transport;
+        while (*p) {
+            *p =3D c_tolower(*p);
+            p++;
+        }
     }
=20
     return 0;
@@ -778,15 +809,7 @@ doRemoteOpen(virConnectPtr conn,
              virConfPtr conf,
              unsigned int flags)
 {
-    enum {
-        trans_tls,
-        trans_unix,
-        trans_ssh,
-        trans_libssh2,
-        trans_ext,
-        trans_tcp,
-        trans_libssh,
-    } transport;
+    int transport;
 #ifndef WIN32
     VIR_AUTOFREE(char *) daemonPath =3D NULL;
 #endif
@@ -815,52 +838,39 @@ doRemoteOpen(virConnectPtr conn,
     if (conn->uri) {
         if (!transport_str) {
             if (conn->uri->server)
-                transport =3D trans_tls;
+                transport =3D REMOTE_DRIVER_TRANSPORT_TLS;
             else
-                transport =3D trans_unix;
+                transport =3D REMOTE_DRIVER_TRANSPORT_UNIX;
         } else {
-            if (STRCASEEQ(transport_str, "tls")) {
-                transport =3D trans_tls;
-            } else if (STRCASEEQ(transport_str, "unix")) {
-                if (conn->uri->server) {
-                    virReportError(VIR_ERR_INVALID_ARG,
-                                   _("using unix socket and remote "
-                                     "server '%s' is not supported."),
-                                   conn->uri->server);
-                    return VIR_DRV_OPEN_ERROR;
-                } else {
-                    transport =3D trans_unix;
-                }
-            } else if (STRCASEEQ(transport_str, "ssh")) {
-                transport =3D trans_ssh;
-            } else if (STRCASEEQ(transport_str, "libssh2")) {
-                transport =3D trans_libssh2;
-            } else if (STRCASEEQ(transport_str, "ext")) {
-                transport =3D trans_ext;
-            } else if (STRCASEEQ(transport_str, "tcp")) {
-                transport =3D trans_tcp;
-            } else if (STRCASEEQ(transport_str, "libssh")) {
-                transport =3D trans_libssh;
-            } else {
+            if ((transport =3D remoteDriverTransportTypeFromString(transpo=
rt_str)) < 0) {
                 virReportError(VIR_ERR_INVALID_ARG, "%s",
                                _("remote_open: transport in URL not recogn=
ised "
                                  "(should be tls|unix|ssh|ext|tcp|libssh2|=
libssh)"));
                 return VIR_DRV_OPEN_ERROR;
             }
+
+            if (transport =3D=3D REMOTE_DRIVER_TRANSPORT_UNIX &&
+                conn->uri->server) {
+                virReportError(VIR_ERR_INVALID_ARG,
+                               _("using unix socket and remote "
+                                 "server '%s' is not supported."),
+                               conn->uri->server);
+                return VIR_DRV_OPEN_ERROR;
+            }
         }
     } else {
         /* No URI, then must be probing so use UNIX socket */
-        transport =3D trans_unix;
+        transport =3D REMOTE_DRIVER_TRANSPORT_UNIX;
     }
=20
     /* Remote server defaults to "localhost" if not specified. */
     if (conn->uri && conn->uri->port !=3D 0) {
         if (virAsprintf(&port, "%d", conn->uri->port) < 0)
             goto failed;
-    } else if (transport =3D=3D trans_tls) {
+    } else if (transport =3D=3D REMOTE_DRIVER_TRANSPORT_TLS) {
         if (VIR_STRDUP(port, LIBVIRTD_TLS_PORT) < 0)
             goto failed;
-    } else if (transport =3D=3D trans_tcp) {
+    } else if (transport =3D=3D REMOTE_DRIVER_TRANSPORT_TCP) {
         if (VIR_STRDUP(port, LIBVIRTD_TCP_PORT) < 0)
             goto failed;
     } /* Port not used for unix, ext., default for ssh */
@@ -944,7 +954,7 @@ doRemoteOpen(virConnectPtr conn,
     VIR_DEBUG("proceeding with name =3D %s", name);
=20
     /* For ext transport, command is required. */
-    if (transport =3D=3D trans_ext && !command) {
+    if (transport =3D=3D REMOTE_DRIVER_TRANSPORT_EXT && !command) {
         virReportError(VIR_ERR_INVALID_ARG, "%s",
                        _("remote_open: for 'ext' transport, command is req=
uired"));
         goto failed;
@@ -952,8 +962,8 @@ doRemoteOpen(virConnectPtr conn,
=20
     VIR_DEBUG("Connecting with transport %d", transport);
     /* Connect to the remote service. */
-    switch (transport) {
-    case trans_tls:
+    switch ((remoteDriverTransport)transport) {
+    case REMOTE_DRIVER_TRANSPORT_TLS:
         if (conf && !tls_priority &&
             virConfGetValueString(conf, "tls_priority", &tls_priority) < 0)
             goto failed;
@@ -976,7 +986,7 @@ doRemoteOpen(virConnectPtr conn,
         goto failed;
 #endif
=20
-    case trans_tcp:
+    case REMOTE_DRIVER_TRANSPORT_TCP:
         priv->client =3D virNetClientNewTCP(priv->hostname, port, AF_UNSPE=
C);
         if (!priv->client)
             goto failed;
@@ -991,7 +1001,7 @@ doRemoteOpen(virConnectPtr conn,
=20
         break;
=20
-    case trans_libssh2:
+    case REMOTE_DRIVER_TRANSPORT_LIBSSH2:
         if (!sockname) {
             /* Right now we don't support default session connections */
             if (flags & VIR_DRV_OPEN_REMOTE_USER) {
@@ -1026,7 +1036,7 @@ doRemoteOpen(virConnectPtr conn,
         priv->is_secure =3D 1;
         break;
=20
-    case trans_libssh:
+    case REMOTE_DRIVER_TRANSPORT_LIBSSH:
         if (!sockname) {
             /* Right now we don't support default session connections */
             if (flags & VIR_DRV_OPEN_REMOTE_USER) {
@@ -1062,7 +1072,7 @@ doRemoteOpen(virConnectPtr conn,
         break;
=20
 #ifndef WIN32
-    case trans_unix:
+    case REMOTE_DRIVER_TRANSPORT_UNIX:
         if (!sockname) {
             if (flags & VIR_DRV_OPEN_REMOTE_USER)
                 sockname =3D remoteGetUNIXSocketNonRoot();
@@ -1088,7 +1098,7 @@ doRemoteOpen(virConnectPtr conn,
         priv->is_secure =3D 1;
         break;
=20
-    case trans_ssh:
+    case REMOTE_DRIVER_TRANSPORT_SSH:
         if (!command && VIR_STRDUP(command, "ssh") < 0)
             goto failed;
=20
@@ -1120,7 +1130,7 @@ doRemoteOpen(virConnectPtr conn,
         priv->is_secure =3D 1;
         break;
=20
-    case trans_ext: {
+    case REMOTE_DRIVER_TRANSPORT_EXT: {
         char const *cmd_argv[] =3D { command, NULL };
         if (!(priv->client =3D virNetClientNewExternal(cmd_argv)))
             goto failed;
@@ -1132,15 +1142,20 @@ doRemoteOpen(virConnectPtr conn,
=20
 #else /* WIN32 */
=20
-    case trans_unix:
-    case trans_ssh:
-    case trans_ext:
+    case REMOTE_DRIVER_TRANSPORT_UNIX:
+    case REMOTE_DRIVER_TRANSPORT_SSH:
+    case REMOTE_DRIVER_TRANSPORT_EXT:
         virReportError(VIR_ERR_INVALID_ARG, "%s",
                        _("transport methods unix, ssh and ext are not supp=
orted "
                          "under Windows"));
         goto failed;
=20
 #endif /* WIN32 */
+
+    case REMOTE_DRIVER_TRANSPORT_LAST:
+    default:
+        virReportEnumRangeError(remoteDriverTransport, transport);
+        goto failed;
     } /* switch (transport) */
=20
=20
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277281; cv=none;
	d=zoho.com; s=zohoarc;
	b=DjjfXiQpzGDEb/ndh5I260211yBcYVLtkvE+Yk9Scch0n8g28gm1eobR7dXhAo1x5uRBNOtK+2HFM/kVBX7yXXTlRPdawT0EDd6GneFtIowBclTnqwAACGbXJbgWD0PwRm3A1/QR+rRXyYWsLDNEYoxR6aU8HdTneht5qbmHtOY=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277281;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=OgvZQXHrgmLzy3GIgj5PPWlKCIhj+uQZKCHx0Lhn8dI=;
	b=BJIx36S4BF87sIi2VuoRwpm5qe+6zP8xVgq1hmJ19tdVgaLn1evNSUUeiaz00ROcw01Yzc1thz9LGKEv0qRU3aryiL0GJqE3r80wKQHejGlp0h8tFkgdQY0IIdX2xu51dRn99dioiHSjKH659ohRIDOVZU5gekNWmWBMpGYTfDA=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277281243939.3170217349478;
 Thu, 8 Aug 2019 08:14:41 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id 082E43067319;
	Thu,  8 Aug 2019 15:14:40 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id D213B60619;
	Thu,  8 Aug 2019 15:14:39 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 92160180BAA1;
	Thu,  8 Aug 2019 15:14:39 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FCFhT028188 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:12:15 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id B9E7110016F3; Thu,  8 Aug 2019 15:12:15 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id CB4E21001948;
	Thu,  8 Aug 2019 15:12:14 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:43 +0100
Message-Id: <20190808151044.11385-42-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 41/42] remote: refactor the code for choosing
	the UNIX socket path
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]);
 Thu, 08 Aug 2019 15:14:40 +0000 (UTC)

The ssh, libssh, libssh2 & unix transports all need to use a UNIX socket
path, and duplicate some of the same logic for error checking. Pull this
out into a separate method to increase code sharing.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/remote_driver.c | 124 +++++++++++++++----------------------
 1 file changed, 49 insertions(+), 75 deletions(-)

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 1b36ef3f05..6e1001b385 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -747,34 +747,35 @@ remoteConnectSupportsFeatureUnlocked(virConnectPtr co=
nn,
     }
=20
=20
-#ifndef WIN32
-static char *remoteGetUNIXSocketNonRoot(void)
+static char *
+remoteGetUNIXSocket(remoteDriverTransport transport,
+                    unsigned int flags)
 {
     char *sockname =3D NULL;
-    char *userdir =3D virGetUserRuntimeDirectory();
-
-    if (!userdir)
-        return NULL;
+    VIR_AUTOFREE(char *) userdir =3D NULL;
+
+    if (flags & VIR_DRV_OPEN_REMOTE_USER) {
+        if (transport !=3D REMOTE_DRIVER_TRANSPORT_UNIX) {
+            virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
+                           _("Connecting to session instance without "
+                             "socket path is not supported by the %s "
+                             "transport"),
+                           remoteDriverTransportTypeToString(transport));
+            return NULL;
+        }
+        if (!(userdir =3D virGetUserRuntimeDirectory()))
+            return NULL;
=20
-    if (virAsprintf(&sockname, "%s/" LIBVIRTD_USER_UNIX_SOCKET, userdir) <=
 0) {
-        VIR_FREE(userdir);
-        return NULL;
+        if (virAsprintf(&sockname,
+                        "%s/" LIBVIRTD_USER_UNIX_SOCKET, userdir) < 0)
+            return NULL;
+    } else {
+        if (VIR_STRDUP(sockname,
+                       flags & VIR_DRV_OPEN_REMOTE_RO ?
+                       LIBVIRTD_PRIV_UNIX_SOCKET_RO :
+                       LIBVIRTD_PRIV_UNIX_SOCKET) < 0)
+            return NULL;
     }
-    VIR_FREE(userdir);
-
-    VIR_DEBUG("Chosen UNIX sockname %s", sockname);
-    return sockname;
-}
-#endif /* WIN32 */
-
-static char *remoteGetUNIXSocketRoot(unsigned int flags)
-{
-    char *sockname =3D NULL;
-
-    if (VIR_STRDUP(sockname,
-                   flags & VIR_DRV_OPEN_REMOTE_RO ?
-                   LIBVIRTD_PRIV_UNIX_SOCKET_RO : LIBVIRTD_PRIV_UNIX_SOCKE=
T) < 0)
-        return NULL;
=20
     VIR_DEBUG("Chosen UNIX sockname %s", sockname);
     return sockname;
@@ -961,6 +962,30 @@ doRemoteOpen(virConnectPtr conn,
     }
=20
     VIR_DEBUG("Connecting with transport %d", transport);
+
+    switch ((remoteDriverTransport)transport) {
+    case REMOTE_DRIVER_TRANSPORT_UNIX:
+    case REMOTE_DRIVER_TRANSPORT_SSH:
+    case REMOTE_DRIVER_TRANSPORT_LIBSSH:
+    case REMOTE_DRIVER_TRANSPORT_LIBSSH2:
+        if (!sockname &&
+            !(sockname =3D remoteGetUNIXSocket(transport, flags)))
+            goto failed;
+        break;
+
+    case REMOTE_DRIVER_TRANSPORT_TCP:
+    case REMOTE_DRIVER_TRANSPORT_TLS:
+    case REMOTE_DRIVER_TRANSPORT_EXT:
+        break;
+
+    case REMOTE_DRIVER_TRANSPORT_LAST:
+    default:
+        virReportEnumRangeError(remoteDriverTransport, transport);
+        goto failed;
+    }
+
+    VIR_DEBUG("Chosen UNIX socket %s", NULLSTR(sockname));
+
     /* Connect to the remote service. */
     switch ((remoteDriverTransport)transport) {
     case REMOTE_DRIVER_TRANSPORT_TLS:
@@ -1002,20 +1027,6 @@ doRemoteOpen(virConnectPtr conn,
         break;
=20
     case REMOTE_DRIVER_TRANSPORT_LIBSSH2:
-        if (!sockname) {
-            /* Right now we don't support default session connections */
-            if (flags & VIR_DRV_OPEN_REMOTE_USER) {
-                virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                               _("Connecting to session instance without "
-                                 "socket path is not supported by the libs=
sh2 "
-                                 "connection driver"));
-                goto failed;
-            }
-
-            if (!(sockname =3D remoteGetUNIXSocketRoot(flags)))
-                goto failed;
-        }
-
         VIR_DEBUG("Starting LibSSH2 session");
=20
         priv->client =3D virNetClientNewLibSSH2(priv->hostname,
@@ -1037,20 +1048,6 @@ doRemoteOpen(virConnectPtr conn,
         break;
=20
     case REMOTE_DRIVER_TRANSPORT_LIBSSH:
-        if (!sockname) {
-            /* Right now we don't support default session connections */
-            if (flags & VIR_DRV_OPEN_REMOTE_USER) {
-                virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                               _("Connecting to session instance without "
-                                 "socket path is not supported by the libs=
sh "
-                                 "connection driver"));
-                goto failed;
-            }
-
-            if (!(sockname =3D remoteGetUNIXSocketRoot(flags)))
-                goto failed;
-        }
-
         VIR_DEBUG("Starting libssh session");
=20
         priv->client =3D virNetClientNewLibssh(priv->hostname,
@@ -1073,15 +1070,6 @@ doRemoteOpen(virConnectPtr conn,
=20
 #ifndef WIN32
     case REMOTE_DRIVER_TRANSPORT_UNIX:
-        if (!sockname) {
-            if (flags & VIR_DRV_OPEN_REMOTE_USER)
-                sockname =3D remoteGetUNIXSocketNonRoot();
-            else
-                sockname =3D remoteGetUNIXSocketRoot(flags);
-            if (!sockname)
-                goto failed;
-        }
-
         if ((flags & VIR_DRV_OPEN_REMOTE_AUTOSTART) &&
             !(daemonPath =3D virFileFindResourceFull("libvirtd",
                                                    NULL, NULL,
@@ -1102,20 +1090,6 @@ doRemoteOpen(virConnectPtr conn,
         if (!command && VIR_STRDUP(command, "ssh") < 0)
             goto failed;
=20
-        if (!sockname) {
-            /* Right now we don't support default session connections */
-            if (flags & VIR_DRV_OPEN_REMOTE_USER) {
-                virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                               _("Connecting to session instance without "
-                                 "socket path is not supported by the ssh "
-                                 "connection driver"));
-                goto failed;
-            }
-
-            if (!(sockname =3D remoteGetUNIXSocketRoot(flags)))
-                goto failed;
-        }
-
         if (!(priv->client =3D virNetClientNewSSH(priv->hostname,
                                                 port,
                                                 command,
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu Apr 25 07:10:46 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1565277251; cv=none;
	d=zoho.com; s=zohoarc;
	b=jpQXQm46c1ySrJ+AGLijlsnmdtCiQQ5fpXegLD5Z2S8upf/4GwfIYEFFAeF/cDBDYVNvtauXuSJIG+a2TNzxvpRaShWfmB5xyWt8ENccp4KFX6FEnA9I3y+BQjuPtflPfgIIsLbdIGZG8FKdVrgTKxil7bNmGikf8MgmtoQizWg=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1565277251;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=dPrgjx7PfXpyyhkTJvhAX8K7hN+YOAUax6QYZQM3uDQ=;
	b=HNJLsEHuge1i0a42ywg7d51R/sicXi4jMwFRY3IWdoIi5Sqx6Tdd9lurWo+PRp0K3z9HT/FOlmry1idx6JchClQJKbXZ4LaVkSgvR9brgCDrQmjmXif7NJvRC383jybybXILx7mAPwh4bUAbRDanau8kaqevaQUIpLwggyiPDRI=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1565277251882924.2818700522232;
 Thu, 8 Aug 2019 08:14:11 -0700 (PDT)
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 930EE30DDBD8;
	Thu,  8 Aug 2019 15:14:10 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 628D05C3F8;
	Thu,  8 Aug 2019 15:14:10 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0BA9B149F7;
	Thu,  8 Aug 2019 15:14:10 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
	[10.5.11.22])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x78FCHQ7028340 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 8 Aug 2019 11:12:17 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 42B7B10002B9; Thu,  8 Aug 2019 15:12:17 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-28.ams2.redhat.com
	[10.36.112.28])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 257DB10016F3;
	Thu,  8 Aug 2019 15:12:15 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu,  8 Aug 2019 16:10:44 +0100
Message-Id: <20190808151044.11385-43-berrange@redhat.com>
In-Reply-To: <20190808151044.11385-1-berrange@redhat.com>
References: <20190808151044.11385-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-loop: libvir-list@redhat.com
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v4 42/42] remote: enable connecting to the
	per-driver daemons
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]);
 Thu, 08 Aug 2019 15:14:11 +0000 (UTC)

Historically URIs handled by the remote driver will always connect to
the libvirtd UNIX socket. There will now be one daemon per driver, and
each of these has its own UNIX sockets to connect to.

It will still be possible to run the traditional monolithic libvirtd
though, which will have the original UNIX socket path.

In addition there is a virproxyd daemon that doesn't run any drivers,
but provides proxying for clients accessing libvirt over IP sockets, or
tunnelling to the legacy libvirtd UNIX socket path.

Finally when running inside a daemon, the remote driver must not reject
connections unconditionally. For example, the QEMU driver needs to be
able to connect to the network driver. The remote driver must thus be
willing to handle connections even when inside the daemon, provided no
local driver is registered.

This refactoring enables the remote driver to be able to connect to the
per-driver daemons. The URI parameter "mode" accepts the values "auto",
"direct" and "legacy" to control which daemons are connected to.

The client side libvirt.conf config file also supports a "remote_mode"
setting which is used if the URI parameter is not set.

If neither the config file or URI parameter set a mode, then "auto"
is used, whereby the client looks to see which sockets actually exist
right now.

The remote driver will only ever spawn the per-driver daemons, or
the legacy libvirtd. It won't ever try to spawn virtproxyd, as
that is only there for IP based connectivity, or for access from
legacy remote clients.

If connecting to a remote host over any kind of ssh tunnel, for now we
must assume only the legacy socket exists. A future patch will introduce
a netcat replacement that is tailored for libvirt to make remote
tunnelling easier.

The configure arg '--with-remote-default-mode=3Dlegacy|direct' allows
packagers to set a default at build time. If not given, it will default
to legacy mode.

Eventually the default will switch to direct mode. Distros can choose
to do the switch earlier if desired. The main blocker is testing and
suitable SELinux/AppArmor policies.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 docs/remote.html.in        |  18 ++++
 libvirt.spec.in            |   1 +
 m4/virt-driver-remote.m4   |  15 +++
 src/driver.h               |   2 +
 src/libvirt.c              |  27 +++++
 src/remote/remote_driver.c | 209 +++++++++++++++++++++++++++++++++----
 src/remote/remote_driver.h |   3 -
 7 files changed, 250 insertions(+), 25 deletions(-)

diff --git a/docs/remote.html.in b/docs/remote.html.in
index fbcc8bf01c..78e071a898 100644
--- a/docs/remote.html.in
+++ b/docs/remote.html.in
@@ -206,6 +206,24 @@ Note that parameter values must be
         <td colspan=3D"2"/>
         <td> Example: <code>tls_priority=3DNORMAL:-VERS-SSL3.0</code> </td>
       </tr>
+      <tr>
+        <td>
+          <code>mode</code>
+        </td>
+        <td> unix, ssh, libssh, libssh2 </td>
+        <td>
+          <dl>
+            <dt><code>auto</code></dt><dd>automatically determine the daem=
on</dd>
+            <dt><code>direct</code></dt><dd>connect to per-driver daemons<=
/dd>
+            <dt><code>legacy</code></dt><dd>connect to libvirtd</dd>
+          </dl>
+          Can also be set in <code>libvirt.conf</code> as <code>remote_mod=
e</code>
+        </td>
+      </tr>
+      <tr>
+        <td colspan=3D"2"/>
+        <td> Example: <code>mode=3Ddirect</code> </td>
+      </tr>
       <tr>
         <td>
           <code>command</code>
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 184268b596..ee4b408510 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1170,6 +1170,7 @@ rm -f po/stamp-po
            --without-xenapi \
            --without-vz \
            --without-bhyve \
+           --with-remote-default-mode=3Dlegacy \
            --with-interface \
            --with-network \
            --with-storage-fs \
diff --git a/m4/virt-driver-remote.m4 b/m4/virt-driver-remote.m4
index c7af5b3fc6..8d98e369b3 100644
--- a/m4/virt-driver-remote.m4
+++ b/m4/virt-driver-remote.m4
@@ -19,6 +19,7 @@ dnl
=20
 AC_DEFUN([LIBVIRT_DRIVER_ARG_REMOTE], [
   LIBVIRT_ARG_WITH_FEATURE([REMOTE], [remote driver], [yes])
+  LIBVIRT_ARG_WITH([REMOTE_DEFAULT_MODE], [remote driver default mode], [l=
egacy])
 ])
=20
 AC_DEFUN([LIBVIRT_DRIVER_CHECK_REMOTE], [
@@ -26,6 +27,20 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_REMOTE], [
     AC_DEFINE_UNQUOTED([WITH_REMOTE], 1, [whether Remote driver is enabled=
])
   fi
   AM_CONDITIONAL([WITH_REMOTE], [test "$with_remote" =3D "yes"])
+
+  case "$with_remote_default_mode" in
+    legacy)
+      REMOTE_DRIVER_MODE_DEFAULT=3DREMOTE_DRIVER_MODE_LEGACY
+      ;;
+    direct)
+      REMOTE_DRIVER_MODE_DEFAULT=3DREMOTE_DRIVER_MODE_DIRECT
+      ;;
+    *)
+      AC_MSG_ERROR([Unknown remote mode '$with_remote_default_mode'])
+      ;;
+  esac
+
+  AC_DEFINE_UNQUOTED([REMOTE_DRIVER_MODE_DEFAULT],[$REMOTE_DRIVER_MODE_DEF=
AULT], [Default remote driver mode])
 ])
=20
 AC_DEFUN([LIBVIRT_DRIVER_RESULT_REMOTE], [
diff --git a/src/driver.h b/src/driver.h
index 898fb96df4..f7d667a03c 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -108,6 +108,8 @@ int virSetSharedNWFilterDriver(virNWFilterDriverPtr dri=
ver) ATTRIBUTE_RETURN_CHE
 int virSetSharedSecretDriver(virSecretDriverPtr driver) ATTRIBUTE_RETURN_C=
HECK;
 int virSetSharedStorageDriver(virStorageDriverPtr driver) ATTRIBUTE_RETURN=
_CHECK;
=20
+bool virHasDriverForURIScheme(const char *scheme);
+
 int virDriverLoadModule(const char *name,
                         const char *regfunc,
                         bool required);
diff --git a/src/libvirt.c b/src/libvirt.c
index 906bab8128..956ccdea30 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -594,6 +594,33 @@ virRegisterConnectDriver(virConnectDriverPtr driver,
 }
=20
=20
+/**
+ * virHasDriverForURIScheme:
+ * @scheme: the URI scheme
+ *
+ * Determine if there is a driver registered that explicitly
+ * handles URIs with the scheme @scheme.
+ *
+ * Returns: true if a driver is registered
+ */
+bool
+virHasDriverForURIScheme(const char *scheme)
+{
+    size_t i;
+    size_t j;
+
+    for (i =3D 0; i < virConnectDriverTabCount; i++) {
+        if (!virConnectDriverTab[i]->uriSchemes)
+            continue;
+        for (j =3D 0; virConnectDriverTab[i]->uriSchemes[j]; j++) {
+            if (STREQ(virConnectDriverTab[i]->uriSchemes[j], scheme))
+                return true;
+        }
+    }
+
+    return false;
+}
+
 /**
  * virRegisterStateDriver:
  * @driver: pointer to a driver block
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 6e1001b385..daac506672 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -78,6 +78,24 @@ VIR_ENUM_IMPL(remoteDriverTransport,
               "tcp",
               "libssh");
=20
+typedef enum {
+    /* Try to figure out the "best" choice magically */
+    REMOTE_DRIVER_MODE_AUTO,
+    /* Always use the legacy libvirtd */
+    REMOTE_DRIVER_MODE_LEGACY,
+    /* Always use the per-driver virt*d daemons */
+    REMOTE_DRIVER_MODE_DIRECT,
+
+    REMOTE_DRIVER_MODE_LAST
+} remoteDriverMode;
+
+VIR_ENUM_DECL(remoteDriverMode);
+VIR_ENUM_IMPL(remoteDriverMode,
+              REMOTE_DRIVER_MODE_LAST,
+              "auto",
+              "legacy",
+              "direct");
+
 #if SIZEOF_LONG < 8
 # define HYPER_TO_TYPE(_type, _to, _from) \
     do { \
@@ -748,8 +766,9 @@ remoteConnectSupportsFeatureUnlocked(virConnectPtr conn,
=20
=20
 static char *
-remoteGetUNIXSocket(remoteDriverTransport transport,
-                    unsigned int flags)
+remoteGetUNIXSocketHelper(remoteDriverTransport transport,
+                          const char *sock_prefix,
+                          unsigned int flags)
 {
     char *sockname =3D NULL;
     VIR_AUTOFREE(char *) userdir =3D NULL;
@@ -766,21 +785,129 @@ remoteGetUNIXSocket(remoteDriverTransport transport,
         if (!(userdir =3D virGetUserRuntimeDirectory()))
             return NULL;
=20
-        if (virAsprintf(&sockname,
-                        "%s/" LIBVIRTD_USER_UNIX_SOCKET, userdir) < 0)
+        if (virAsprintf(&sockname, "%s/%s-sock",
+                        userdir, sock_prefix) < 0)
             return NULL;
     } else {
-        if (VIR_STRDUP(sockname,
-                       flags & VIR_DRV_OPEN_REMOTE_RO ?
-                       LIBVIRTD_PRIV_UNIX_SOCKET_RO :
-                       LIBVIRTD_PRIV_UNIX_SOCKET) < 0)
+        if (virAsprintf(&sockname, "%s/run/libvirt/%s-%s",
+                        LOCALSTATEDIR, sock_prefix,
+                        flags & VIR_DRV_OPEN_REMOTE_RO ?
+                        "sock-ro" : "sock") < 0)
             return NULL;
     }
=20
-    VIR_DEBUG("Chosen UNIX sockname %s", sockname);
+    VIR_DEBUG("Built UNIX sockname %s for transport %s prefix %s flags=3D0=
x%x",
+              sockname, remoteDriverTransportTypeToString(transport),
+              sock_prefix, flags);
     return sockname;
 }
=20
+
+static char *
+remoteGetUNIXSocket(remoteDriverTransport transport,
+                    remoteDriverMode mode,
+                    const char *driver,
+                    char **daemon,
+                    unsigned int flags)
+{
+    char *sock_name =3D NULL;
+    VIR_AUTOFREE(char *) direct_daemon =3D NULL;
+    VIR_AUTOFREE(char *) legacy_daemon =3D NULL;
+    VIR_AUTOFREE(char *) direct_sock_name =3D NULL;
+    VIR_AUTOFREE(char *) legacy_sock_name =3D NULL;
+
+    if (driver &&
+        virAsprintf(&direct_daemon, "virt%sd", driver) < 0)
+        return NULL;
+
+    if (VIR_STRDUP(legacy_daemon, "libvirtd") < 0)
+        return NULL;
+
+    if (driver &&
+        !(direct_sock_name =3D remoteGetUNIXSocketHelper(transport, direct=
_daemon, flags)))
+        return NULL;
+
+    if (!(legacy_sock_name =3D remoteGetUNIXSocketHelper(transport, "libvi=
rt", flags)))
+        return NULL;
+
+    if (mode =3D=3D REMOTE_DRIVER_MODE_AUTO) {
+        if (transport =3D=3D REMOTE_DRIVER_TRANSPORT_UNIX) {
+            if (direct_sock_name && virFileExists(direct_sock_name)) {
+                mode =3D REMOTE_DRIVER_MODE_DIRECT;
+            } else if (virFileExists(legacy_sock_name)) {
+                mode =3D REMOTE_DRIVER_MODE_LEGACY;
+            } else if (driver) {
+                /*
+                 * This constant comes from the configure script and
+                 * maps to either the direct or legacy mode constant
+                 */
+                mode =3D REMOTE_DRIVER_MODE_DEFAULT;
+            } else {
+                mode =3D REMOTE_DRIVER_MODE_LEGACY;
+            }
+        } else {
+            mode =3D REMOTE_DRIVER_MODE_LEGACY;
+        }
+    }
+
+    switch ((remoteDriverMode)mode) {
+    case REMOTE_DRIVER_MODE_LEGACY:
+        VIR_STEAL_PTR(sock_name, legacy_sock_name);
+        VIR_STEAL_PTR(*daemon, legacy_daemon);
+        break;
+
+    case REMOTE_DRIVER_MODE_DIRECT:
+        if (transport !=3D REMOTE_DRIVER_TRANSPORT_UNIX) {
+            virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
+                           _("Cannot use direct socket mode for %s transpo=
rt"),
+                           remoteDriverTransportTypeToString(transport));
+            return NULL;
+        }
+
+        if (!direct_sock_name) {
+            virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
+                           _("Cannot use direct socket mode if no URI is s=
et"));
+            return NULL;
+        }
+
+        VIR_STEAL_PTR(sock_name, direct_sock_name);
+        VIR_STEAL_PTR(*daemon, direct_daemon);
+        break;
+
+    case REMOTE_DRIVER_MODE_AUTO:
+    case REMOTE_DRIVER_MODE_LAST:
+    default:
+        virReportEnumRangeError(remoteDriverMode, mode);
+        return NULL;
+    }
+
+    VIR_DEBUG("Chosen UNIX sockname %s daemon %s "
+              "for mode %s transport %s flags=3D0x%x",
+              sock_name, NULLSTR(*daemon),
+              remoteDriverModeTypeToString(mode),
+              remoteDriverTransportTypeToString(transport),
+              flags);
+    return sock_name;
+}
+
+
+#ifndef WIN32
+static const char *
+remoteGetDaemonPathEnv(void)
+{
+    /* We prefer a VIRTD_PATH env var to use for all daemons,
+     * but if it is not set we will fallback to LIBVIRTD_PATH
+     * for previous behaviour
+     */
+    if (getenv("VIRTD_PATH") !=3D NULL) {
+        return "VIRTD_PATH";
+    } else {
+        return "LIBVIRTD_PATH";
+    }
+}
+#endif /* WIN32 */
+
+
 /*
  * URIs that this driver needs to handle:
  *
@@ -827,11 +954,20 @@ doRemoteOpen(virConnectPtr conn,
     VIR_AUTOFREE(char *) sshauth =3D NULL;
     VIR_AUTOFREE(char *) knownHostsVerify =3D NULL;
     VIR_AUTOFREE(char *) knownHosts =3D NULL;
+    VIR_AUTOFREE(char *) mode_str =3D NULL;
+    VIR_AUTOFREE(char *) daemon_name =3D NULL;
     bool sanity =3D true;
     bool verify =3D true;
 #ifndef WIN32
     bool tty =3D true;
 #endif
+    int mode;
+
+    if (inside_daemon && !conn->uri->server) {
+        mode =3D REMOTE_DRIVER_MODE_DIRECT;
+    } else {
+        mode =3D REMOTE_DRIVER_MODE_AUTO;
+    }
=20
     /* We handle *ALL* URIs here. The caller has rejected any
      * URIs we don't care about */
@@ -905,7 +1041,7 @@ doRemoteOpen(virConnectPtr conn,
             EXTRACT_URI_ARG_STR("known_hosts", knownHosts);
             EXTRACT_URI_ARG_STR("known_hosts_verify", knownHostsVerify);
             EXTRACT_URI_ARG_STR("tls_priority", tls_priority);
-
+            EXTRACT_URI_ARG_STR("mode", mode_str);
             EXTRACT_URI_ARG_BOOL("no_sanity", sanity);
             EXTRACT_URI_ARG_BOOL("no_verify", verify);
 #ifndef WIN32
@@ -952,6 +1088,21 @@ doRemoteOpen(virConnectPtr conn,
             goto failed;
     }
=20
+    if (conf && !mode_str &&
+        virConfGetValueString(conf, "remote_mode", &mode_str) < 0)
+        goto failed;
+
+    if (mode_str &&
+        (mode =3D remoteDriverModeTypeFromString(mode_str)) < 0)
+        goto failed;
+
+    /* Sanity check that nothing requested !direct mode by mistake */
+    if (inside_daemon && !conn->uri->server && mode !=3D REMOTE_DRIVER_MOD=
E_DIRECT) {
+        virReportError(VIR_ERR_INVALID_ARG, "%s",
+                       _("Connections from inside daemon must be direct"));
+        return VIR_DRV_OPEN_ERROR;
+    }
+
     VIR_DEBUG("proceeding with name =3D %s", name);
=20
     /* For ext transport, command is required. */
@@ -969,7 +1120,8 @@ doRemoteOpen(virConnectPtr conn,
     case REMOTE_DRIVER_TRANSPORT_LIBSSH:
     case REMOTE_DRIVER_TRANSPORT_LIBSSH2:
         if (!sockname &&
-            !(sockname =3D remoteGetUNIXSocket(transport, flags)))
+            !(sockname =3D remoteGetUNIXSocket(transport, mode, driver_str,
+                                             &daemon_name, flags)))
             goto failed;
         break;
=20
@@ -1070,13 +1222,15 @@ doRemoteOpen(virConnectPtr conn,
=20
 #ifndef WIN32
     case REMOTE_DRIVER_TRANSPORT_UNIX:
-        if ((flags & VIR_DRV_OPEN_REMOTE_AUTOSTART) &&
-            !(daemonPath =3D virFileFindResourceFull("libvirtd",
-                                                   NULL, NULL,
-                                                   abs_top_builddir "/src",
-                                                   SBINDIR,
-                                                   "LIBVIRTD_PATH")))
-            goto failed;
+        if (flags & VIR_DRV_OPEN_REMOTE_AUTOSTART) {
+            const char *env_name =3D remoteGetDaemonPathEnv();
+            if (!(daemonPath =3D virFileFindResourceFull(daemon_name,
+                                                       NULL, NULL,
+                                                       abs_top_builddir "/=
src",
+                                                       SBINDIR,
+                                                       env_name)))
+                goto failed;
+        }
=20
         if (!(priv->client =3D virNetClientNewUNIX(sockname,
                                                  flags & VIR_DRV_OPEN_REMO=
TE_AUTOSTART,
@@ -1192,7 +1346,7 @@ doRemoteOpen(virConnectPtr conn,
     {
         remote_connect_open_args args =3D { &name, flags };
=20
-        VIR_DEBUG("Trying to open URI %s", name);
+        VIR_DEBUG("Trying to open URI '%s'", name);
         if (call(conn, priv, 0, REMOTE_PROC_CONNECT_OPEN,
                  (xdrproc_t) xdr_remote_connect_open_args, (char *) &args,
                  (xdrproc_t) xdr_void, (char *) NULL) =3D=3D -1)
@@ -1294,9 +1448,20 @@ remoteConnectOpen(virConnectPtr conn,
         remoteSplitURIScheme(conn->uri, &driver, &transport) < 0)
         goto cleanup;
=20
-    if (inside_daemon && (!conn->uri || !conn->uri->server)) {
-        ret =3D VIR_DRV_OPEN_DECLINED;
-        goto cleanup;
+    if (inside_daemon) {
+        if (!conn->uri) {
+            ret =3D VIR_DRV_OPEN_DECLINED;
+            goto cleanup;
+        }
+
+        /* If there's a driver registered we must defer to that.
+         * If there isn't a driver, we must connect in "direct"
+         * mode - see doRemoteOpen */
+        if (!conn->uri->server &&
+            virHasDriverForURIScheme(driver)) {
+            ret =3D VIR_DRV_OPEN_DECLINED;
+            goto cleanup;
+        }
     }
=20
     if (!(priv =3D remoteAllocPrivateData()))
diff --git a/src/remote/remote_driver.h b/src/remote/remote_driver.h
index 132e478ef3..1fab5a6cc4 100644
--- a/src/remote/remote_driver.h
+++ b/src/remote/remote_driver.h
@@ -31,9 +31,6 @@ unsigned long remoteVersion(void);
 #define LIBVIRTD_LISTEN_ADDR NULL
 #define LIBVIRTD_TLS_PORT "16514"
 #define LIBVIRTD_TCP_PORT "16509"
-#define LIBVIRTD_PRIV_UNIX_SOCKET LOCALSTATEDIR "/run/libvirt/libvirt-sock"
-#define LIBVIRTD_PRIV_UNIX_SOCKET_RO LOCALSTATEDIR "/run/libvirt/libvirt-s=
ock-ro"
-#define LIBVIRTD_USER_UNIX_SOCKET "libvirt-sock"
=20
 /* Defaults for PKI directory. */
 #define LIBVIRT_PKI_DIR SYSCONFDIR "/pki"
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list