From nobody Tue May  7 11:08:10 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=1563897808; cv=none;
	d=zoho.com; s=zohoarc;
	b=LMO9uKv3cZYqS9a04xLRUMRBxjDn3j563GAyUy3Uzh3BT1cs48u/DVFbSemlDP5PHe8QqffwvivPox+JYVHEgERjPMexEd4J5OEaJGBTuhhdAeyj9v8rBET+g9qxWywCacPn40DBDeS+yGfBmuXsSkLmQjZ2haHQsp9YNNVkMx4=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897808;
 h=Content-Type:Content-Transfer-Encoding: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=qz/II44e55VWreEeL31SB1f5GNYRDXDZvnFK438fXRg=;
	b=SbS0S7/8mL//qoGQNu6ES+gA5yBMS/ETMJssQPY764Mqxgj0E2tsvixbb0UpbKOH+j6SzHGzEfQVK3M6SmnbHR/fci5ZOZQeElhragtx8gKR7dTLLUQwSF2P43m3hPUTW/of6DpiV/m6Uc8qzHvdKj422cDxDKgB+J9qBtxasjg=
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 1563897808968238.49357377657918;
 Tue, 23 Jul 2019 09:03:28 -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 A3D5230860A7;
	Tue, 23 Jul 2019 16:03: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 7EA3D60BEC;
	Tue, 23 Jul 2019 16:03: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 B1D2018045CE;
	Tue, 23 Jul 2019 16:03:26 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG3PZ3024487 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:03:25 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 694985C234; Tue, 23 Jul 2019 16:03:25 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 9CCE45C25A;
	Tue, 23 Jul 2019 16:03:24 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:02:39 +0100
Message-Id: <20190723160319.18153-2-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 01/41] 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.44]);
 Tue, 23 Jul 2019 16:03:28 +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.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@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 Tue May  7 11:08:10 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=1563897811; cv=none;
	d=zoho.com; s=zohoarc;
	b=kIhcNMPMRVyNKzh4AFpy5Ip9YtkUWQyDLgzs7VK5knJKKlqaQgnJ0otcDj0q5zRX33dy8vtmB1mUteLilPneU7RD5PqOYXpu1KdrtEwfjsT5zBK5bZMKdWCsAdPcTP8RQp7S5eHtN189LqIjS64ySuHDE7EZ2d4zXmDsUclmjFc=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897811;
 h=Content-Type:Content-Transfer-Encoding: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=49o+22Z1Ef+9S+qYLV5lT2FoHeRlurGdMTgGUms+fu8=;
	b=UszYuZkSr4E8+apTa7Wa6EVT/Jv486id1VwAO/aIF++FS0NdLX+a2DW46eD14SkZPJqYeLsMU+X4aRVz+mRMNlIiknoYiCdz+6VnJhZihuG/lttWJUpHuZZW+hBdLOdwlId0H6ahl3BRFF8485tlyvv6PeTQQ2+G0APWLPCkvVs=
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 1563897811262532.8465845777913;
 Tue, 23 Jul 2019 09:03:31 -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 E7BB03001808;
	Tue, 23 Jul 2019 16:03: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 B26F2101E670;
	Tue, 23 Jul 2019 16:03:29 +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 5F2B21800206;
	Tue, 23 Jul 2019 16:03:29 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG3QMD024494 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:03:26 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id D9B195C25A; Tue, 23 Jul 2019 16:03:26 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id B9FA55C22D;
	Tue, 23 Jul 2019 16:03:25 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:02:40 +0100
Message-Id: <20190723160319.18153-3-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 02/41] 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.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]);
 Tue, 23 Jul 2019 16:03:30 +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.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                  |  8 +++++---
 src/bhyve/Makefile.inc.am   |  9 +++++----
 src/libxl/Makefile.inc.am   | 10 +++++-----
 src/locking/Makefile.inc.am | 34 ++++++++++++++++------------------
 src/logging/Makefile.inc.am | 11 ++++++-----
 src/lxc/Makefile.inc.am     | 10 +++++-----
 src/qemu/Makefile.inc.am    | 10 +++++-----
 src/remote/Makefile.inc.am  | 10 +++++-----
 8 files changed, 52 insertions(+), 50 deletions(-)

diff --git a/.gitignore b/.gitignore
index 727bfdb6ec..d75b24c743 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,9 @@
 /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/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..d9cc64a827 100644
--- a/src/bhyve/Makefile.inc.am
+++ b/src/bhyve/Makefile.inc.am
@@ -49,17 +49,18 @@ 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
+CLEANFILES +=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 abc65ede2c..1abdeff390 100644
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -67,18 +67,18 @@ 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
-CLEANFILES +=3D test_libvirtd_libxl.aug
+augeastest_DATA +=3D libxl/test_libvirtd_libxl.aug
+CLEANFILES +=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 c44f74a529..8041ae89b8 100644
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -114,8 +114,8 @@ lockd_la_CFLAGS +=3D \
 endif WITH_SASL
=20
 if WITH_QEMU
-augeastest_DATA +=3D test_libvirt_lockd.aug
-CLEANFILES +=3D test_libvirt_lockd.aug
+augeastest_DATA +=3D locking/test_libvirt_lockd.aug
+CLEANFILES +=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
@@ -170,8 +170,8 @@ 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
-CLEANFILES +=3D test_libvirt_sanlock.aug
+augeastest_DATA +=3D locking/test_libvirt_sanlock.aug
+CLEANFILES +=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
@@ -203,8 +203,8 @@ 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
+CLEANFILES +=3D locking/test_virtlockd.aug
=20
 INSTALL_DATA_DIRS +=3D locking
=20
@@ -226,13 +226,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:
@@ -242,29 +242,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 8527890eb0..7e8391b3cc 100644
--- a/src/logging/Makefile.inc.am
+++ b/src/logging/Makefile.inc.am
@@ -46,7 +46,7 @@ MAINTAINERCLEANFILES +=3D \
 	$(LOG_DAEMON_GENERATED) \
 	$(NULL)
=20
-CLEANFILES +=3D test_virtlogd.aug
+CLEANFILES +=3D logging/test_virtlogd.aug
=20
 PODFILES +=3D logging/virtlogd.pod
 MANINFILES +=3D virtlogd.8.in
@@ -97,17 +97,18 @@ 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
+CLEANFILES +=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 1c0b715a2f..b7f539b878 100644
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -156,18 +156,18 @@ endif
 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
+augeastest_DATA +=3D lxc/test_libvirtd_lxc.aug
+CLEANFILES +=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 e8c7d4b5b1..464bbfe735 100644
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -115,18 +115,18 @@ 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
-CLEANFILES +=3D test_libvirtd_qemu.aug
+augeastest_DATA +=3D qemu/test_libvirtd_qemu.aug
+CLEANFILES +=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 4f706f9743..4a1d89ee17 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -126,11 +126,11 @@ 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
-CLEANFILES +=3D test_libvirtd.aug
+CLEANFILES +=3D remote/test_libvirtd.aug
=20
 man8_MANS +=3D libvirtd.8
=20
@@ -188,13 +188,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 Tue May  7 11:08:10 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=1563897819; cv=none;
	d=zoho.com; s=zohoarc;
	b=Toc0NfLp/reMK8E6BJWBbA8iGnTdI2ExWi+UFIeEwG+MT4Gd1XMsR+KaQXl4kT6IEjwLA0kTme4m85A4r+cvZ96vsA2Q129UcWzTDf1Q44TYYLOFll/MO5YtDwrzXzTfu2NsRYX0G2LIsiLr1TzDzC30QwH7RJ9DPjn76b2mAzE=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897819;
 h=Content-Type:Content-Transfer-Encoding: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=MqKgIkksk0LzOU3qBxh21j4o1+QDu3BY3AEB0G+nKSs=;
	b=VuAVdjeL3VoZeIuA2Ry+oSjYht5+4m7aaU5PfwaMKKz26lgMMyqxsLDyDmwLDLjcH76GTyoA1dt3PhsA6WrZHx/BPv1c8cZMOKYdhAtzv6m9XZGzReRoc5+X9IeuLsG/obwVg2kCCxnVzi1EzV9ASuSXGl5Mp6i3fbsf2oU9Gvg=
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 1563897819751873.1225131905338;
 Tue, 23 Jul 2019 09:03:39 -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 196153C92B;
	Tue, 23 Jul 2019 16:03:38 +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 E19786062D;
	Tue, 23 Jul 2019 16:03: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 A2D2E18045D0;
	Tue, 23 Jul 2019 16:03:37 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG3U2i024514 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:03:30 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 833015C25A; Tue, 23 Jul 2019 16:03:30 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 92AD35C234;
	Tue, 23 Jul 2019 16:03:27 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:02:41 +0100
Message-Id: <20190723160319.18153-4-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 03/41] 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-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.39]);
 Tue, 23 Jul 2019 16:03:39 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

We already have a variable that lists all augeas test files, so we can
add everything to CLEANFILES at once.
---
 src/Makefile.am             | 1 +
 src/bhyve/Makefile.inc.am   | 1 -
 src/libxl/Makefile.inc.am   | 1 -
 src/locking/Makefile.inc.am | 5 +----
 src/logging/Makefile.inc.am | 3 ---
 src/lxc/Makefile.inc.am     | 1 -
 src/qemu/Makefile.inc.am    | 1 -
 src/remote/Makefile.inc.am  | 2 --
 8 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 0b562dc250..58f0c792ed 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/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am
index d9cc64a827..0aef5e17c7 100644
--- a/src/bhyve/Makefile.inc.am
+++ b/src/bhyve/Makefile.inc.am
@@ -50,7 +50,6 @@ libvirt_driver_bhyve_impl_la_SOURCES =3D $(BHYVE_DRIVER_S=
OURCES)
 conf_DATA +=3D bhyve/bhyve.conf
 augeas_DATA +=3D bhyve/libvirtd_bhyve.aug
 augeastest_DATA +=3D bhyve/test_libvirtd_bhyve.aug
-CLEANFILES +=3D bhyve/test_libvirtd_bhyve.aug
=20
 AUGEAS_DIRS +=3D bhyve
=20
diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index 1abdeff390..e73f34db8e 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 libxl/test_libvirtd_libxl.aug
-CLEANFILES +=3D libxl/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 8041ae89b8..0f284faf25 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 locking/test_libvirt_lockd.aug
-CLEANFILES +=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
@@ -171,7 +170,6 @@ augeas_DATA +=3D locking/libvirt_sanlock.aug
=20
 if WITH_QEMU
 augeastest_DATA +=3D locking/test_libvirt_sanlock.aug
-CLEANFILES +=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
@@ -204,7 +202,6 @@ conf_DATA +=3D locking/virtlockd.conf
=20
 augeas_DATA +=3D locking/virtlockd.aug
 augeastest_DATA +=3D locking/test_virtlockd.aug
-CLEANFILES +=3D locking/test_virtlockd.aug
=20
 INSTALL_DATA_DIRS +=3D locking
=20
diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am
index 7e8391b3cc..58a139ec2f 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 logging/test_virtlogd.aug
-
 PODFILES +=3D logging/virtlogd.pod
 MANINFILES +=3D virtlogd.8.in
 SYSCONF_FILES +=3D logging/virtlogd.sysconf
@@ -98,7 +96,6 @@ conf_DATA +=3D logging/virtlogd.conf
=20
 augeas_DATA +=3D logging/virtlogd.aug
 augeastest_DATA +=3D logging/test_virtlogd.aug
-CLEANFILES +=3D logging/test_virtlogd.aug
=20
 logging/test_virtlogd.aug: logging/test_virtlogd.aug.in \
 		logging/virtlogd.conf $(AUG_GENTEST)
diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index b7f539b878..f011d90e95 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 lxc/test_libvirtd_lxc.aug
-CLEANFILES +=3D lxc/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 464bbfe735..750b8a5c85 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 qemu/test_libvirtd_qemu.aug
-CLEANFILES +=3D qemu/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 4a1d89ee17..18519b129d 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -130,8 +130,6 @@ augeastest_DATA +=3D remote/test_libvirtd.aug
=20
 conf_DATA +=3D remote/libvirtd.conf
=20
-CLEANFILES +=3D remote/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 Tue May  7 11:08:10 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=1563897818; cv=none;
	d=zoho.com; s=zohoarc;
	b=UnCAbpTXatmnxFDZc0paHc3lC2QHjjELAypp9dcYsSAwT04VRa0rqy/zCbS0Wutp23N2gEyaj0qaKgvEJkIsbVo2Wz72nQTPcqZFpzX2E1QxXkCOXVXedQEbzwZnxwcVPsZ8Dae8i6FQLj7KaQSt0c76jD/TLuEeTVx6Cqn1Olk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897818;
 h=Content-Type:Content-Transfer-Encoding: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=Cpwg3+3w1XUt0w2IDNLAFqiFdXjPlu/JFhLnnjJzc+o=;
	b=loW+zMsok8eq0iC12usVBgOFhZuAmZAEaH4VaiLXlFr5xyMCURbYj1/YfPFkgahYD2RRPnB5kWp0iGSo0OlHXOc7vGX9G0e+RjWv7r1bBXWijngmorVm77/Ab78DaI0ESPm8H71Wgt7u33ERldfWpvz0riefTHrbU3FYq+cxoDs=
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 1563897818573678.8309124461442;
 Tue, 23 Jul 2019 09:03:38 -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 EA89EA3B7E;
	Tue, 23 Jul 2019 16:03:36 +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 B75456062D;
	Tue, 23 Jul 2019 16:03: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 7C7E919731;
	Tue, 23 Jul 2019 16:03:36 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG3Vcm024524 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:03:31 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id BD3565C234; Tue, 23 Jul 2019 16:03:31 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id E13365C25A;
	Tue, 23 Jul 2019 16:03:30 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:02:42 +0100
Message-Id: <20190723160319.18153-5-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 04/41] 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.13
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]);
 Tue, 23 Jul 2019 16:03:37 +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.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/Makefile.am             | 14 +++++++++-----
 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, 11 insertions(+), 92 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 58f0c792ed..cf6f920576 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
@@ -396,13 +395,18 @@ GENERATED_SYM_FILES +=3D \
=20
=20
=20
-
-
-
+AUG_TEST_NAMES =3D $(subst /,-, $(augeastest_DATA))
=20
 check-local: check-augeas
=20
-check-augeas: $(AUGEAS_DIRS:%=3Dcheck-augeas-%)
+check-augeas: $(AUG_TEST_NAMES:%=3Dcheck-augeas-%)
+
+check-augeas-%: $(augeas_DATA) $(augeastest_DATA)
+	$(AM_V_GEN)export FILE=3D`echo $* | sed -e 's/.*-//'`; \
+	export DIR=3D`echo $* | sed -e 's/-.*//'`; \
+	if test -x '$(AUGPARSE)'; then \
+	    '$(AUGPARSE)' -I $(srcdir)/$$DIR -I $(builddir)/$$DIR $$DIR/$$FILE; \
+	fi
=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 Tue May  7 11:08:10 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=1563897824; cv=none;
	d=zoho.com; s=zohoarc;
	b=fQviUv+4FJMAyKD9acgiiHX5iHIS+pw5pT5TuIVbliOt9SZnPE66Gj8Q6G6lx3pvaO19OjlWUHcw4L+8Bq8CpMJ8hspTGmQyVb6yaqY4yZ3H7cKKwtz2HUgAXK6vx3iu7fll6LPIDlOUJHZby6FKPQi2gwOGDhUbLHyxzyPRoaA=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897824;
 h=Content-Type:Content-Transfer-Encoding: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=7RwBHqQfuEh6ZiZB0ooHYHtmoN7aVDcJHKAg3+TWH/s=;
	b=MFqdrlE4wAM6X2lYqfZ/771Bs9u8HJn/7UE8uH7c4P0/XRzK6zz0PhgTQKjyPkoFV3J+Yu4nRHPyCql7aZ8vy1bUR2296ZJA1jy1YBVLMAASNHlqbAp6ijFdnaClCuVLuF+zrAdybrilsm0MHmLmxkedVUHm+l+KLdRgzf0UftI=
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 1563897824572140.33876731287194;
 Tue, 23 Jul 2019 09:03: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 54267307D98A;
	Tue, 23 Jul 2019 16:03: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 306701001B12;
	Tue, 23 Jul 2019 16:03:43 +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 E1C7E18045D4;
	Tue, 23 Jul 2019 16:03:42 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG3fBd024539 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:03:41 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 371381F8; Tue, 23 Jul 2019 16:03:41 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 855F54A5;
	Tue, 23 Jul 2019 16:03:32 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:02:43 +0100
Message-Id: <20190723160319.18153-6-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 05/41] 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.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.48]);
 Tue, 23 Jul 2019 16:03:43 +0000 (UTC)

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

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@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 cf6f920576..dbbb94e7f1 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 Tue May  7 11:08:10 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=1563897832; cv=none;
	d=zoho.com; s=zohoarc;
	b=l5UQlZev1gTCoQJO7cdqkDf3jaOErpEie5XRMg+4lDeY7QUjonoPenQLDbL8+3/FRmKUnabaHe+wX+jPice6TEfEY6jXdPCK7GnkhhL3ayM06Kmobu46beSzZpqZq+LSvvKysJEYFKEPET4JHSKe+rGUEE73Jwkt77vQRshF0Ws=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897832;
 h=Content-Type:Content-Transfer-Encoding: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=g/4oZHoILUjSOKL1jtawjSEBLwMzdBjCrOFyiK9bKsI=;
	b=mqheNWfP52seTXrLiFAHdoasKY2Vwuje4gesZr9Y7uQokayTy4FmDNEXI9WDmyZw716MXn/fV+w73Tr17/qZ18bltA5ajq1FAaKsn7U/L2nVkIuqbZaciqlJSaaJmN9gXmN0DK/52z0ZWp8Mw+sNAaW9CydHI2btTnyUNJXTYtg=
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 1563897832411234.44951710259033;
 Tue, 23 Jul 2019 09:03: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 CE027A3B6F;
	Tue, 23 Jul 2019 16:03:50 +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 A4CCD19D7B;
	Tue, 23 Jul 2019 16:03: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 658841800209;
	Tue, 23 Jul 2019 16:03:50 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG3nHG024566 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:03:49 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 7F70E5C25A; Tue, 23 Jul 2019 16:03:49 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 7AC575C54A;
	Tue, 23 Jul 2019 16:03:41 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:02:44 +0100
Message-Id: <20190723160319.18153-7-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 06/41] 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.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.30]);
 Tue, 23 Jul 2019 16:03:51 +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.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/remote_daemon.c | 126 ++++++++++++++++++-------------------
 1 file changed, 62 insertions(+), 64 deletions(-)

diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index d887b7abfb..49ac3f0ae5 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -863,71 +863,69 @@ daemonSetupHostUUID(const struct daemonConfig *config)
 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;
+    struct virOptionHelp {
+        const char *opts;
+        const char *help;
+    } 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, N_(opthelp[i].hel=
p));
+    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 =
by -f)"));
+    fprintf(stderr, "      %s/libvirt/libvirtd.conf\n",
+            privileged ? SYSCONFDIR : "$XDG_CONFIG_HOME");
+    fprintf(stderr, "\n");
+
+    fprintf(stderr, "    %s:\n", _("Sockets"));
+    fprintf(stderr, "      %s\n",
+            privileged ? LOCALSTATEDIR "/run/libvirt/libvirt-sock" :
+            "$XDG_RUNTIME_DIR/libvirt/libvirt-sock");
+    if (privileged)
+        fprintf(stderr, "      %s\n",
+                LOCALSTATEDIR "/run/libvirt/libvirt-sock-ro");
+    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) {
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Tue May  7 11:08:10 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=1563897838; cv=none;
	d=zoho.com; s=zohoarc;
	b=AGAFdIohmZ1gIJKw377TzLkwGpu3zCAOxC8nGfhl3xkA2k7r672qLFTU6lsxAxFNgYYB8b+dPY5Ez1BfqXFxFbjGxHAWgMT7KysOBksSWM3VcMTOuzok/eO0a51NCVhYHtbL1Tw8fS3hTN40s01UUTka+vMYgMd6YjeGVLEK9Ss=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897838;
 h=Content-Type:Content-Transfer-Encoding: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=XotT3HTN72Ssgf9mkqNvAoYUjINSnO+iwqzAfaTyVKE=;
	b=PjnkLQLlArFe9wU9jnM4bT4gpp1IVMQsx/x4YJ3HW33UI0zSf043CxhWHl5+SE8XEZeUgBr8H+JG00h9jKHY6jwVrTP9mYcqrUlE5grs8YPj+KPDCYaiwnd86+sUQkmD+8F37M+RPhfGROa0TzPp5lC1xWn/I7+BQdBHpbUVatE=
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 156389783862049.75348743463485;
 Tue, 23 Jul 2019 09:03: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 159098E237;
	Tue, 23 Jul 2019 16:03:57 +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 DF36C600D1;
	Tue, 23 Jul 2019 16:03: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 9E46A1972D;
	Tue, 23 Jul 2019 16:03:56 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG3tT4024622 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:03:55 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id B24955C25A; Tue, 23 Jul 2019 16:03:55 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id E2A3B5C234;
	Tue, 23 Jul 2019 16:03:49 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:02:45 +0100
Message-Id: <20190723160319.18153-8-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 07/41] remote: conditionalize socket names 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.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]);
 Tue, 23 Jul 2019 16:03:57 +0000 (UTC)

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

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/Makefile.inc.am |  1 +
 src/remote/remote_daemon.c | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

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 49ac3f0ae5..056ae2ba91 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -221,19 +221,19 @@ 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/" SOCK_PREFIX "-sock", 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/" SOCK_PREFIX "-sock-ro", conf=
ig->unix_sock_dir) < 0 ||
+                virAsprintf(admsockfile, "%s/" SOCK_PREFIX "-admin-sock", =
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 (VIR_STRDUP(*sockfile, LOCALSTATEDIR "/run/libvirt/" SOCK_P=
REFIX "-sock") < 0 ||
+                VIR_STRDUP(*rosockfile, LOCALSTATEDIR "/run/libvirt/" SOCK=
_PREFIX "-sock-ro") < 0 ||
+                VIR_STRDUP(*admsockfile, LOCALSTATEDIR "/run/libvirt/" SOC=
K_PREFIX "-admin-sock") < 0)
                 goto cleanup;
         } else {
             mode_t old_umask;
@@ -248,8 +248,8 @@ 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/" SOCK_PREFIX "-sock", rundir) <=
 0 ||
+                virAsprintf(admsockfile, "%s/" SOCK_PREFIX "-admin-sock", =
rundir) < 0)
                 goto cleanup;
         }
     }
@@ -900,12 +900,12 @@ daemonUsage(const char *argv0, bool privileged)
     fprintf(stderr, "\n");
=20
     fprintf(stderr, "    %s:\n", _("Sockets"));
-    fprintf(stderr, "      %s\n",
-            privileged ? LOCALSTATEDIR "/run/libvirt/libvirt-sock" :
-            "$XDG_RUNTIME_DIR/libvirt/libvirt-sock");
+    fprintf(stderr, "      %s/libvirt/" SOCK_PREFIX "-sock\n",
+            privileged ? LOCALSTATEDIR "/run" :
+            "$XDG_RUNTIME_DIR");
     if (privileged)
         fprintf(stderr, "      %s\n",
-                LOCALSTATEDIR "/run/libvirt/libvirt-sock-ro");
+                LOCALSTATEDIR "/run/libvirt/" SOCK_PREFIX "-sock-ro");
     fprintf(stderr, "\n");
=20
     fprintf(stderr, "    %s:\n", _("TLS"));
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Tue May  7 11:08:10 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=1563897841; cv=none;
	d=zoho.com; s=zohoarc;
	b=e3DpgV21IO4naNfq8oQyJ4I1j7vLUZDyCu6y9krc6Czk1VGpMG6HorM4tff5mijj/2VlljOh6rH8SRgrirnTnKZycb4DPSMhTDIQqZh1fqUNE+1NVXqgUekcm7FspKyrGmn9Oae0gnsNrzT3jAXVo/fiX51jzibfiBq+ovPIMSk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897841;
 h=Content-Type:Content-Transfer-Encoding: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=WYxEFnP/N9DLprP08AN5hf+aCB2LY/e7B1ZXagUvWSI=;
	b=JBHAGQborer+xQh22sgWE/ZbZIP7DtuvSR6O32Yv45Mz4D7p0h2Mneu/TmHa04WA8G6oOeZDJ8LHAqRS58TZFGWZvV3YV2kCysvZDTw0RJftXMhwls9yQx7eECRziFI/r4xgLpD0Q+p21RUTAvEhJH2Xvp77i4SMhfMGvY3gTiI=
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 1563897841239148.87276959892267;
 Tue, 23 Jul 2019 09:04: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 67AAB30C0DCF;
	Tue, 23 Jul 2019 16:03: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 3AC5F5D6A9;
	Tue, 23 Jul 2019 16:03: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 E8036180020C;
	Tue, 23 Jul 2019 16:03:58 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG3v18024647 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:03:57 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 664305C234; Tue, 23 Jul 2019 16:03:57 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 128435C28C;
	Tue, 23 Jul 2019 16:03:55 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:02:46 +0100
Message-Id: <20190723160319.18153-9-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 08/41] 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.15
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]);
 Tue, 23 Jul 2019 16:04:00 +0000 (UTC)

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

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/Makefile.inc.am        |  1 +
 src/remote/remote_daemon.c        | 48 +++++++++++++++++--------------
 src/remote/remote_daemon_config.c |  5 ++--
 src/remote/remote_driver.h        |  1 -
 4 files changed, 30 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 056ae2ba91..0982e281de 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;
@@ -375,11 +379,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)
@@ -413,7 +417,7 @@ daemonSetupNetworking(virNetServerPtr srv,
=20
     if (virNetServerAddServiceUNIX(srv,
                                    act,
-                                   "libvirtd.socket",
+                                   DAEMON_NAME ".socket",
                                    sock_path,
                                    unix_sock_rw_mask,
                                    unix_sock_gid,
@@ -426,7 +430,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,
@@ -440,7 +444,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,
@@ -454,7 +458,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,
@@ -511,7 +515,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,
@@ -556,7 +560,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.
  */
@@ -569,7 +573,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
@@ -597,7 +601,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)
@@ -709,7 +713,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
@@ -788,7 +792,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();
@@ -895,7 +899,7 @@ daemonUsage(const char *argv0, bool privileged)
     fprintf(stderr, "\n");
=20
     fprintf(stderr, "    %s:\n", _("Configuration file (unless overridden =
by -f)"));
-    fprintf(stderr, "      %s/libvirt/libvirtd.conf\n",
+    fprintf(stderr, "      %s/libvirt/" DAEMON_NAME ".conf\n",
             privileged ? SYSCONFDIR : "$XDG_CONFIG_HOME");
     fprintf(stderr, "\n");
=20
@@ -922,9 +926,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/\n",
+            privileged ? LOCALSTATEDIR "/run/" DAEMON_NAME ".pid":
+            "$XDG_RUNTIME_DIR/libvirt/" DAEMON_NAME ".pid");
     fprintf(stderr, "\n");
 }
=20
@@ -1088,7 +1092,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);
@@ -1168,7 +1172,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;
         }
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 Tue May  7 11:08:10 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=1563897844; cv=none;
	d=zoho.com; s=zohoarc;
	b=TNF7+w3Hhz/FJwdUxSt5ecaY57Mb7dDvG7/HWAl3RY89kgVGnSWFcd3ib66SXspYV9dfjOSbISqE6/79jH+T/xPcFouyouQni0jMFqhF+45WFTW897MeyW7Lj5Or4M0GMFYOPjwb3Sv+0jhRH0ZhwutyUR24zR4F4mlt8NK+A7E=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897844;
 h=Content-Type:Content-Transfer-Encoding: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=88Tqrrk0ZmDiIVrKxT6c5ZCWbenbJjtaaP1loROKhdA=;
	b=RMjZUhp4vW3IKsqcuQu0VAeXVv62Qccma7ZWuEJ3oF9HYqYUCUWBhBlotSxeXeX2F887Gahcjxn47f7Pj0h7X7O97GjuguE4MlnjCsvQKc4RN1Xfhra1RyUT5JMszGJePMSSq4J+jMXqX1d7M70tcY+5j5+88hW0w/vNprG7+Ls=
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 1563897844455459.58767640888345;
 Tue, 23 Jul 2019 09:04: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 5A19430C62A2;
	Tue, 23 Jul 2019 16:04:03 +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 35B995D973;
	Tue, 23 Jul 2019 16:04: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 E730118045DC;
	Tue, 23 Jul 2019 16:04:02 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG41IO024667 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:04:01 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id C574A5C69A; Tue, 23 Jul 2019 16:04:01 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id CC8E25C54A;
	Tue, 23 Jul 2019 16:03:57 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:02:47 +0100
Message-Id: <20190723160319.18153-10-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 09/41] 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.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]);
 Tue, 23 Jul 2019 16:04:03 +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.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/remote_daemon.c | 51 +++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index 0982e281de..2abeb08e16 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -303,6 +303,10 @@ static int daemonErrorLogFilter(virErrorPtr err, int p=
riority)
=20
 static int daemonInitialize(void)
 {
+#ifdef MODULE_NAME
+    if (virDriverLoadModule(MODULE_NAME, MODULE_NAME "Register", true) < 0)
+        return -1;
+#else
     /*
      * Note that the order is important: the first ones have a higher
      * priority when calling virStateInitialize. We must register the
@@ -310,53 +314,54 @@ static int daemonInitialize(void)
      * 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 Tue May  7 11:08:10 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=1563897848; cv=none;
	d=zoho.com; s=zohoarc;
	b=is+8duaUg/ljw+btlIu3x/V01L1B5Wh5m1D+SiOzZp7IODJZrxzzSdPRvK7ruprCIPsHdYzf2I9JCmelYS7NgJvn5/tdmxCiGOCb30QUYVYbF4WNImRrKvs2E/eJj5AaMkqqQDKOja6l45MIlNpHQRddPcAtFMJWQqChFuvQFY8=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897848;
 h=Content-Type:Content-Transfer-Encoding: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=Nx+v62k1nU3enUen3NyEnamEhxZRw2kyxXr+Fx3Q8H0=;
	b=QsE2vkPkxsKRJj4JnHwkFW+YLAhDmp7rGFUzhuc+b6AwkhTyj2DxgMeVqKZTe5yExloZbdSKa0yVVQcXoObokdWXFtYDCPtNFkYFaKrASnmRx6H6E8/MTQbDCq/pyKmCUP36iIgq5jC67dNPW4IzS/ZRktYASqpx+Qnk2dwvAVA=
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 1563897848556292.97146367603057;
 Tue, 23 Jul 2019 09:04:08 -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 CFB1B3092661;
	Tue, 23 Jul 2019 16:04: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 AA4A75D721;
	Tue, 23 Jul 2019 16:04: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 6CD1718045DF;
	Tue, 23 Jul 2019 16:04:06 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG4235024676 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:04:02 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id E501E5C54A; Tue, 23 Jul 2019 16:04:02 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 22DC95C234;
	Tue, 23 Jul 2019 16:04:01 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:02:48 +0100
Message-Id: <20190723160319.18153-11-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 10/41] 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.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]);
 Tue, 23 Jul 2019 16:04:07 +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.

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 |  9 ++++++-
 4 files changed, 68 insertions(+), 17 deletions(-)

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index b72186109a..2277bf49d2 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\"" \
+	-DENABLE_IP \
 	$(NULL)
=20
 libvirtd_LDFLAGS =3D \
diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index 2abeb08e16..45b52af987 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -371,11 +371,13 @@ static int ATTRIBUTE_NONNULL(3)
 daemonSetupNetworking(virNetServerPtr srv,
                       virNetServerPtr srvAdm,
                       struct daemonConfig *config,
+#ifdef ENABLE_IP
+                      bool ipsock,
+                      bool privileged,
+#endif /* ! ENABLE_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;
@@ -387,15 +389,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 ENABLE_IP
         { .name =3D DAEMON_NAME "-tcp.socket", .family =3D AF_INET },
         { .name =3D DAEMON_NAME "-tls.socket", .family =3D AF_INET },
+#endif /* ! ENABLE_IP */
     };
=20
+#ifdef ENABLE_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 /* ! ENABLE_IP */
=20
     if (virSystemdGetActivation(actmap, ARRAY_CARDINALITY(actmap), &act) <=
 0)
         return -1;
@@ -460,6 +466,7 @@ daemonSetupNetworking(virNetServerPtr srv,
                                    config->admin_max_client_requests) < 0)
         goto cleanup;
=20
+#ifdef ENABLE_IP
     if (((ipsock && config->listen_tcp) || act) &&
         virNetServerAddServiceTCP(srv,
                                   act,
@@ -534,6 +541,7 @@ daemonSetupNetworking(virNetServerPtr srv,
         }
         virObjectUnref(ctxt);
     }
+#endif /* ! ENABLE_IP */
=20
     if (act &&
         virSystemdActivationComplete(act) < 0)
@@ -880,7 +888,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 ENABLE_IP
         { "-l | --listen", N_("Listen for TCP/IP connections") },
+#endif /* ENABLE_IP */
         { "-t | --timeout <secs>", N_("Exit after timeout period") },
         { "-f | --config <file>", N_("Configuration file") },
         { "-V | --version", N_("Display version information") },
@@ -917,6 +927,7 @@ daemonUsage(const char *argv0, bool privileged)
                 LOCALSTATEDIR "/run/libvirt/" SOCK_PREFIX "-sock-ro");
     fprintf(stderr, "\n");
=20
+#ifdef ENABLE_IP
     fprintf(stderr, "    %s:\n", _("TLS"));
     fprintf(stderr, "      %s: %s\n",
             _("CA certificate"),
@@ -928,6 +939,7 @@ daemonUsage(const char *argv0, bool privileged)
             _("Server private key"),
             privileged ? LIBVIRT_SERVERKEY : "$HOME/.pki/libvirt/serverkey=
.pem");
     fprintf(stderr, "\n");
+#endif /* ENABLE_IP */
=20
     fprintf(stderr, "    %s:\n",
             _("PID file (unless overridden by -p)"));
@@ -954,7 +966,9 @@ int main(int argc, char **argv) {
     int timeout =3D -1;        /* -t: Shutdown timeout */
     int verbose =3D 0;
     int godaemon =3D 0;
+#ifdef ENABLE_IP
     int ipsock =3D 0;
+#endif /* ! ENABLE_IP */
     struct daemonConfig *config;
     bool privileged =3D geteuid() =3D=3D 0 ? true : false;
     bool implicit_conf =3D false;
@@ -964,7 +978,9 @@ int main(int argc, char **argv) {
     struct option opts[] =3D {
         { "verbose", no_argument, &verbose, 'v'},
         { "daemon", no_argument, &godaemon, 'd'},
+#ifdef ENABLE_IP
         { "listen", no_argument, &ipsock, 'l'},
+#endif /* ! ENABLE_IP */
         { "config", required_argument, NULL, 'f'},
         { "timeout", required_argument, NULL, 't'},
         { "pid-file", required_argument, NULL, 'p'},
@@ -988,7 +1004,13 @@ int main(int argc, char **argv) {
         int c;
         char *tmp;
=20
-        c =3D getopt_long(argc, argv, "ldf:p:t:vVh", opts, &optidx);
+        c =3D getopt_long(argc, argv,
+#ifdef ENABLE_IP
+                        "ldf:p:t:vVh",
+#else /* ! ENABLE_IP */
+                        "df:p:t:vVh",
+#endif /* ! ENABLE_IP */
+                        opts, &optidx);
=20
         if (c =3D=3D -1)
             break;
@@ -1003,9 +1025,11 @@ int main(int argc, char **argv) {
         case 'd':
             godaemon =3D 1;
             break;
+#ifdef ENABLE_IP
         case 'l':
             ipsock =3D 1;
             break;
+#endif /* ! ENABLE_IP */
=20
         case 't':
             if (virStrToLong_i(optarg, &tmp, 10, &timeout) !=3D 0
@@ -1319,10 +1343,13 @@ int main(int argc, char **argv) {
=20
     if (daemonSetupNetworking(srv, srvAdm,
                               config,
+#ifdef ENABLE_IP
+                              ipsock,
+                              privileged,
+#endif /* !ENABLE_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..3c5ccd5ba8 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 ENABLE_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 /* !ENABLE_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 ENABLE_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 /* ! ENABLE_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 ENABLE_IP
     VIR_FREE(data->listen_addr);
     VIR_FREE(data->tls_port);
     VIR_FREE(data->tcp_port);
+#endif /* ! ENABLE_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 ENABLE_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 /* ! ENABLE_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 ENABLE_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 /* !ENABLE_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 ENABLE_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 /* ! ENABLE_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 ENABLE_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 /* ! ENABLE_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..842ce98c60 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 ENABLE_IP
     bool listen_tls;
     bool listen_tcp;
     char *listen_addr;
     char *tls_port;
     char *tcp_port;
+#endif /* ! ENABLE_IP */
=20
     char *unix_sock_admin_perms;
     char *unix_sock_ro_perms;
@@ -41,21 +43,26 @@ struct daemonConfig {
=20
     int auth_unix_rw;
     int auth_unix_ro;
+#ifdef ENABLE_IP
     int auth_tcp;
     int auth_tls;
+#endif /* ! ENABLE_IP */
=20
     char **access_drivers;
=20
+#ifdef ENABLE_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 /* ! ENABLE_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 Tue May  7 11:08:10 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=1563897848; cv=none;
	d=zoho.com; s=zohoarc;
	b=j3ZXtthezEkAGW/QbIbLHsJlkIcDNBFz10TCY2wzi8gwslSp7ioYMloxTJIBUxvgy8dn/kP9HPIivgIzOyNomI0cdDuUUovAhtCYfQhOjDMEvGuRbS+1rAoKB/d0V2WrTxUvfX6T3Kcjo5faQSxZZ71sHtkvN45j8CJRB9OkIQE=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897848;
 h=Content-Type:Content-Transfer-Encoding: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=Sl1XeC1i973yVcsfJc5DedK3xmIr9y4zGDnVOlFmybA=;
	b=HjPXH/gpQDcJDs93vUos0Sq2ilH4ReQzswxl9ts86WkWnD9J+mAQXfZFtLjq10Die4JfOOGwmhZ3ZSrhji1j3w9HBBsLj00B5ZHcYGWjfJxk39lbkFeOulY+lT+RPRgpnKex2+UP8yW97XFt3ek0x2zrZ0tWTRcYwtYIVOWxK1s=
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 1563897848059382.1643657245736;
 Tue, 23 Jul 2019 09:04:08 -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 D99C881129;
	Tue, 23 Jul 2019 16:04:06 +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 B1D7D60497;
	Tue, 23 Jul 2019 16:04: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 7AAED19733;
	Tue, 23 Jul 2019 16:04:06 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG448j024683 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:04:04 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 2A8485C28C; Tue, 23 Jul 2019 16:04:04 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 4DFD15C234;
	Tue, 23 Jul 2019 16:04:03 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:02:49 +0100
Message-Id: <20190723160319.18153-12-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 11/41] 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.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]);
 Tue, 23 Jul 2019 16:04:07 +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.

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 d75b24c743..a09f45af50 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 2277bf49d2..15c100cc86 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..a6c2dd7467 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 thi=
s 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 thi=
s 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 :=
: ident:
+#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 ad6450a569..a4c7b4afe8 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 Tue May  7 11:08:10 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=1563897853; cv=none;
	d=zoho.com; s=zohoarc;
	b=LdcTbfcDTaSb7bH/YP87XcSe4tu25iAPNJQWmSxPGO+wmGfvGe1RYTm4PmtJD9HJYgGeGtoB3j0dFAUya9ReCyEEyWjfcKDpawSAvTDXms7Pj4lYX9ORtAOq5cKWsNI2pVWZPJszRkR7GnHh/BL7L2qvshaz6MxjV49UcxXjnS8=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897853;
 h=Content-Type:Content-Transfer-Encoding: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=i4qDRRVqbNCPkY1c8007yeom+uJNN6UodpNA6/p88+Q=;
	b=OhkMCrS/vVRhnQVtdMQSKicl3cCLySyaP0mPmSk8DAxyTEEHwcR3MQIr0FsD0KEdbYI4enAfVvyMm99bU5fu9nB7Pq53KJG5zblnRJTiFB4n83rM/5qSHuEVQ5iuMfjH35Z9MqPepY234JvVR/hdPii9vld3GyFjqwPOIBi+Huo=
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 156389785311094.15745818315588;
 Tue, 23 Jul 2019 09:04: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 3D47281DE0;
	Tue, 23 Jul 2019 16:04:11 +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 1401F60497;
	Tue, 23 Jul 2019 16:04:11 +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 C22EF19732;
	Tue, 23 Jul 2019 16:04:10 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG49Vt024714 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:04:09 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 28F325C882; Tue, 23 Jul 2019 16:04:09 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 6CCC95C25A;
	Tue, 23 Jul 2019 16:04:04 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:02:50 +0100
Message-Id: <20190723160319.18153-13-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 12/41] 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.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]);
 Tue, 23 Jul 2019 16:04:12 +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.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                                   |  1 +
 build-aux/augeas-gentest.pl                  |  2 +-
 src/remote/Makefile.inc.am                   | 20 +++++++++++++--
 src/remote/{libvirtd.aug =3D> libvirtd.aug.in} | 26 +++++++++++++-------
 src/remote/test_libvirtd.aug.in              | 14 ++++++++---
 5 files changed, 47 insertions(+), 16 deletions(-)
 rename src/remote/{libvirtd.aug =3D> libvirtd.aug.in} (89%)

diff --git a/.gitignore b/.gitignore
index a09f45af50..4463660c85 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/build-aux/augeas-gentest.pl b/build-aux/augeas-gentest.pl
index faf2fd593e..b94c1f2b7f 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 (/::\s*CONFIG\s*::/) {
         my $group =3D 0;
         print "  let conf =3D \"";
         while (<CONFIG>) {
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 15c100cc86..a11b2ff9b9 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,23 @@ 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..9410afb51c 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 a4c7b4afe8..ac3e0493b6 100644
--- a/src/remote/test_libvirtd.aug.in
+++ b/src/remote/test_libvirtd.aug.in
@@ -1,12 +1,14 @@
-module Test_libvirtd =3D
-   ::CONFIG::
+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 Tue May  7 11:08:10 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=1563897855; cv=none;
	d=zoho.com; s=zohoarc;
	b=FgqVWbL9OuLfC+zZX3FjrkeRkUlHzccsA9Ml5SI8/VcyYa7aVwYZu/rGXRGE7/pteTK6Jp8h5Vv2kxSAhCnW+F/I/NecuvMbkxUoafPKl4ZvY88AjSMBLdTnYK+fFkt2MrsgXoRna7M4qDuUI/bbck/zf5yq2Yw4mSoPF21lk5Y=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897855;
 h=Content-Type:Content-Transfer-Encoding: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=r+udJEgQrjGMkMymcEG88NPRlre58K/ImNvW7ROEtAo=;
	b=D9cBAVMSG0YC98HLNUuJk6QS8CXpWDwxufBI/KxnKg/+QObK4DnXBnZhQBPNJ4ZA7kFL1TDMyB6xrazTvEyBxVf3R3Z9mWnX0ZAWGKuphW/N2oqY34etZStSSWtUcu57gyWpyN0T+LJcJwkMc2/x7Rf8B2FuM6Go+OSbrL+IvYU=
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 1563897855192861.6457946110913;
 Tue, 23 Jul 2019 09:04:15 -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 9D9E98667D;
	Tue, 23 Jul 2019 16:04:13 +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 7213B1024813;
	Tue, 23 Jul 2019 16:04:13 +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 1BF0618045E1;
	Tue, 23 Jul 2019 16:04:13 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG4ASR024729 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:04:10 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 7EACC5C25A; Tue, 23 Jul 2019 16:04:10 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 9CE8A5C559;
	Tue, 23 Jul 2019 16:04:09 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:02:51 +0100
Message-Id: <20190723160319.18153-14-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 13/41] 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.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.26]);
 Tue, 23 Jul 2019 16:04:14 +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.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/Makefile.inc.am | 95 ++++++++++++++++++++------------------
 1 file changed, 51 insertions(+), 44 deletions(-)

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index a11b2ff9b9..e45c0a6ce7 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,50 @@ 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 \
+	$(LIBSOCKET) \
+	$(NULL)
=20
 LOGROTATE_FILES_IN +=3D \
 	remote/libvirtd.qemu.logrotate.in \
@@ -73,7 +114,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 +128,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,52 +178,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\"" \
 	-DENABLE_IP \
 	$(NULL)
=20
-libvirtd_LDFLAGS =3D \
-	$(RELRO_LDFLAGS) \
-	$(PIE_LDFLAGS) \
-	$(NO_INDIRECT_LDFLAGS) \
-	$(NO_UNDEFINED_LDFLAGS) \
-	$(NULL)
-
-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_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS)
=20
-libvirtd_LDADD +=3D \
-	../gnulib/lib/libgnu.la \
-	$(LIBSOCKET) \
-	$(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 Tue May  7 11:08:10 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=1563897858; cv=none;
	d=zoho.com; s=zohoarc;
	b=bIdw12Awka3884xJSgOPBVcct4F9FF0zf4m6D6rFRbB3lTw6v8udEEWZaksnEHwWbiMNz2PGAD9ujKfYuvTy4VGvyxqVMTGCtUHHB06VvS61ju2PcDi0QkOVq+XpvwPCnto1K0fiJTLHt5344gENcdpHPYuEjv8dvqD2iilanvw=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897858;
 h=Content-Type:Content-Transfer-Encoding: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=vyNi7Jq1Mp9XC5GJ3orOqcV96cSeEsAQHbcecG3H+DQ=;
	b=XLDYOUaqex1IbXatx6LZ6wOLp1m2k14hmRT/z+79Z72r5KPX9NERaCJ+vUCYfbJ6HSpakvH3XSyYTw/0eucJh39PQ4JRQrgKrA8fGPClL7MtjM5YrrgGiZaqszIe1wxO5sbw9SxzHztYgz1DFK2zQqugMfIKqll06Ojj9va8YhA=
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 1563897858680889.4221980466159;
 Tue, 23 Jul 2019 09:04:18 -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 56FAF8763B;
	Tue, 23 Jul 2019 16:04: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 255301024812;
	Tue, 23 Jul 2019 16:04: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 DC6E6180020D;
	Tue, 23 Jul 2019 16:04:16 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG4CWP024755 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:04:12 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id D40505C234; Tue, 23 Jul 2019 16:04:12 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id D6FAE5C25A;
	Tue, 23 Jul 2019 16:04:10 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:02:52 +0100
Message-Id: <20190723160319.18153-15-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 14/41] remote: don't hardcode /etc in the systemd
	units
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.26]);
 Tue, 23 Jul 2019 16:04:18 +0000 (UTC)

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/Makefile.inc.am          | 5 +++++
 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.service.in      | 2 +-
 src/remote/libvirtd.socket.in       | 2 +-
 7 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index e45c0a6ce7..7fd50a15df 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -301,30 +301,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.service.in b/src/remote/libvirtd.service.in
index 3ddf0e229b..20d6f84d27 100644
--- a/src/remote/libvirtd.service.in
+++ b/src/remote/libvirtd.service.in
@@ -20,7 +20,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
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Tue May  7 11:08:10 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=1563897863; cv=none;
	d=zoho.com; s=zohoarc;
	b=MK7xI83ixw8VINCotGFzklClF64db3xO0uQPX/7l0v2bqGzXEF0EskbNAYSK3oJFjByKhe7JECnJlTkkwoOh3FOTAsjT78fCnI6Xp5WK5fAg6P7wofhciXmwoExDKhcCTSHjmW8/jf+WTQab3XAXuTy7b10ApKrDlxLAZbVcEqE=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897863;
 h=Content-Type:Content-Transfer-Encoding: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=lftM1c/n/7o5BqP9I9PX0zgXNzifWEh1Y2JGcWOsIo0=;
	b=EO9fQcXFheZ30Ki5DCo88690FQPsAp2XdrMECVjAUx6G5B0B96evneO3sNe78fiTLCHaRxZkeUCE2CK3YpTnzpk1S+vC8UEB1Zq5PEj+TdSPwXBnlvpD36e6Z2kmIH7gsT7FCLCvVtLZlCtugQG3zj7PZwq+M3Kw6Ajbb2dj6FM=
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 1563897863869601.0775189698664;
 Tue, 23 Jul 2019 09:04:23 -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 0889CC065138;
	Tue, 23 Jul 2019 16:04:22 +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 D14591024815;
	Tue, 23 Jul 2019 16:04: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 8FF8E19735;
	Tue, 23 Jul 2019 16:04:21 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG4KFe024797 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:04:20 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 9B5DB1F8; Tue, 23 Jul 2019 16:04:20 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id BE0E15C8A3;
	Tue, 23 Jul 2019 16:04:13 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:02:53 +0100
Message-Id: <20190723160319.18153-16-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 15/41] 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.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.31]);
 Tue, 23 Jul 2019 16:04:23 +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.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/Makefile.am            |  6 +++++
 src/remote/Makefile.inc.am | 47 ++++++--------------------------------
 2 files changed, 13 insertions(+), 40 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index dbbb94e7f1..d254069e4b 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 7fd50a15df..6b09fc9294 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -290,48 +290,15 @@ INSTALL_DATA_LOCAL +=3D install-sasl
 UNINSTALL_LOCAL +=3D uninstall-sasl
 endif WITH_SASL
=20
-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_UNIT_VARS =3D \
+	$(COMMON_UNIT_VARS) \
+	$(NULL)
=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 $@
+libvirtd.service: remote/libvirtd.service.in $(top_builddir)/config.status
+	$(AM_V_GEN)sed $(LIBVIRTD_UNIT_VARS) < $< > $@-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 $@
+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 Tue May  7 11:08:10 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=1563897865; cv=none;
	d=zoho.com; s=zohoarc;
	b=QRZPkUWtY1t7sgPlBNMI3pwVl0m5+roDSyP/kruLfN8orvsQcG3ifqC7NkiAJZzM1eilYCVbHrJDu0CGUq5T9zdaC7vj4yzEfP99gkUPVMszga7SyeF/Xu9AD0Whv9DcISOVrLpDv5Ljl3MHO1FbQC2QAxDbNmednLF7K/KQerA=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897865;
 h=Content-Type:Content-Transfer-Encoding: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=S1MQeSq+exqvmfxgIJ3s6RJ5JcXVXe0eyNS19lYIHlA=;
	b=PdCmZLr+nIlnsDpdACa2AG3mAqEtFXs1IZDqNsA9vxmCiiRa57rECvrfTUBcU5tgYQ8GrVoqQglOgbWKqjG0d+JPA3O3i8kTE69cclHy1hXMaDtGuAd06koBdrB+vJ+I11dj2iR8RqXhJqD+jK7k9h7n7HC+Oe/Wh3xQ6tE9E78=
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 1563897865643331.24957830273956;
 Tue, 23 Jul 2019 09:04:25 -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 F3872A3B4E;
	Tue, 23 Jul 2019 16:04: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 CD04E60C66;
	Tue, 23 Jul 2019 16:04:23 +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 8FD7D1801215;
	Tue, 23 Jul 2019 16:04:23 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG4Lxu024809 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:04:21 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id D97555C69A; Tue, 23 Jul 2019 16:04:21 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 12C065C8A3;
	Tue, 23 Jul 2019 16:04:20 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:02:54 +0100
Message-Id: <20190723160319.18153-17-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 16/41] 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.12
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]);
 Tue, 23 Jul 2019 16:04:25 +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.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/Makefile.inc.am          |  3 +++
 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, 39 insertions(+), 31 deletions(-)

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 6b09fc9294..c56f9230f2 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -292,6 +292,9 @@ 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' \
 	$(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 Tue May  7 11:08:10 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=1563897868; cv=none;
	d=zoho.com; s=zohoarc;
	b=C4M+7P3vlHLZmob+TYhmiysCo3yZOpR2MZF/kjrj6mT/C/Dns7LXU2mhMar30PEZdLf9T+ToG6CaxObUk7hqYkrHNB2p+WjaDB7gbIlSjg3FEOdT0dqYl7PCVIn9oD02fMy4B9+BSEa0dOfHhbhL8f9JwxH1PUGpk/SddQxIgIw=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897868;
 h=Content-Type:Content-Transfer-Encoding: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=ga3kTab4cdVun98N2XlPlC6PtKVknHYItdxBAUCuKRE=;
	b=YJ91jCFeqBWLNOyCbvHpaw7gPjNUBOZN9NH6pXDXqXWJbhTA+Ok3sO8WMGWxXxq+S4oOlOwY5sfwgXlDkGZWuDmOkT3vXBOo/jVXJBWgxJXKkV5rvl62cibeh5U7kewD9cdjxXlEPEj2HYtrxxBxewRhe+2ZBdWKBvF5zCevK+k=
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 1563897868771217.83670331314772;
 Tue, 23 Jul 2019 09:04:28 -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 62586C06513F;
	Tue, 23 Jul 2019 16:04:27 +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 3C30117C52;
	Tue, 23 Jul 2019 16:04: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 012DC19737;
	Tue, 23 Jul 2019 16:04:27 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG4Ng9024828 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:04:23 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 529B55C28C; Tue, 23 Jul 2019 16:04:23 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 39B5E5C25A;
	Tue, 23 Jul 2019 16:04:22 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:02:55 +0100
Message-Id: <20190723160319.18153-18-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 17/41] 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.15
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]);
 Tue, 23 Jul 2019 16:04:27 +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.

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 d254069e4b..4c534d2f48 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
@@ -832,7 +833,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 161410051c..1f002acce6 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 f0c49330f5..ef853cdcc4 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 c56f9230f2..e1a3fb1888 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -90,7 +90,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 \
@@ -100,6 +100,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 Tue May  7 11:08:10 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=1563897905; cv=none;
	d=zoho.com; s=zohoarc;
	b=SWiq9ySX+FWlg/cAXxEcX/iKIsUbJn7w2Irdx7wB4VXM9h2fuX8bOWCqJdO3tJDDdPoWLH5sZ6bZ6RPDDwtCXZMNs9rOYqlWiblwyGdO9Ok2mwxMxuEKHXkABdGTlEHDotFbGx0LgkNmHnT7xb3eV8Q5+IXGeZWCe1Tb4vib5mg=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897905;
 h=Content-Type:Content-Transfer-Encoding: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=KkGSvQzVvbQSRn6GU26kHU1lKMXttXxQMrP5pU3UYAk=;
	b=WuOBoD7CauEltmnoYcHsAhlWgjBD9gsEOdh6ZfrH2628R6mrXiA7bi3HH+A4Dnum6OgDeo/vEE+pmkxLOcdqeUfnqTITDKTgdvpqu+1AEj3BN8uS9qmiS2L5rTz16bUezBZSZwVv6LS2ogHgNToftDbDGIki02FGQCdnqHZgFew=
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 1563897905966430.6535482341559;
 Tue, 23 Jul 2019 09:05:05 -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 BECA2811D8;
	Tue, 23 Jul 2019 16:05: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 9464D5C22D;
	Tue, 23 Jul 2019 16:05:04 +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 3E98C1800206;
	Tue, 23 Jul 2019 16:05:04 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG53MI025112 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:03 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 78D195C8AB; Tue, 23 Jul 2019 16:05:03 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 62A665C28C;
	Tue, 23 Jul 2019 16:04:23 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:02:56 +0100
Message-Id: <20190723160319.18153-19-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 18/41] 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.16
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]);
 Tue, 23 Jul 2019 16:05:05 +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.

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                           | 16 +++++++++++++---
 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              |  5 +++++
 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 7e665b6cba..4d6def2e0a 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -629,6 +629,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
  *
@@ -638,6 +639,7 @@ virRegisterStateDriver(virStateDriverPtr driver)
  */
 int
 virStateInitialize(bool privileged,
+                   bool mandatory,
                    virStateInhibitCallback callback,
                    void *opaque)
 {
@@ -648,15 +650,23 @@ 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 492028c487..231960b817 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 329c166255..265e49591b 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -586,7 +586,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
@@ -594,7 +594,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;
@@ -914,14 +914,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 45b52af987..0515a4575f 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -794,6 +794,11 @@ 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),
+#ifdef MODULE_NAME
+                           true,
+#else /* ! MODULE_NAME */
+                           false,
+#endif /* ! MODULE_NAME */
                            daemonInhibitCallback,
                            dmn) < 0) {
         VIR_ERROR(_("Driver state initialization failed"));
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 925ada1cac..e04bb3153d 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -193,7 +193,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 Tue May  7 11:08:10 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=1563897911; cv=none;
	d=zoho.com; s=zohoarc;
	b=HqzFNPMt6tuc9fZan/LkeFM7TLSISyzzcj2/6f2SHyZQb5nOMCK69B9J5MeAm7u2+VhO5f/Jy0H6FwbFJaswZEchYcT1lpVjoRRbgacDmrL3S74vtpe1GPiJ0ZtrlI2/ndpwZl0Q9chzjRjZyl8sYm23aIiZSQ2QJdFacw7ac+M=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897911;
 h=Content-Type:Content-Transfer-Encoding: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=qYXVyw4z1luqDC82MvJu77x5krIX3L+/T57/S6bC+Zs=;
	b=cG9+FE0/ykCAQMkgTbcYwrmT2BZltpUqVdL4aKeYYqpEB0I4RP6KYww84k30VP4ISD94A8RTw+EWZ8T8QTMN61P4qZsqfwqjgCVVSg/cFGUwdcFRCdhl1HF9tLcbJlMGz6GpodQf630m7BsMT1gCLy9z5FFumniQg+bbjKTB+X0=
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 1563897911261474.61847560233673;
 Tue, 23 Jul 2019 09:05:11 -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 A77ED81F2F;
	Tue, 23 Jul 2019 16:05:09 +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 7218060852;
	Tue, 23 Jul 2019 16:05:09 +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 1177018045D3;
	Tue, 23 Jul 2019 16:05:09 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG54A2025120 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:04 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id C75725C234; Tue, 23 Jul 2019 16:05:04 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id CB3245F9A6;
	Tue, 23 Jul 2019 16:05:03 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:02:57 +0100
Message-Id: <20190723160319.18153-20-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 19/41] 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.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]);
 Tue, 23 Jul 2019 16:05:10 +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 wierd 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.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                        |   4 ++
 libvirt.spec.in                   |  10 +++
 src/remote/Makefile.inc.am        | 112 +++++++++++++++++++++++++++---
 src/remote/remote_daemon.c        |  32 ++++++---
 src/remote/remote_daemon_config.c |   6 +-
 src/remote/virtproxyd.service.in  |  24 +++++++
 6 files changed, 167 insertions(+), 21 deletions(-)
 create mode 100644 src/remote/virtproxyd.service.in

diff --git a/.gitignore b/.gitignore
index 4463660c85..05bc166860 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/util/virkeycodetable*.h
@@ -168,6 +171,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 b13b863928..2f64dcabe3 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 e1a3fb1888..7b4f6a10bc 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -90,18 +90,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
@@ -139,6 +161,7 @@ MAINTAINERCLEANFILES +=3D \
 	$(NULL)
 CLEANFILES +=3D \
 	remote/libvirtd.conf \
+	remote/virtproxyd.conf \
 	$(NULL)
=20
 if WITH_REMOTE
@@ -169,15 +192,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
@@ -188,12 +223,23 @@ libvirtd_CFLAGS =3D \
 	-DSOCK_PREFIX=3D"\"libvirt\"" \
 	-DDAEMON_NAME=3D"\"libvirtd\"" \
 	-DENABLE_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:
@@ -217,6 +270,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 \
@@ -227,6 +288,16 @@ 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
@@ -298,13 +369,34 @@ LIBVIRTD_UNIT_VARS =3D \
 	-e 's|[@]name[@]|Libvirt|g' \
 	-e 's|[@]service[@]|libvirtd|g' \
 	-e 's|[@]sockprefix[@]|libvirt|g' \
+	-e 's|[@]deps[@]||g' \
+	$(NULL)
+
+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)
=20
 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 $@
+	$(AM_V_GEN)sed $(LIBVIRTD_UNIT_VARS) \
+		< $< > $@-t && mv $@-t $@
+
+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 $@
=20
 virt-guest-shutdown.target: remote/virt-guest-shutdown.target.in \
 			$(top_builddir)/config.status
diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index 0515a4575f..87742c152f 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -303,11 +303,19 @@ 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
+     *
      * 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
@@ -893,9 +901,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 ENABLE_IP
+#if defined(ENABLE_IP) && defined (LIBVIRTD)
         { "-l | --listen", N_("Listen for TCP/IP connections") },
-#endif /* ENABLE_IP */
+#endif /* ENABLE_IP && LIBVIRTD */
         { "-t | --timeout <secs>", N_("Exit after timeout period") },
         { "-f | --config <file>", N_("Configuration file") },
         { "-V | --version", N_("Display version information") },
@@ -972,7 +980,11 @@ int main(int argc, char **argv) {
     int verbose =3D 0;
     int godaemon =3D 0;
 #ifdef ENABLE_IP
+# ifdef LIBVIRTD
     int ipsock =3D 0;
+# else
+    int ipsock =3D 1; /* listen_tcp/listen_tls default to 0 */
+# endif
 #endif /* ! ENABLE_IP */
     struct daemonConfig *config;
     bool privileged =3D geteuid() =3D=3D 0 ? true : false;
@@ -983,9 +995,9 @@ int main(int argc, char **argv) {
     struct option opts[] =3D {
         { "verbose", no_argument, &verbose, 'v'},
         { "daemon", no_argument, &godaemon, 'd'},
-#ifdef ENABLE_IP
+#if defined(ENABLE_IP) && defined(LIBVIRTD)
         { "listen", no_argument, &ipsock, 'l'},
-#endif /* ! ENABLE_IP */
+#endif /* ENABLE_IP && LIBVIRTD */
         { "config", required_argument, NULL, 'f'},
         { "timeout", required_argument, NULL, 't'},
         { "pid-file", required_argument, NULL, 'p'},
@@ -1010,11 +1022,11 @@ int main(int argc, char **argv) {
         char *tmp;
=20
         c =3D getopt_long(argc, argv,
-#ifdef ENABLE_IP
+#if defined(ENABLE_IP) && defined(LIBVIRTD)
                         "ldf:p:t:vVh",
-#else /* ! ENABLE_IP */
+#else /* ! ENABLE_IP && ! LIBVIRTD */
                         "df:p:t:vVh",
-#endif /* ! ENABLE_IP */
+#endif /* ! ENABLE_IP && ! LIBVIRTD */
                         opts, &optidx);
=20
         if (c =3D=3D -1)
@@ -1030,7 +1042,7 @@ int main(int argc, char **argv) {
         case 'd':
             godaemon =3D 1;
             break;
-#ifdef ENABLE_IP
+#if defined(ENABLE_IP) && defined(LIBVIRTD)
         case 'l':
             ipsock =3D 1;
             break;
diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_c=
onfig.c
index 3c5ccd5ba8..f583442dc7 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 ENABLE_IP
-    data->listen_tls =3D 1;
+# ifdef LIBVIRTD
+    data->listen_tls =3D 1; /* Only honoured it --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..01a0ce9376
--- /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
+After=3Dremote-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
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Tue May  7 11:08:10 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=1563897909; cv=none;
	d=zoho.com; s=zohoarc;
	b=CreVZ9RjBTt+YWH+lQfI8PPOyZps+4Q+T2pnFt+6a7o+AwV92cPcNG21SjlEty9MhmaltSC2RTVEj6lJDu0kDbeHfs3T4UxkzKyU5F5VNkqTkcoTgMRD1aK+k5Y/4regPCBArwkVeBMk/rU5md8IdkDm5Qm7cEgcWX8zjgVGnj8=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897909;
 h=Content-Type:Content-Transfer-Encoding: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=FWClUIFl0t6mk71SRHZ4IWhM86McPgmxSPlsBAA5z8Y=;
	b=KkG1oPFECIGhHNM5RS42vt7RfljZekDDWspXf1gWx5QRPmJYpfzs4n/HtrndbaB9XL7yLj3RlaW2YdjYQg9pLKa7DMbXMBHqi27z3vegFtiN0vvBBTPOPfU4ZlZ42Mn6yizFv90cFMc7GXmeUmk1JpYGxHPywHZ16nOQhJQsCtw=
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 15638979092161003.1298534701226;
 Tue, 23 Jul 2019 09:05:09 -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 E9E00A3EA2;
	Tue, 23 Jul 2019 16:05:07 +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 BCE955D9C5;
	Tue, 23 Jul 2019 16:05: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 70C8718045D0;
	Tue, 23 Jul 2019 16:05:07 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG56qH025130 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:06 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 4ECF55C234; Tue, 23 Jul 2019 16:05:06 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 285B05C652;
	Tue, 23 Jul 2019 16:05:04 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:02:58 +0100
Message-Id: <20190723160319.18153-21-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 20/41] 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.14
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]);
 Tue, 23 Jul 2019 16:05:08 +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.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                        |  4 ++
 libvirt.spec.in                   |  8 ++++
 src/secret/Makefile.inc.am        | 62 +++++++++++++++++++++++++++++++
 src/secret/virtsecretd.service.in | 24 ++++++++++++
 4 files changed, 98 insertions(+)
 create mode 100644 src/secret/virtsecretd.service.in

diff --git a/.gitignore b/.gitignore
index 05bc166860..162b017c4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,12 +166,16 @@
 /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/util/virkeycodetable*.h
 /src/util/virkeynametable*.h
 /src/virt-aa-helper
 /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 2f64dcabe3..8b78415761 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..653c95b584 100644
--- a/src/secret/Makefile.inc.am
+++ b/src/secret/Makefile.inc.am
@@ -37,4 +37,66 @@ 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 Tue May  7 11:08:10 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=1563897913; cv=none;
	d=zoho.com; s=zohoarc;
	b=ACsj/7wN2FCU6tiKUAXnyJvTDMMLph8WRy5eitJ25z1783XJQ/aBoKgyQRMRuE8ZVhRoAsz3dOUudSrXX+xSshDUOH4/bznTrS6XmPzxsw9gFixIqKcKbvjPvtatF0WTg3g3QS2npf8aXBNg1zXKvFgWhLNSqH6L+6aOZ2VzfNo=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897913;
 h=Content-Type:Content-Transfer-Encoding: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=tgsh1zxUqWutkIMZb19bGn94Ojij7hQUrT5veIxnXsA=;
	b=Z6/J+kxccvJd+yDsnO3gYyYcOQZ8evpOpko/2kKBm8xIOGOLAwJ3hGwbi9q3cxKogKVYryFVWL3OL0alslDY60IpK2bE9IuI0nmnCkc/gYh85LhqLdgtqMoR985ifhiFUmdYEkDlxDQjE/UatOaFvHWAzxw+o0Be4mYoG1pArJA=
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 1563897913973331.355377138367;
 Tue, 23 Jul 2019 09:05:13 -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 BFC1B3082120;
	Tue, 23 Jul 2019 16:05: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 9206919C6A;
	Tue, 23 Jul 2019 16:05: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 40BEB18045D4;
	Tue, 23 Jul 2019 16:05:12 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG57pj025137 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:07 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id AFEBF5C25A; Tue, 23 Jul 2019 16:05:07 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id B3F0B5C22D;
	Tue, 23 Jul 2019 16:05:06 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:02:59 +0100
Message-Id: <20190723160319.18153-22-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 21/41] 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.23
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]);
 Tue, 23 Jul 2019 16:05:13 +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.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                          |  4 ++
 libvirt.spec.in                     |  8 ++++
 src/network/Makefile.inc.am         | 61 +++++++++++++++++++++++++++++
 src/network/virtnetworkd.service.in | 24 ++++++++++++
 4 files changed, 97 insertions(+)
 create mode 100644 src/network/virtnetworkd.service.in

diff --git a/.gitignore b/.gitignore
index 162b017c4a..4101bb4564 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]
@@ -174,6 +177,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 8b78415761..4569f59a98 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..7774049c8e 100644
--- a/src/network/Makefile.inc.am
+++ b/src/network/Makefile.inc.am
@@ -49,6 +49,67 @@ 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..4e66d0f28d
--- /dev/null
+++ b/src/network/virtnetworkd.service.in
@@ -0,0 +1,24 @@
+[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
+
+[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 Tue May  7 11:08:10 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=1563897913; cv=none;
	d=zoho.com; s=zohoarc;
	b=WacDgkSq9I+MzUvlROz7rebTbf7mjk31bZ+ioVvDVyQBt82v6eaP9gGxkhVRH6S95M00Q+l41MGUbBxvg4XT9BHfBdn7o9swgoKQFVrQQKFcWJg8iOlu+STp6jFCxmqbEY7oArAi7FsyQGuB0Yu21u8r1FraXPyTkKzetkLQS4A=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897913;
 h=Content-Type:Content-Transfer-Encoding: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=ZWwguYmcPZKrw+H2HnXAVxNgvNXIT3s4wSJ3FyhoA4I=;
	b=Eh4Fnjt5zKSb0sz91NBiaLl+JzlVsDvcpNnm3wiQg0f00qbDQp8BF3CVAQ27q6rvpZpMIFMthY5J7qIVRhEsG8hgWTQBrJPR/bWlvhdWS9QO2XboAX0WihyEuH/mOWHbdeul9+Y9TIs7d9rCjphmzP9Uk8jgAko5uTmiUG4usN8=
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 1563897913031480.98200296553637;
 Tue, 23 Jul 2019 09:05:13 -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 75D7E3DD47;
	Tue, 23 Jul 2019 16:05:11 +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 4075E60603;
	Tue, 23 Jul 2019 16:05:11 +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 D7A571972D;
	Tue, 23 Jul 2019 16:05:10 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG59T8025152 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:09 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 2D7FC5C22D; Tue, 23 Jul 2019 16:05:09 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 422DE5C234;
	Tue, 23 Jul 2019 16:05:07 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:03:00 +0100
Message-Id: <20190723160319.18153-23-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 22/41] 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.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]);
 Tue, 23 Jul 2019 16:05:12 +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.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                              |  4 ++
 libvirt.spec.in                         |  8 ++++
 src/interface/Makefile.inc.am           | 62 +++++++++++++++++++++++++
 src/interface/virtinterfaced.service.in | 24 ++++++++++
 4 files changed, 98 insertions(+)
 create mode 100644 src/interface/virtinterfaced.service.in

diff --git a/.gitignore b/.gitignore
index 4101bb4564..c361d87868 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
@@ -175,6 +178,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 4569f59a98..25bd2a359d 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..0476eb7de2 100644
--- a/src/interface/Makefile.inc.am
+++ b/src/interface/Makefile.inc.am
@@ -41,4 +41,66 @@ 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 Tue May  7 11:08:10 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=1563897916; cv=none;
	d=zoho.com; s=zohoarc;
	b=haOfZiTvB+rusbpdstwaXgVJCLw/8bATvV2SvHxdWSPItQ8Ygovs/0i0SAk7rDjVG9uzGgPDXgvw5hn1/mhEC5EQDiC3O5c2iyFCfL+b/rKbk+p31GapsB5gIoa3ixs8YwpdffOacI+ZENpFe5fva7dMoudCsSXapGjXeOiXTDk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897916;
 h=Content-Type:Content-Transfer-Encoding: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=JPVFBKe/A9FoQBk8HGSBfCmo1ORbA1Cy1RCTBI+DD3c=;
	b=nS7TiLrQ/f3yMAVuRsRTRFSiYjFPQ3k+UqQSygZI+9zRcb4BhKYlHcwbaDchJwrfVSAiIV8gQLzHJBB2BOhL5XfVYqWUATpOVca5oWAefLaSn2n1RVPyqxbbOVHf1diOtN9PvOcyMY7uzsA5XW/w1cIKXDmY7GRhUlWsRByV2ds=
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 1563897916766709.7777440176717;
 Tue, 23 Jul 2019 09:05:16 -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 8516530917EF;
	Tue, 23 Jul 2019 16:05:15 +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 5C88419C78;
	Tue, 23 Jul 2019 16:05:15 +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 17C9918045D0;
	Tue, 23 Jul 2019 16:05:15 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG5AYc025157 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:10 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id B42AA5C234; Tue, 23 Jul 2019 16:05:10 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id D14F05F9CA;
	Tue, 23 Jul 2019 16:05:09 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:03:01 +0100
Message-Id: <20190723160319.18153-24-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 23/41] 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.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]);
 Tue, 23 Jul 2019 16:05:16 +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.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                          |  4 ++
 libvirt.spec.in                     |  8 ++++
 src/storage/Makefile.inc.am         | 61 +++++++++++++++++++++++++++++
 src/storage/virtstoraged.service.in | 24 ++++++++++++
 4 files changed, 97 insertions(+)
 create mode 100644 src/storage/virtstoraged.service.in

diff --git a/.gitignore b/.gitignore
index c361d87868..3b86183bee 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/util/virkeycodetable*.h
 /src/util/virkeynametable*.h
 /src/virt-aa-helper
@@ -184,6 +187,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 25bd2a359d..dce428ede3 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..8083a6b8ac 100644
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -142,6 +142,67 @@ 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..687e3b930e
--- /dev/null
+++ b/src/storage/virtstoraged.service.in
@@ -0,0 +1,24 @@
+[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=3Dapparmor.service
+After=3Dlocal-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 Tue May  7 11:08:10 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=1563897920; cv=none;
	d=zoho.com; s=zohoarc;
	b=chkMw4dbG6vktphM+yXs3Irfhs77sX/OIQJo+UQvT67V3eNe2fUFAGF2142WG5BgefkaQjXtjmtQeOjTNmP9yps+Abcfok7RhT+2mq91WaLXtWdsZKnDva5laP6aLAL5UtvRceNAEtjtTUnp5e+jUWURpfrgVGSG9CzseoBgXrk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897920;
 h=Content-Type:Content-Transfer-Encoding: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=Qjvl8YCnyZmF9DjbsJ7JVmh9Zged6iAeQPLpQGlYQ5w=;
	b=f0coYvjORlGqlDfDzTYE1ieNe9ogJXq6u7xfgQal2/7BZc/OyfwfMtHuCe+ZO/5hFJ1KAMJBDLrGTdbib1tW0vhAsWIyrikJcwIb7MD8cA4IfDhEzeQv5BgW6iKwbZ+QDr7fvWJjIAETx7ab9romcZ5afO9UwGoWKmX30/MFCSE=
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 1563897920172465.4587789735606;
 Tue, 23 Jul 2019 09:05:20 -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 F37DDC066455;
	Tue, 23 Jul 2019 16:05: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 CA28119C7F;
	Tue, 23 Jul 2019 16:05:18 +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 8DB1D1972F;
	Tue, 23 Jul 2019 16:05:18 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG5Cjq025176 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:12 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 652405C234; Tue, 23 Jul 2019 16:05:12 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 694EE5C22D;
	Tue, 23 Jul 2019 16:05:10 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:03:02 +0100
Message-Id: <20190723160319.18153-25-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 24/41] 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.31]);
 Tue, 23 Jul 2019 16:05:19 +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.

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

diff --git a/.gitignore b/.gitignore
index 3b86183bee..ada72fd618 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]
@@ -185,6 +188,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 dce428ede3..c0b880d569 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..34d65849e1 100644
--- a/src/node_device/Makefile.inc.am
+++ b/src/node_device/Makefile.inc.am
@@ -64,4 +64,66 @@ 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 Tue May  7 11:08:10 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=1563897924; cv=none;
	d=zoho.com; s=zohoarc;
	b=CZ0C2JKLgH+OOdIzJaLa3vEjuA94FqPxc19TjkepVE5n+bSC6+RKHfQm2sA3mQMkW4QRlmaVBG+KyY0E09VHMyRMXQQM0ob7ONdRt/q65jy2BBx/RJatWOkHh9o8ZqfKCnhF2Wh9lk7C+U/Bxx/iKyUlIzJzQJ5Bu6Nf6oFeRic=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897924;
 h=Content-Type:Content-Transfer-Encoding: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=WiPcl951rAS7mH9QZgCNDZajx82VbEdoZlob8AL7pRU=;
	b=RpdKS6CYxkMH8oPBvZioRtymTL+aDH/zM8uE3Rh16wj4/dqk8lZGNJUEupZ+XkdTPBFYiopAq0qaScvBVz93ERbUp6oBFEfkvmU/yYXJzDbPlLq43ds+JOwKOkN0vR/eyrnKa2xYt/r/yG+ytQ6z7dMfmmiOXF4iXIo9Zpvx3X8=
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 1563897924814999.2143533510139;
 Tue, 23 Jul 2019 09:05:24 -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 83376A3EA1;
	Tue, 23 Jul 2019 16:05: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 5731A5C6CF;
	Tue, 23 Jul 2019 16:05:23 +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 18B9618045CF;
	Tue, 23 Jul 2019 16:05:23 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG5DH5025183 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:13 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 946BA5C8A8; Tue, 23 Jul 2019 16:05:13 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id C04865C22D;
	Tue, 23 Jul 2019 16:05:12 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:03:03 +0100
Message-Id: <20190723160319.18153-26-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 25/41] 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.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.30]);
 Tue, 23 Jul 2019 16:05:24 +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.

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

diff --git a/.gitignore b/.gitignore
index ada72fd618..b93fd1b044 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]
@@ -189,6 +192,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 c0b880d569..ae1a278152 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..3142c1298b 100644
--- a/src/nwfilter/Makefile.inc.am
+++ b/src/nwfilter/Makefile.inc.am
@@ -41,4 +41,66 @@ 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 Tue May  7 11:08:10 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=1563897918; cv=none;
	d=zoho.com; s=zohoarc;
	b=D7hLyFAB5mleDAeKBSn/368MwEQCDyrzsGcECYRYQo3n2JF0u0cVUrp2Q8sH3UAAisAmk1gYrmPf1eaCNNOwymJLCy5ctvs7caL59ObnY6m2SCDZglksW6KFbpOxiRNts9QPTrWGsw2WuD1MtZVYXK0m8/P0IIllPc5jTGwN0zY=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897918;
 h=Content-Type:Content-Transfer-Encoding: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=uhLIEx3ERMLeMcpCgtIYpbU4jTSy7+RGnCgQtDZPP8E=;
	b=caKs3bjfnzcdLQdT0WfXSide2MCpkFwvTq14laxGRDB/cySA5WMymwC1/MrQ3RCPSKj6Xe9bDGyGmczjOEUDflkpUCdcORfWpiEJgAvskgmfXvYDU/tuwY2p24kHozn+DLX9HnsAAjCTmvn0vTdpxsVmQTkEaT0jGuQN0JtK/oE=
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 1563897918688679.8263559402168;
 Tue, 23 Jul 2019 09:05:18 -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 68BE9309264D;
	Tue, 23 Jul 2019 16:05:17 +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 3C15460BEC;
	Tue, 23 Jul 2019 16:05: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 013D31972D;
	Tue, 23 Jul 2019 16:05:16 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG5FnY025196 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:15 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 39EF05C69A; Tue, 23 Jul 2019 16:05:15 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id E12DE5C652;
	Tue, 23 Jul 2019 16:05:13 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:03:04 +0100
Message-Id: <20190723160319.18153-27-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 26/41] 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.12
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]);
 Tue, 23 Jul 2019 16:05:18 +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.

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

diff --git a/.gitignore b/.gitignore
index b93fd1b044..1c746cec44 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
@@ -188,6 +191,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 ae1a278152..06e8666bc5 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..0079760488 100644
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -65,6 +65,67 @@ 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 \
+	$(VIRTD_UNIT_VARS) \
+	-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..fdb0ccd312
--- /dev/null
+++ b/src/libxl/virtxend.service.in
@@ -0,0 +1,24 @@
+[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
+Documentation=3Dman:libvirtd(8)
+Documentation=3Dhttps://libvirt.org
+
+[Service]
+Type=3Dnotify
+ExecStart=3D@sbindir@/virtxend --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+Restart=3Don-failure
+
+[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 Tue May  7 11:08:10 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=1563897921; cv=none;
	d=zoho.com; s=zohoarc;
	b=T9Z+pfmYEBXVsIdh7PKbCqo15b98RAH6U1hqCoLJqgHp251610f7G2k5uFSg8hWdmoT9xl8qQd50exYGvO764nmxRNY0wQVX8ydCCdi+zAsadCn4DvgsHl8a8Uxz6AcqG+UEhX75uU6nIO3DvdeJSur075J1nJI2J7TjgatweQ0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897921;
 h=Content-Type:Content-Transfer-Encoding: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=FW6okIGqyLejLW6zfBGZAiQ/pGKrqYuFIGM2bm9dq7E=;
	b=fnHDDROtKPV1eAP1X0GpE84fTZhdXq6zbVJR2YjFASEMkUqt3Kr1FUkTZYIhiTQ0VrIdCvadlCkiA8r6O6hGHAiCmnWP+yX3u8e0fikLF5ab1GOY+us0G6vaDBDyNjiGCJkjf5Otha3brFpUlzuCGdcb/Q+g5Gyyycdz0qtTSwg=
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 1563897921674585.4146010359766;
 Tue, 23 Jul 2019 09:05:21 -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 8E40BC09AD17;
	Tue, 23 Jul 2019 16:05:20 +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 643AE5C22D;
	Tue, 23 Jul 2019 16:05:20 +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 1CB2619730;
	Tue, 23 Jul 2019 16:05:20 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG5GsT025206 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:16 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 888E25C25A; Tue, 23 Jul 2019 16:05:16 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 9EBFB5C22D;
	Tue, 23 Jul 2019 16:05:15 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:03:05 +0100
Message-Id: <20190723160319.18153-28-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 27/41] 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.16
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]);
 Tue, 23 Jul 2019 16:05:21 +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.

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

diff --git a/.gitignore b/.gitignore
index 1c746cec44..d23ffa94f0 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
@@ -198,6 +201,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 06e8666bc5..7d2597e3dd 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..c343c4d597 100644
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -112,6 +112,67 @@ 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..124abfe2fd
--- /dev/null
+++ b/src/qemu/virtqemud.service.in
@@ -0,0 +1,24 @@
+[Unit]
+Description=3DVirtualization qemu daemon
+Conflicts=3Dlibvirtd.service
+Requires=3Dvirtqemud.socket
+Requires=3Dvirtqemud-ro.socket
+Requires=3Dvirtqemud-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@/virtqemud --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+Restart=3Don-failure
+
+[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 Tue May  7 11:08:10 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=1563897928; cv=none;
	d=zoho.com; s=zohoarc;
	b=CeapnH19TvXnaUk698fysgGIv00gK7ZdjTolr37S6aVnEqHOtCSal6Qtqs5468zV1h1Xz6yBVmxnPuhKsGTgpMQfKwfOTCcXqpP/UlU6vs9PoHH9B/WHq2/UmN2MgStv1/Y3tbsDRHwukx59DkMqDVKFxSYXpZZ0ygiHQ9jUJJg=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897928;
 h=Content-Type:Content-Transfer-Encoding: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=kGmPSxh7jVsDvy2Uc/G3swp9wQsDHV6shX57O2/t6/c=;
	b=WtYIBOoDUesQ+k3j1tfXTwNYJqRsrGP3QqBoqILY+dGsGMfUZwqABKzxsMGsXCOwYJQs8nwHAR3zppACUd1ygvCFUyqUpPQ94rsRNQsZ83WhvUZj3s5gc0kBKdHRhDvDyNYU5tRix8maN1MlLLrl8FXz+OcTsGVw2ZpSbv7spq0=
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 1563897928780699.4290975681454;
 Tue, 23 Jul 2019 09:05:28 -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 45800C0A4F66;
	Tue, 23 Jul 2019 16:05: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 163465C54A;
	Tue, 23 Jul 2019 16:05: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 CB1FA18045DA;
	Tue, 23 Jul 2019 16:05:26 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG5IKq025225 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:18 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 430435C28C; Tue, 23 Jul 2019 16:05:18 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 2AB525C22D;
	Tue, 23 Jul 2019 16:05:16 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:03:06 +0100
Message-Id: <20190723160319.18153-29-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 28/41] 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.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.32]);
 Tue, 23 Jul 2019 16:05:27 +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.

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

diff --git a/.gitignore b/.gitignore
index d23ffa94f0..d279c7bc1f 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
@@ -197,6 +200,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 7d2597e3dd..e64c2931ac 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..7c81761a81 100644
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -110,6 +110,68 @@ 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..d06aa1480f
--- /dev/null
+++ b/src/lxc/virtlxcd.service.in
@@ -0,0 +1,24 @@
+[Unit]
+Description=3DVirtualization lxc daemon
+Conflicts=3Dlibvirtd.service
+Requires=3Dvirtlxcd.socket
+Requires=3Dvirtlxcd-ro.socket
+Requires=3Dvirtlxcd-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@/virtlxcd --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+Restart=3Don-failure
+
+[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 Tue May  7 11:08:10 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=1563897924; cv=none;
	d=zoho.com; s=zohoarc;
	b=bYxGr3UGsMwEyuNe05DrbVSJafX0a8B6NQA+E6RphKm4VSyaXFfMari0s2asQkHJ2dZoSft+LifvceARb6zycvUXF4V5FhKzzbEigxbAxvsPnZxtTZODV9CAB8KmQG0evf3qAC68ririqqD+67njXePjLbE7Ym5LmHf7GmYwAPU=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897924;
 h=Content-Type:Content-Transfer-Encoding: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=PjN21wygvTakQjNOCs9DQJoQfdRH//18kTkqQZVlh1A=;
	b=kQtTu5OWNuWG0OLGiK1eddKYmf2JHfZH/qBxe8UV9lTm/EE5bA+mzjJGtj4LZvkP2SM/oSqyN2bTdTeP/9mNe1LP84RTPMPULUrf2YIjzPH4oFGMmVqLAJvxjDivY8FDhRqupG3bwxYpsPy2MjcT1rBZP9btdXTCqBpexkyM1KA=
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 1563897924262117.38399842393085;
 Tue, 23 Jul 2019 09:05: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 1D6C0C065113;
	Tue, 23 Jul 2019 16:05: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 E1E1960852;
	Tue, 23 Jul 2019 16:05: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 989FF18045CF;
	Tue, 23 Jul 2019 16:05:22 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG5JNk025235 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:19 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id B337B5C22D; Tue, 23 Jul 2019 16:05:19 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 9CF525C234;
	Tue, 23 Jul 2019 16:05:18 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:03:07 +0100
Message-Id: <20190723160319.18153-30-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 29/41] 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.31]);
 Tue, 23 Jul 2019 16:05: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.

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

diff --git a/.gitignore b/.gitignore
index d279c7bc1f..a23828cce6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -195,6 +195,9 @@
 /src/storage/virtstoraged.conf
 /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
@@ -208,6 +211,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 e64c2931ac..3e897459f1 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..dfa0ab4016 100644
--- a/src/vbox/Makefile.inc.am
+++ b/src/vbox/Makefile.inc.am
@@ -63,4 +63,66 @@ 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..e4c00f2d68
--- /dev/null
+++ b/src/vbox/virtvboxd.service.in
@@ -0,0 +1,24 @@
+[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
+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 Tue May  7 11:08:10 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=1563897928; cv=none;
	d=zoho.com; s=zohoarc;
	b=VRwiM7KVD3oYyKa8sj2wtd68u/CGqysT5O1CZgkwsEY+ZrpVUWhVqOUGjA+nTfzGi0gZpndeUlrJkmYAPMHhORrLTRcxHDMz/7RoGM6gU5NNM/WbNJou38Nx2/s4iwUn/M40SrgRBpqua++g6cu3HJf5s/3RicyXCYB6iFqsTwA=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897928;
 h=Content-Type:Content-Transfer-Encoding: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=ssDiMSj7BT/TVQCjvDgAZnrVpp6KqFY9A4cuxtmg3zE=;
	b=IJy1oDLnNOP9yf6Jm7urbQdt9eoJWpgUNAFOB5XzRNPvF9VElg1VVlvXp0ZywYHClHdj+pCLW0up/jVzv6R/PLxLkW6hss1WXy5VTvmkd1hRvU62Z2i/hSvFO7fj6hqaGGy9i1Zjc6lxoxNFkZc8uIFuBabknl5E5balCkYRF3Y=
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 1563897928355767.9485362535556;
 Tue, 23 Jul 2019 09:05:28 -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 36E2830B8DE3;
	Tue, 23 Jul 2019 16:05:27 +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 07685196E5;
	Tue, 23 Jul 2019 16:05: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 AFD171972F;
	Tue, 23 Jul 2019 16:05:26 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG5KRH025251 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:20 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id B40EA5C54A; Tue, 23 Jul 2019 16:05:20 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 106E45C234;
	Tue, 23 Jul 2019 16:05:19 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:03:08 +0100
Message-Id: <20190723160319.18153-31-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 30/41] 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.23
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]);
 Tue, 23 Jul 2019 16:05:27 +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.

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

diff --git a/.gitignore b/.gitignore
index a23828cce6..4e46adaa55 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
@@ -199,6 +202,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..a06af494e6 100644
--- a/src/bhyve/Makefile.inc.am
+++ b/src/bhyve/Makefile.inc.am
@@ -47,6 +47,44 @@ 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 Tue May  7 11:08:10 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=1563897928; cv=none;
	d=zoho.com; s=zohoarc;
	b=ajd8t2+4pn+RacM8oOnSXmiRS/ajvKnHOeRlXi2x9OmQYompnuuh/uH35EZgSau7XgeHDxG9NRGL3jV8OKzeErZj6L31MzV4z4ec+9dCNuyxX9Mc2+H1ZUbZbedraEZsvioLQ2xfOLkwrwdr/SRQZK3X3tENVG88ac+cXjGW8V4=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897928;
 h=Content-Type:Content-Transfer-Encoding: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=tX8TRABhcRImP5jjQJw4JhuaE/93zGC/CkqyPTAZmzg=;
	b=Vu5LxvdEwCLzh6lM8GzdA0XMF7QYs8Ws2l8hHQSJZ9hld/rjTFY5fPzfLvD4Uoqoo3EZqwFrHylvHnMGc9dchDNgOTMS16fCkscxz8hMd+9PjL1XT15yLJzJVBFVXHOj8nHmJ0UK3JRcR3YNCaB5J9xRN87eePKd9BfQerwrpgY=
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 1563897928025508.58870455569206;
 Tue, 23 Jul 2019 09:05:28 -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 E0706C057F31;
	Tue, 23 Jul 2019 16:05:26 +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 B024861352;
	Tue, 23 Jul 2019 16:05: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 6816118045D5;
	Tue, 23 Jul 2019 16:05:26 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG5Lfp025261 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:21 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id CF10B5C25A; Tue, 23 Jul 2019 16:05:21 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 1B99E5C28C;
	Tue, 23 Jul 2019 16:05:20 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:03:09 +0100
Message-Id: <20190723160319.18153-32-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 31/41] 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.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]);
 Tue, 23 Jul 2019 16:05:27 +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.

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

diff --git a/.gitignore b/.gitignore
index 4e46adaa55..e35a3409f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -216,7 +216,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..72280614da 100644
--- a/src/vz/Makefile.inc.am
+++ b/src/vz/Makefile.inc.am
@@ -37,4 +37,66 @@ 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..a591791df0
--- /dev/null
+++ b/src/vz/virtvzd.service.in
@@ -0,0 +1,24 @@
+[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
+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 Tue May  7 11:08:10 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=1563897932; cv=none;
	d=zoho.com; s=zohoarc;
	b=kWlDekj37rGkkeZG7qLraSLnYrbqpNc0iBRQxp5NT9F9RRQ/FQpEfXDmOzYnUJXllvB8otfaHGRbg9wH7kRtYoQe4puY21U83QRd3yVx5NM3HGy5+HFwwgrzpkSV3BU7CIvSz9rVWkC4PbcMx0L9Lzl9Nj4VBYMSlajTPqqw7R8=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897932;
 h=Content-Type:Content-Transfer-Encoding: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=wQBdLIuPC40ltdvfJz66BreHYfIH+MuhE2joS+8FpjM=;
	b=PPXDikdlDUtH6mXvV48Nm/PK4o5epe/kyDB5HncdmLdkTwbOTt4zZntr96L+Moa1HtNG8drAILDJ3uDi3PA3BNNYWZBnXFxU+meUTc39u8S90CktHCopy0f5x85Hwoqyj75c3xFHhUzHethlwgB+PCluyqOv0Hn+DBlmpOO89i8=
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 1563897932463149.20935542344182;
 Tue, 23 Jul 2019 09:05:32 -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 38FB63082B3F;
	Tue, 23 Jul 2019 16:05:31 +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 E4ADC1853E;
	Tue, 23 Jul 2019 16:05:30 +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 8403C19731;
	Tue, 23 Jul 2019 16:05:30 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG5N2B025276 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:23 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 138945C25A; Tue, 23 Jul 2019 16:05:23 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 499B55C234;
	Tue, 23 Jul 2019 16:05:22 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:03:10 +0100
Message-Id: <20190723160319.18153-33-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 32/41] 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.45]);
 Tue, 23 Jul 2019 16:05:31 +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.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/libvirt-admin.c | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c
index 74dedf64d8..97290b337f 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
@@ -101,6 +97,7 @@ virAdmInitialize(void)
     return 0;
 }
=20
+
 static char *
 getSocketPath(virURIPtr uri)
 {
@@ -127,27 +124,28 @@ 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 {
+        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 (STREQ_NULLABLE(uri->path, "/system")) {
-            if (virAsprintf(&sock_path, LOCALSTATEDIR "/run/libvirt/%s",
-                            sockbase) < 0)
+            if (virAsprintf(&sock_path, LOCALSTATEDIR "/run/libvirt/%s-adm=
in-sock",
+                            legacy ? "libvirt" : uri->scheme) < 0)
                 goto error;
         } else if (STREQ_NULLABLE(uri->path, "/session")) {
-            if (!rundir || virAsprintf(&sock_path, "%s/%s", rundir,
-                                       sockbase) < 0)
+            if (!rundir || virAsprintf(&sock_path, "%s/%s-admin-sock", run=
dir,
+                                       legacy ? "libvirt" : uri->scheme) <=
 0)
                 goto error;
         } else {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Tue May  7 11:08:10 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=1563897932; cv=none;
	d=zoho.com; s=zohoarc;
	b=hhateMSqIqQIEdLGhLDkAv04liB+8cKJ0aoBN5sdeR1MQQHnheb8su6/JlxnHWTvXB7D2UJkMpErnmP3peOyzrLBuSb6rY3bl8Fn/fA5xNtYFvGXkkt/qdcV2XboqKS+8rPORkMj1XEHO1ArOiTEN6A6XcgZo1gdRg+ai62D2wc=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897932;
 h=Content-Type:Content-Transfer-Encoding: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=/71woI45/WH0UKVyf9k4zIBC8QDinatFAMgPnzpzddA=;
	b=H2bOXqwvl2umb44XuMVlDY+TUxxXsRR67gWpplHsq/fYqiOYp6Fftn2mMoWIO6LPdIi2ZSk4BDh2aIXX8a41iyOYrBJ7aNyVA9rFqyQA8lqXoss4P8mJIVsnMXuyhuZlVv9VtygibgNh4AT3IrZjVolHLABpKWrkc/ILNqMaqyM=
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 1563897932758555.6609229382816;
 Tue, 23 Jul 2019 09:05:32 -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 6CB8A80F6D;
	Tue, 23 Jul 2019 16:05:31 +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 3FEDE19C7F;
	Tue, 23 Jul 2019 16:05: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 DD83F19734;
	Tue, 23 Jul 2019 16:05:30 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG5OZS025288 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:25 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id E94FD5C54A; Tue, 23 Jul 2019 16:05:24 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 6520A5C25A;
	Tue, 23 Jul 2019 16:05:23 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:03:11 +0100
Message-Id: <20190723160319.18153-34-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 33/41] 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.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.27]);
 Tue, 23 Jul 2019 16:05:32 +0000 (UTC)

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

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@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 856c5e48e7..b7085a3ae3 100644
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -2004,7 +2004,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)
 {
@@ -2015,7 +2015,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,
@@ -2052,7 +2052,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,
@@ -2102,7 +2102,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,
@@ -2153,7 +2153,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,
@@ -2211,7 +2211,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,
@@ -2265,7 +2265,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,
@@ -2328,7 +2328,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,
@@ -2380,7 +2380,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,
@@ -2424,7 +2424,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,
@@ -2481,7 +2481,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)
@@ -2520,7 +2520,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,
@@ -2621,7 +2621,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,
@@ -2670,7 +2670,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,
@@ -2823,7 +2823,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,
@@ -2878,7 +2878,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,
@@ -2930,7 +2930,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,
@@ -2992,7 +2992,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,
@@ -3054,7 +3054,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,
@@ -3116,7 +3116,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,
@@ -3188,7 +3188,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,
@@ -3260,7 +3260,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,
@@ -3307,7 +3307,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,
@@ -3354,7 +3354,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,
@@ -3394,7 +3394,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,
@@ -3972,7 +3972,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,
@@ -4228,7 +4228,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,
@@ -4266,7 +4266,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,
@@ -4560,7 +4560,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,
@@ -4595,7 +4595,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,
@@ -4646,7 +4646,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,
@@ -4702,7 +4702,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,
@@ -4757,7 +4757,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,
@@ -4811,7 +4811,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)
@@ -4911,7 +4911,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)
@@ -4952,7 +4952,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)
@@ -4995,7 +4995,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,
@@ -5058,7 +5058,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,
@@ -5190,7 +5190,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,
@@ -5234,7 +5234,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,
@@ -5291,7 +5291,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,
@@ -5338,7 +5338,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)
@@ -5438,7 +5438,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,
@@ -5495,7 +5495,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,
@@ -5625,7 +5625,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,
@@ -5686,7 +5686,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,
@@ -5747,7 +5747,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)
@@ -5798,7 +5798,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,
@@ -7179,7 +7179,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 Tue May  7 11:08:10 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=1563897936; cv=none;
	d=zoho.com; s=zohoarc;
	b=m/dJp5aTBN66PpogU70EESGYzVaxtdl8OVpHyKJ96WjpoPqBt/zjqLX7rzkQlLgZFPCSksVX6Luu5zIvwb/YXKlgT4R5Gk902pV9FoRDTP4lLLO21DHeJCiX0uGeAdCSoFfmLAuZnngCkUdZiYGq9lvQEE36niU1opTPxspkqFk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897936;
 h=Content-Type:Content-Transfer-Encoding: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=QDpnDw45B/oEEDSbQwZrJnsMTsJdA2wcmfG85XiRACo=;
	b=N3iZWsI3vm9svPMiYUjRc1YEZagmqjFGYGDtGB9sl3dMarpS7ftd9LB0z4agX0scHqA4m8sgjlr32PqsUFCRC2HwBVnuxgzb3FZqOZZxOzPemGcODQrO02TX00dfJAa3UMg1XwHdsvVdSp8dFSy5CB4brKBTE8s4ov9+/+YWo/k=
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 1563897936646445.18892451145894;
 Tue, 23 Jul 2019 09:05:36 -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 7C3B17FDF5;
	Tue, 23 Jul 2019 16:05: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 4D3EE60497;
	Tue, 23 Jul 2019 16:05: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 0AB9C18045CF;
	Tue, 23 Jul 2019 16:05:35 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG5Q1w025297 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:26 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 80B385C234; Tue, 23 Jul 2019 16:05:26 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 445975C22D;
	Tue, 23 Jul 2019 16:05:25 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:03:12 +0100
Message-Id: <20190723160319.18153-35-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 34/41] 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.27]);
 Tue, 23 Jul 2019 16:05:36 +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.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/admin/admin_server_dispatch.c   |   9 ++
 src/remote/remote_daemon_dispatch.c | 122 ++++++++++++++++++++++++++++
 src/rpc/gendispatch.pl              |  96 ++++++++++++----------
 3 files changed, 184 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 b7085a3ae3..ecce0b0112 100644
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -110,6 +110,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"
@@ -1923,6 +1939,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)
 {
@@ -2013,6 +2134,7 @@ remoteDispatchConnectClose(virNetServerPtr server ATT=
RIBUTE_UNUSED,
 }
=20
=20
+
 static int
 remoteDispatchDomainGetSchedulerType(virNetServerPtr server ATTRIBUTE_UNUS=
ED,
                                      virNetServerClientPtr client,
diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
index f683e711ce..6e5b6a2937 100755
--- a/src/rpc/gendispatch.pl
+++ b/src/rpc/gendispatch.pl
@@ -110,13 +110,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;
@@ -126,22 +142,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
@@ -149,25 +165,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
@@ -534,7 +550,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") {
@@ -546,7 +564,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,
@@ -562,7 +580,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,
@@ -571,7 +589,7 @@ elsif ($mode eq "server") {
                     push(@vars_list, "virDomainPtr dom =3D NULL");
                     push(@vars_list, "virDomainSnapshotPtr snapshot =3D NU=
LL");
                     push(@getters_list,
-                         "    if (!(dom =3D get_nonnull_domain($conn, args=
->${1}.dom)))\n" .
+                         "    if (!(dom =3D get_nonnull_domain($conn_var, =
args->${1}.dom)))\n" .
                          "        goto cleanup;\n" .
                          "\n" .
                          "    if (!(snapshot =3D get_nonnull_domain_snapsh=
ot(dom, args->${1})))\n" .
@@ -581,11 +599,11 @@ elsif ($mode eq "server") {
                          "    virObjectUnref(snapshot);\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;
@@ -602,7 +620,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");
@@ -610,7 +628,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");
@@ -625,25 +643,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
@@ -662,7 +680,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,
@@ -673,7 +691,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" .
@@ -949,7 +967,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);
@@ -1029,13 +1047,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";
@@ -1048,10 +1059,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) {
@@ -1078,7 +1088,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";
@@ -1095,7 +1105,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 Tue May  7 11:08:10 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=1563897936; cv=none;
	d=zoho.com; s=zohoarc;
	b=mZH5X4RzJVWayoe4hWxifTAAVWsphr+LNpMTeDO55WKtl1D8FN6an0pO681Y6NhcqcL7zlhJB8+yuJ79GkEQQFXCvOcKdE5BOyDPoiXmstjcPYKgjoEZ45dzyepa8iZP6xGc+ljiooYw6nmBdOxpESeDgmG352NgjcrR/SKXYA4=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897936;
 h=Content-Type:Content-Transfer-Encoding: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=3UjtDPTha/JC8l2o2ex6lFABSsWHBqUYsconOhHN0Rg=;
	b=mvJqokdTh9Ht1H6eF7GwLJ58lqiq4Wz8g3sJi8DP0snWy4tFYDK1OnNVjsOtF+N/opN9qJ2pkbnBDzuUrKM+ZVJvawWNUV0HFX+6GB8T8xZ4Bacwxy9hbiz6WEmHa2NzDYIDXYeVLh8r416xqG8rpjeuKvZSfGvxwP9UKRtgiMk=
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 1563897936823999.9395893206306;
 Tue, 23 Jul 2019 09:05:36 -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 6868CA3EA7;
	Tue, 23 Jul 2019 16:05: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 3C4135B685;
	Tue, 23 Jul 2019 16:05: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 EF15D18045D2;
	Tue, 23 Jul 2019 16:05:34 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG5SxR025312 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:28 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id D8B875C22D; Tue, 23 Jul 2019 16:05:28 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 04E295C8A4;
	Tue, 23 Jul 2019 16:05:26 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:03:13 +0100
Message-Id: <20190723160319.18153-36-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 35/41] 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.15
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]);
 Tue, 23 Jul 2019 16:05:36 +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.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/remote_daemon_dispatch.c | 782 ++++++++++------------------
 1 file changed, 289 insertions(+), 493 deletions(-)

diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon=
_dispatch.c
index ecce0b0112..b677bd44ee 100644
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -2147,15 +2147,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)))
@@ -2184,13 +2181,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"=
));
@@ -2200,7 +2194,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)
@@ -2234,13 +2228,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"=
));
@@ -2250,7 +2241,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,
@@ -2286,13 +2277,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",
@@ -2300,7 +2288,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 */
@@ -2345,15 +2333,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;
@@ -2399,15 +2384,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
@@ -2461,15 +2443,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;
@@ -2511,15 +2490,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)
@@ -2556,15 +2532,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) {
@@ -2610,16 +2583,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;
@@ -2652,15 +2622,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) {
@@ -2714,15 +2681,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,
@@ -2753,15 +2717,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 */
@@ -2804,15 +2765,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) {
@@ -2881,18 +2839,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)
@@ -2957,13 +2913,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;
@@ -2972,7 +2925,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;
@@ -3012,13 +2965,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;
@@ -3027,7 +2977,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)
@@ -3063,13 +3013,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
@@ -3081,7 +3028,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)
@@ -3125,13 +3072,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
@@ -3143,7 +3087,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)
@@ -3187,13 +3131,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
@@ -3205,7 +3146,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)
@@ -3250,13 +3191,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
@@ -3268,7 +3206,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
@@ -3322,13 +3260,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
@@ -3340,7 +3275,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
@@ -3392,15 +3327,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)
@@ -3439,15 +3371,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)
@@ -3485,15 +3414,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);
@@ -3526,13 +3452,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"=
));
@@ -3543,7 +3466,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,
@@ -4103,15 +4026,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);
@@ -4143,15 +4063,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;
@@ -4175,15 +4094,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
@@ -4210,14 +4128,13 @@ remoteDispatchConnectDomainEventRegister(virNetServ=
erPtr server ATTRIBUTE_UNUSED
     daemonClientEventCallbackPtr ref;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
-
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
-        goto cleanup;
-    }
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
     virMutexLock(&priv->lock);
=20
+    if (!conn)
+        goto cleanup;
+
     /* 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
@@ -4238,7 +4155,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),
@@ -4274,14 +4191,13 @@ remoteDispatchConnectDomainEventDeregister(virNetSe=
rverPtr server ATTRIBUTE_UNUS
     size_t i;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
-
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
-        goto cleanup;
-    }
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
     virMutexLock(&priv->lock);
=20
+    if (!conn)
+        goto cleanup;
+
     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;
@@ -4296,7 +4212,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,
@@ -4360,15 +4276,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)))
@@ -4396,15 +4309,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)
@@ -4438,14 +4348,13 @@ remoteDispatchConnectDomainEventRegisterAny(virNetS=
erverPtr server ATTRIBUTE_UNU
     daemonClientEventCallbackPtr ref;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
-
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
-        goto cleanup;
-    }
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
     virMutexLock(&priv->lock);
=20
+    if (!conn)
+        goto cleanup;
+
     /* 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.  */
@@ -4474,7 +4383,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],
@@ -4514,16 +4423,15 @@ remoteDispatchConnectDomainEventCallbackRegisterAny=
(virNetServerPtr server ATTRI
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
     virDomainPtr dom =3D NULL;
-
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
-        goto cleanup;
-    }
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
     virMutexLock(&priv->lock);
=20
+    if (!conn)
+        goto cleanup;
+
     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) {
@@ -4549,7 +4457,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],
@@ -4588,14 +4496,13 @@ remoteDispatchConnectDomainEventDeregisterAny(virNe=
tServerPtr server ATTRIBUTE_U
     size_t i;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
-
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
-        goto cleanup;
-    }
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
     virMutexLock(&priv->lock);
=20
+    if (!conn)
+        goto cleanup;
+
     /* 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.  */
@@ -4618,7 +4525,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,
@@ -4645,14 +4552,13 @@ remoteDispatchConnectDomainEventCallbackDeregisterA=
ny(virNetServerPtr server ATT
     size_t i;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
-
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
-        goto cleanup;
-    }
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
     virMutexLock(&priv->lock);
=20
+    if (!conn)
+        goto cleanup;
+
     for (i =3D 0; i < priv->ndomainEventCallbacks; i++) {
         if (priv->domainEventCallbacks[i]->callbackID =3D=3D args->callbac=
kID)
             break;
@@ -4664,7 +4570,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,
@@ -4690,15 +4596,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,
@@ -4730,15 +4633,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;
@@ -4780,13 +4680,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;
@@ -4795,7 +4692,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,
@@ -4838,15 +4735,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;
@@ -4891,18 +4785,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,
@@ -4940,15 +4831,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,
@@ -4976,8 +4864,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.
@@ -4989,10 +4876,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:
@@ -5012,7 +4899,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:
@@ -5041,15 +4928,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)
@@ -5082,15 +4966,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,
@@ -5129,13 +5010,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
@@ -5147,7 +5025,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)
@@ -5187,16 +5065,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"=
));
@@ -5211,7 +5086,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,
@@ -5261,15 +5136,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) {
@@ -5321,15 +5193,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) {
@@ -5366,13 +5235,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
@@ -5384,7 +5250,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
@@ -5424,17 +5290,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;
@@ -5466,19 +5329,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,
@@ -5520,15 +5380,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,
@@ -5573,13 +5430,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,
@@ -5588,7 +5442,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,
@@ -5629,13 +5483,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,
@@ -5653,7 +5504,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,
@@ -5688,15 +5539,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,
@@ -5710,12 +5558,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,
@@ -5760,13 +5608,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,
@@ -5775,7 +5620,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,
@@ -5820,13 +5665,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,
@@ -5840,7 +5682,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,
@@ -5878,13 +5720,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,
@@ -5893,7 +5732,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,
@@ -5928,15 +5767,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)
@@ -5980,16 +5816,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;
@@ -5999,7 +5832,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;
@@ -6029,16 +5862,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;
@@ -6048,7 +5878,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,
@@ -6084,19 +5914,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;
-
-    if (!priv->networkConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
-        goto cleanup;
-    }
+    virConnectPtr conn =3D remoteGetNetworkConn(client);
=20
     virMutexLock(&priv->lock);
=20
+    if (!conn)
+        goto cleanup;
+
     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)=
 {
@@ -6122,7 +5951,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],
@@ -6160,14 +5989,13 @@ remoteDispatchConnectNetworkEventDeregisterAny(virN=
etServerPtr server ATTRIBUTE_
     size_t i;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
-
-    if (!priv->networkConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
-        goto cleanup;
-    }
+    virConnectPtr conn =3D remoteGetNetworkConn(client);
=20
     virMutexLock(&priv->lock);
=20
+    if (!conn)
+        goto cleanup;
+
     for (i =3D 0; i < priv->nnetworkEventCallbacks; i++) {
         if (priv->networkEventCallbacks[i]->callbackID =3D=3D args->callba=
ckID)
             break;
@@ -6179,7 +6007,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,
@@ -6209,16 +6037,15 @@ remoteDispatchConnectStoragePoolEventRegisterAny(vi=
rNetServerPtr server ATTRIBUT
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
     virStoragePoolPtr  pool =3D NULL;
-
-    if (!priv->storageConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
-        goto cleanup;
-    }
+    virConnectPtr conn =3D remoteGetStorageConn(client);
=20
     virMutexLock(&priv->lock);
=20
+    if (!conn)
+        goto cleanup;
+
     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) {
@@ -6244,7 +6071,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],
@@ -6281,14 +6108,13 @@ remoteDispatchConnectStoragePoolEventDeregisterAny(=
virNetServerPtr server ATTRIB
     size_t i;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
-
-    if (!priv->storageConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
-        goto cleanup;
-    }
+    virConnectPtr conn =3D remoteGetStorageConn(client);
=20
     virMutexLock(&priv->lock);
=20
+    if (!conn)
+        goto cleanup;
+
     for (i =3D 0; i < priv->nstorageEventCallbacks; i++) {
         if (priv->storageEventCallbacks[i]->callbackID =3D=3D args->callba=
ckID)
             break;
@@ -6300,7 +6126,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,
@@ -6330,16 +6156,15 @@ remoteDispatchConnectNodeDeviceEventRegisterAny(vir=
NetServerPtr server ATTRIBUTE
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
     virNodeDevicePtr  dev =3D NULL;
-
-    if (!priv->nodedevConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
-        goto cleanup;
-    }
+    virConnectPtr conn =3D remoteGetNodeDevConn(client);
=20
     virMutexLock(&priv->lock);
=20
+    if (!conn)
+        goto cleanup;
+
     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) {
@@ -6365,7 +6190,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],
@@ -6402,14 +6227,13 @@ remoteDispatchConnectNodeDeviceEventDeregisterAny(v=
irNetServerPtr server ATTRIBU
     size_t i;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
-
-    if (!priv->nodedevConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
-        goto cleanup;
-    }
+    virConnectPtr conn =3D remoteGetNodeDevConn(client);
=20
     virMutexLock(&priv->lock);
=20
+    if (!conn)
+        goto cleanup;
+
     for (i =3D 0; i < priv->nnodeDeviceEventCallbacks; i++) {
         if (priv->nodeDeviceEventCallbacks[i]->callbackID =3D=3D args->cal=
lbackID)
             break;
@@ -6421,7 +6245,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,
@@ -6451,16 +6275,15 @@ remoteDispatchConnectSecretEventRegisterAny(virNetS=
erverPtr server ATTRIBUTE_UNU
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
     virSecretPtr secret =3D NULL;
-
-    if (!priv->secretConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
-        goto cleanup;
-    }
+    virConnectPtr conn =3D remoteGetSecretConn(client);
=20
     virMutexLock(&priv->lock);
=20
+    if (!conn)
+        goto cleanup;
+
     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) {
@@ -6486,7 +6309,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],
@@ -6523,14 +6346,13 @@ remoteDispatchConnectSecretEventDeregisterAny(virNe=
tServerPtr server ATTRIBUTE_U
     size_t i;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
-
-    if (!priv->secretConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
-        goto cleanup;
-    }
+    virConnectPtr conn =3D remoteGetSecretConn(client);
=20
     virMutexLock(&priv->lock);
=20
+    if (!conn)
+        goto cleanup;
+
     for (i =3D 0; i < priv->nsecretEventCallbacks; i++) {
         if (priv->secretEventCallbacks[i]->callbackID =3D=3D args->callbac=
kID)
             break;
@@ -6542,7 +6364,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,
@@ -6573,16 +6395,15 @@ qemuDispatchConnectDomainMonitorEventRegister(virNe=
tServerPtr server ATTRIBUTE_U
         virNetServerClientGetPrivateData(client);
     virDomainPtr dom =3D NULL;
     const char *event =3D args->event ? *args->event : NULL;
-
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
-        goto cleanup;
-    }
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
     virMutexLock(&priv->lock);
=20
+    if (!conn)
+        goto cleanup;
+
     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
@@ -6602,7 +6423,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,
@@ -6641,14 +6462,13 @@ qemuDispatchConnectDomainMonitorEventDeregister(vir=
NetServerPtr server ATTRIBUTE
     size_t i;
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
-
-    if (!priv->conn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
-        goto cleanup;
-    }
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
=20
     virMutexLock(&priv->lock);
=20
+    if (!conn)
+        goto cleanup;
+
     for (i =3D 0; i < priv->nqemuEventCallbacks; i++) {
         if (priv->qemuEventCallbacks[i]->callbackID =3D=3D args->callbackI=
D)
             break;
@@ -6660,7 +6480,7 @@ qemuDispatchConnectDomainMonitorEventDeregister(virNe=
tServerPtr server ATTRIBUTE
         goto cleanup;
     }
=20
-    if (virConnectDomainQemuMonitorEventDeregister(priv->conn,
+    if (virConnectDomainQemuMonitorEventDeregister(conn,
                                                    args->callbackID) < 0)
         goto cleanup;
=20
@@ -6688,15 +6508,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)
@@ -6724,13 +6541,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",
@@ -6743,7 +6557,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,
@@ -6837,17 +6651,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,
@@ -6905,22 +6717,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
@@ -6930,7 +6740,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)
@@ -6992,15 +6802,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,
@@ -7029,19 +6836,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)
@@ -7226,15 +7031,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)
@@ -7272,15 +7074,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)
@@ -7311,15 +7110,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 Tue May  7 11:08:10 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=1563897934; cv=none;
	d=zoho.com; s=zohoarc;
	b=j6DCuBZR4gA8DMyLi5gnli6RMjAOzxB7upA2CAtc1ZjtVToc2Pyxq2JIr0kJZc4zXxolAwGz9DSB0oujbv7lso15j9WvpPxvjHyADh2h5rvfdpx8xZqhIPN7S1hAuIuYL7DhXwW+hqF48ZBB6r5HHjzUj+wx3aqfVUkeifef5iA=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897934;
 h=Content-Type:Content-Transfer-Encoding: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=HdWKRCZ5Hjz5oBS+kqSp2n4ixtNtq1DWv5rVR+AqtyQ=;
	b=ZD+XygUf1MRW1Ss/7xu1KFOws5S5fkdbV+IxtYRw9IZxlL0AUFhd2GVK6N3Tp5rRal2jytvEUIOelf5MPfW5BEt/dnnPo76bX3nx+Fk1Noq1716kXuaagB46xoKc/svRWXBxs7J+fP/gmUhGLOjavOMDAMJrK6V4uFhDZtUlnv4=
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 1563897934237135.41967322663652;
 Tue, 23 Jul 2019 09:05: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 DE4F1308A958;
	Tue, 23 Jul 2019 16:05: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 B276B600D1;
	Tue, 23 Jul 2019 16:05: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 6894219731;
	Tue, 23 Jul 2019 16:05:32 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG5UlG025331 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:30 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 0AEE15C25A; Tue, 23 Jul 2019 16:05:30 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 3490C5C22D;
	Tue, 23 Jul 2019 16:05:29 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:03:14 +0100
Message-Id: <20190723160319.18153-37-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 36/41] 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.41]);
 Tue, 23 Jul 2019 16:05:33 +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.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/remote_daemon.h          |  13 +++
 src/remote/remote_daemon_dispatch.c | 146 ++++++++++++++++++----------
 2 files changed, 109 insertions(+), 50 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 b677bd44ee..f1304695bd 100644
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -1954,18 +1954,35 @@ remoteGetHypervisorConn(virNetServerClientPtr clien=
t)
 }
=20
=20
+static virConnectPtr
+remoteGetSecondaryConn(bool readonly, virConnectPtr *conn, const char *uri)
+{
+    if (!*conn) {
+        if (uri) {
+            VIR_DEBUG("Opening driver %s", uri);
+            if (readonly)
+                *conn =3D virConnectOpenReadOnly(uri);
+            else
+                *conn =3D virConnectOpen(uri);
+            if (!conn)
+                return NULL;
+            VIR_DEBUG("Opened driver %p", *conn);
+        } else {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not=
 open"));
+            return NULL;
+        }
+    }
+
+    return *conn;
+}
+
 static virConnectPtr
 remoteGetInterfaceConn(virNetServerClientPtr client)
 {
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
-    if (!priv->interfaceConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
-        return NULL;
-    }
-
-    return priv->interfaceConn;
+    return remoteGetSecondaryConn(priv->readonly, &priv->interfaceConn, pr=
iv->interfaceURI);
 }
=20
=20
@@ -1975,12 +1992,7 @@ remoteGetNetworkConn(virNetServerClientPtr client)
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
-    if (!priv->networkConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
-        return NULL;
-    }
-
-    return priv->networkConn;
+    return remoteGetSecondaryConn(priv->readonly, &priv->networkConn, priv=
->networkURI);
 }
=20
=20
@@ -1990,12 +2002,7 @@ remoteGetNodeDevConn(virNetServerClientPtr client)
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
-    if (!priv->nodedevConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
-        return NULL;
-    }
-
-    return priv->nodedevConn;
+    return remoteGetSecondaryConn(priv->readonly, &priv->nodedevConn, priv=
->nodedevURI);
 }
=20
=20
@@ -2005,12 +2012,7 @@ remoteGetNWFilterConn(virNetServerClientPtr client)
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
-    if (!priv->nwfilterConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
-        return NULL;
-    }
-
-    return priv->nwfilterConn;
+    return remoteGetSecondaryConn(priv->readonly, &priv->nwfilterConn, pri=
v->nwfilterURI);
 }
=20
=20
@@ -2020,12 +2022,7 @@ remoteGetSecretConn(virNetServerClientPtr client)
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
-    if (!priv->secretConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
-        return NULL;
-    }
-
-    return priv->secretConn;
+    return remoteGetSecondaryConn(priv->readonly, &priv->secretConn, priv-=
>secretURI);
 }
=20
=20
@@ -2035,15 +2032,11 @@ remoteGetStorageConn(virNetServerClientPtr client)
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
-    if (!priv->storageConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
-        return NULL;
-    }
-
-    return priv->storageConn;
+    return remoteGetSecondaryConn(priv->readonly, &priv->storageConn, priv=
->storageURI);
 }
=20
=20
+
 void *remoteClientNew(virNetServerClientPtr client,
                       void *opaque ATTRIBUTE_UNUSED)
 {
@@ -2075,6 +2068,9 @@ remoteDispatchConnectOpen(virNetServerPtr server ATTR=
IBUTE_UNUSED,
     unsigned int flags;
     struct daemonClientPrivate *priv =3D virNetServerClientGetPrivateData(=
client);
     int rv =3D -1;
+#ifndef LIBVIRTD
+    const char *type =3D NULL;
+#endif
=20
     VIR_DEBUG("priv=3D%p conn=3D%p", priv, priv->conn);
     virMutexLock(&priv->lock);
@@ -2093,20 +2089,70 @@ 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);
-
-    if (priv->conn =3D=3D NULL)
-        goto cleanup;
-
-    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);
+    priv->readonly =3D flags & VIR_CONNECT_RO;
+
+    VIR_DEBUG("Opening driver %s", name);
+    if (!(priv->conn =3D priv->readonly ?
+          virConnectOpenReadOnly(name) :
+          virConnectOpen(name)))
+        goto cleanup;
+    VIR_DEBUG("Opened %p", priv->conn);
+
+#ifndef LIBVIRTD
+    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");
+        priv->interfaceURI =3D  getuid() =3D=3D 0 ? "interface:///system" =
: "interface:///session";
+        priv->networkURI =3D getuid() =3D=3D 0 ? "network:///system" : "ne=
twork:///session";
+        priv->nodedevURI =3D  getuid() =3D=3D 0 ? "nodedev:///system" : "n=
odedev:///session";
+        if (getuid() =3D=3D 0)
+            priv->nwfilterURI =3D "nwfilter:///system";
+        priv->secretURI =3D getuid() =3D=3D 0 ? "secret:///system" : "secr=
et:///session";
+        priv->storageURI =3D getuid() =3D=3D 0 ? "storage:///system" : "st=
orage:///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
+         */
+        priv->secretURI =3D getuid() =3D=3D 0 ? "secret:///system" : "secr=
et:///session";
+    } else {
+#endif /* LIBVIRTD */
+        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);
+#ifndef LIBVIRTD
+    }
+#endif /* LIBVIRTD */
=20
     /* force update the @readonly attribute which was inherited from the
      * virNetServerService object - this is important for sockets that are=
 RW
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Tue May  7 11:08:10 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=1563897937; cv=none;
	d=zoho.com; s=zohoarc;
	b=Z9BHSou0zwDjwaBkQ2X1Nnn6568fRqTSQfgXtemz0HKWhruYih3Un1dT5dA0nH/KrZ3aLX5dpWUOQWKsaJgOG6w3cYlRcVltxL6KcNtYhxdwGP/vCT5SgTDM3Eml7hwyv9jxtdt8ErYDydGqdUYifGcxDeSNPkpU94+bN1L5nZs=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897937;
 h=Content-Type:Content-Transfer-Encoding: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=mG6ktlfunzGiNQDeoMcX00JL0mrH0IbRxaKe+xofY6g=;
	b=V3F1zink/DAdl3v3OC9OQUfTzEJ52jQbW2wUExIn2pHzdh17LxeWywI/fSXiyU9Rbpo6ICG+getelOQ2pLNujshBk/72rH2mHaG6u5gdJOT5D/mamTUfE3Y/Xu2jAwXtS0N2yuaUwS8YesD9/UOfkfLaRfVIMl6ehFYToq2wqDE=
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 1563897937793256.2404896641402;
 Tue, 23 Jul 2019 09:05:37 -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 AAB3630860CF;
	Tue, 23 Jul 2019 16:05: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 7BBDF60497;
	Tue, 23 Jul 2019 16:05: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 3C6B418045D4;
	Tue, 23 Jul 2019 16:05:36 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG5V82025359 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:31 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 980855C69A; Tue, 23 Jul 2019 16:05:31 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 5F9895C652;
	Tue, 23 Jul 2019 16:05:30 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:03:15 +0100
Message-Id: <20190723160319.18153-38-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 37/41] 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.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.44]);
 Tue, 23 Jul 2019 16:05:37 +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.

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

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 7b4f6a10bc..7f67495a0d 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -236,6 +236,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 f1304695bd..964d5d8347 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
@@ -2057,6 +2058,126 @@ 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;
+
+            if (!(daemonname =3D virFileFindResource("virtqemud", "src", B=
INDIR)))
+                return -1;
+
+            if (!virFileExists(daemonname)) {
+                VIR_DEBUG("Missing daemon %s for driver %s", daemonname, d=
rivers[i]);
+                continue;
+            }
+
+            if (virAsprintf(probeduri, "%s:///session", drivers[i]) < 0)
+                return -1;
+
+            VIR_DEBUG("Probed URI %s via sock %s", *probeduri, daemonname);
+            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,
@@ -2065,6 +2186,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;
@@ -2091,7 +2215,16 @@ remoteDispatchConnectOpen(virNetServerPtr server ATT=
RIBUTE_UNUSED,
=20
     priv->readonly =3D flags & VIR_CONNECT_RO;
=20
-    VIR_DEBUG("Opening driver %s", name);
+#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->conn =3D priv->readonly ?
           virConnectOpenReadOnly(name) :
           virConnectOpen(name)))
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Tue May  7 11:08:10 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=1563897941; cv=none;
	d=zoho.com; s=zohoarc;
	b=IJxJLNJvZtQuyC/v1wCI5L4imCz2oR9QQOdYvtmd6tu8LloxZkO5ZdigCb5QT50Vt0I+rCN1VOZ+NCIjwfuqDFkJSQUIoPdHLV+NQlAaDi+ahkRafa6N0mcwKeJ/kzdCjcoASLj21Xig2HBmcfU9hYtARRrv6Yth9jknKEjAqIQ=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897941;
 h=Content-Type:Content-Transfer-Encoding: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=q+v+wOeC45LbH5oA9G6FKN2FjgRO6Rl50jJt7NWohBE=;
	b=VxXu6w2ZjyizSZyZPEix6EN+yzKWV+ZL1mJghIFawxNECDL9xFJkuN76WRAka2hfGRB9eEdgRzJSG6kcvBRTFatz0nFrplsagbZCpm6J5vVKgJn34ANUrLXojwb4S+i7QhpZ81YmTFyrvwbz2OIQjC9+1X3qUOGMbzTb7GqZD0g=
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 1563897941651554.2188173569261;
 Tue, 23 Jul 2019 09:05:41 -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 4DDC930860BE;
	Tue, 23 Jul 2019 16:05: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 1DCAB19C6A;
	Tue, 23 Jul 2019 16:05: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 C3A9518045D2;
	Tue, 23 Jul 2019 16:05:39 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG5WxK025381 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:32 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id CE8AE5C22D; Tue, 23 Jul 2019 16:05:32 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 0843A5C234;
	Tue, 23 Jul 2019 16:05:31 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:03:16 +0100
Message-Id: <20190723160319.18153-39-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 38/41] 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.44]);
 Tue, 23 Jul 2019 16:05:40 +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.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/remote/remote_driver.c | 112 ++++++++++++++++++-------------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index e04bb3153d..0500998502 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -49,11 +49,29 @@
 #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 { \
@@ -174,10 +192,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;
@@ -776,15 +801,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
@@ -813,42 +830,25 @@ 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 {
-                virReportError(VIR_ERR_INVALID_ARG, "%s",
-                               _("remote_open: transport in URL not recogn=
ised "
-                                 "(should be tls|unix|ssh|ext|tcp|libssh2|=
libssh)"));
+            if ((transport =3D remoteDriverTransportTypeFromString(transpo=
rt_str)) < 0)
+                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
     /*
@@ -859,7 +859,7 @@ doRemoteOpen(virConnectPtr conn,
      * not require any external libraries or command execution
      */
     if (virIsSUID() &&
-        transport !=3D trans_unix) {
+        transport !=3D REMOTE_DRIVER_TRANSPORT_UNIX) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("Only Unix socket URI transport is allowed in set=
uid mode"));
         return VIR_DRV_OPEN_ERROR;
@@ -870,10 +870,10 @@ doRemoteOpen(virConnectPtr conn,
     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 */
@@ -957,7 +957,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;
@@ -966,7 +966,7 @@ doRemoteOpen(virConnectPtr conn,
     VIR_DEBUG("Connecting with transport %d", transport);
     /* Connect to the remote service. */
     switch (transport) {
-    case trans_tls:
+    case REMOTE_DRIVER_TRANSPORT_TLS:
         if (conf && !tls_priority &&
             virConfGetValueString(conf, "tls_priority", &tls_priority) < 0)
             goto failed;
@@ -989,7 +989,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;
@@ -1004,7 +1004,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) {
@@ -1039,7 +1039,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) {
@@ -1075,7 +1075,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();
@@ -1101,7 +1101,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
@@ -1133,7 +1133,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;
@@ -1145,9 +1145,9 @@ 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"));
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Tue May  7 11:08:10 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=1563897945; cv=none;
	d=zoho.com; s=zohoarc;
	b=VYM6Kc0DDnXce1kzzmj+YihwTUdtavLiZlkit42oRbQIjUBY2U0Dn4BrPa25RQRIEGmTXlRAKCvh/B8JBFnJiERLjXXhyGTSZ35m6RtLm8yQLu5X4xHHU0mDL3lnlTSwIrESDdZ0A+EVaz74rZsRdTR8OH+IhMXCWkINwAk1lO4=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897945;
 h=Content-Type:Content-Transfer-Encoding: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=LTRYfv1mg/yPZ77WUBjyGvrdgo8y4Zx09KVdqsujBSI=;
	b=e45Qxym0JYoSy3eomOQv/w29fZGh52RFMvYiaP4b8bvT2yGS0uRKIU8F2nKSQ60zaGdGT5ZDNlUYwWbawgkvZBPYb7KafUPrLpg2f9lB85M3PyhXHtTbUTiuhd/AdVeuYJUGCzWexPcW4BRhgfEja9d4A0nLj5JRPX6N+wGDwXw=
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 1563897945031945.3856977732509;
 Tue, 23 Jul 2019 09:05:45 -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 DE908C0A4F6F;
	Tue, 23 Jul 2019 16:05: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 AF2D25C28C;
	Tue, 23 Jul 2019 16:05:43 +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 6E6CD18045D1;
	Tue, 23 Jul 2019 16:05:43 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG5YhX025427 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:34 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 8F4705C28C; Tue, 23 Jul 2019 16:05:34 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 6D3305C25A;
	Tue, 23 Jul 2019 16:05:32 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:03:17 +0100
Message-Id: <20190723160319.18153-40-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 39/41] 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.16
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]);
 Tue, 23 Jul 2019 16:05:44 +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.

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

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 0500998502..6dc282c139 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -739,34 +739,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);
+
+    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;
@@ -964,6 +965,17 @@ doRemoteOpen(virConnectPtr conn,
     }
=20
     VIR_DEBUG("Connecting with transport %d", transport);
+
+    if ((transport =3D=3D REMOTE_DRIVER_TRANSPORT_UNIX ||
+         transport =3D=3D REMOTE_DRIVER_TRANSPORT_SSH ||
+         transport =3D=3D REMOTE_DRIVER_TRANSPORT_LIBSSH ||
+         transport =3D=3D REMOTE_DRIVER_TRANSPORT_LIBSSH2) &&
+        !sockname &&
+        !(sockname =3D remoteGetUNIXSocket(transport, flags)))
+        goto failed;
+
+    VIR_DEBUG("Chosen UNIX socket %s", NULLSTR(sockname));
+
     /* Connect to the remote service. */
     switch (transport) {
     case REMOTE_DRIVER_TRANSPORT_TLS:
@@ -1005,20 +1017,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,
@@ -1040,20 +1038,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,
@@ -1076,15 +1060,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,
@@ -1105,20 +1080,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 Tue May  7 11:08:10 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=1563897941; cv=none;
	d=zoho.com; s=zohoarc;
	b=QMsOLGBv4NPy8JyRnkqMVCnbN993C4HRqIIK5ZRtd/t9QyLAtIbYTQ5WTBceQeWX1AtZUZdAK948EzSKy9EHZN/fM4kJt6tgYDEC+MDJoiSYzAIZ0cM71OxA5b2AgvfFe3oU/Zf9aNHwYEohRRwYI/3gDeFc+x3OhezI7W346KI=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897941;
 h=Content-Type:Content-Transfer-Encoding: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=iOqw1IheZzz8r8KEdMD+NiVIuRLBDIVVBZd9SpsSpqU=;
	b=HdDbe9cgHO7WtGk8eV/k13vBrLdRQh8ksKUHxtn+7YytNv5CJ/Ekty7METiXLsHfVfcHuHza0LAtZNQY4ejL1It4sAJ1NhNTX5ymRrwzSImwz46HRnbCSH37KLbnJEfqjMtz+L4JHo+8nZvnGCUZe382eycqgzDylCxwRlZePbE=
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 1563897941468589.8944077554651;
 Tue, 23 Jul 2019 09:05:41 -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 4B347335C7;
	Tue, 23 Jul 2019 16:05:40 +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 1A4D619C58;
	Tue, 23 Jul 2019 16:05: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 C778F19721;
	Tue, 23 Jul 2019 16:05:39 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG5aPT025455 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:36 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 09A105C234; Tue, 23 Jul 2019 16:05:36 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 210255F9C3;
	Tue, 23 Jul 2019 16:05:34 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:03:18 +0100
Message-Id: <20190723160319.18153-41-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 40/41] remote: switch to connect to per-driver
	daemons by default
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]);
 Tue, 23 Jul 2019 16:05:40 +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 causes the remote driver to prefer connecting 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 direct mode.

In RPM builds this is overriden, because before we can default to the
new daemons, we must get SELinux policy written & the timeframe for that
is unclear at this stage.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 libvirt.spec.in            |   1 +
 m4/virt-driver-remote.m4   |  15 +++
 src/driver.h               |   2 +
 src/libvirt.c              |  24 +++++
 src/remote/remote_driver.c | 207 ++++++++++++++++++++++++++++++++-----
 src/remote/remote_driver.h |   3 -
 6 files changed, 226 insertions(+), 26 deletions(-)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 3e897459f1..be4bbdfa1f 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..67ba580446 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], [d=
irect])
 ])
=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 4d6def2e0a..22efd4da95 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -601,6 +601,30 @@ 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, 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 6dc282c139..667a92714f 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -72,6 +72,22 @@ VIR_ENUM_IMPL(remoteDriverTransport,
               REMOTE_DRIVER_TRANSPORT_LAST,
               "tls", "unix", "ssh", "libssh2", "ext", "tcp", "libssh");
=20
+typedef enum {
+    /* Prefer per-driver virt*d daemons, but fallback to legacy libvirtd */
+    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 { \
@@ -92,6 +108,7 @@ VIR_ENUM_IMPL(remoteDriverTransport,
=20
 static bool inside_daemon;
=20
+
 struct private_data {
     virMutex lock;
=20
@@ -740,11 +757,12 @@ remoteConnectSupportsFeatureUnlocked(virConnectPtr co=
nn,
=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);
+    VIR_AUTOFREE(char *) userdir =3D NULL;
=20
     if (flags & VIR_DRV_OPEN_REMOTE_USER) {
         if (transport !=3D REMOTE_DRIVER_TRANSPORT_UNIX) {
@@ -758,21 +776,126 @@ 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;
+        }
+    }
+
+    if (mode =3D=3D REMOTE_DRIVER_MODE_LEGACY) {
+        sock_name =3D legacy_sock_name;
+        legacy_sock_name =3D NULL;
+        *daemon =3D legacy_daemon;
+        legacy_daemon =3D NULL;
+    } else if (mode =3D=3D 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;
+        }
+
+        sock_name =3D direct_sock_name;
+        direct_sock_name =3D NULL;
+        *daemon =3D direct_daemon;
+        direct_daemon =3D NULL;
+    } else {
+        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 (virGetEnvBlockSUID("VIRTD_PATH") !=3D NULL) {
+        return "VIRTD_PATH";
+    } else {
+        return "LIBVIRTD_PATH";
+    }
+}
+#endif /* WIN32 */
+
+
 /*
  * URIs that this driver needs to handle:
  *
@@ -819,11 +942,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 */
@@ -908,7 +1040,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
@@ -955,6 +1087,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. */
@@ -971,7 +1118,8 @@ doRemoteOpen(virConnectPtr conn,
          transport =3D=3D REMOTE_DRIVER_TRANSPORT_LIBSSH ||
          transport =3D=3D REMOTE_DRIVER_TRANSPORT_LIBSSH2) &&
         !sockname &&
-        !(sockname =3D remoteGetUNIXSocket(transport, flags)))
+        !(sockname =3D remoteGetUNIXSocket(transport, mode, driver_str,
+                                         &daemon_name, flags)))
         goto failed;
=20
     VIR_DEBUG("Chosen UNIX socket %s", NULLSTR(sockname));
@@ -1060,13 +1208,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,
@@ -1177,7 +1327,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)
@@ -1279,9 +1429,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
From nobody Tue May  7 11:08:10 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=1563897948; cv=none;
	d=zoho.com; s=zohoarc;
	b=GxnEwCUTmLlAC6+vErmau5h2ZNzTLaiV8kpDqErXlJqBG/cZX5Hnflov7Zst7Ng2TmL+6cCJKUI2NcBrejooNf9eVAn92LVY8e248HSq+3foB5CE7q5hWn/luQJS6TozLarDnuBtwZd8qK8ZGKTUoCRAZMc3lUaTfSAnZcKayLk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1563897948;
 h=Content-Type:Content-Transfer-Encoding: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=KRCsmVM3RuHWU3HIvAZT3GgMb5lvly5tYCUAG3oz7Yw=;
	b=PFs5nw6R2/+hiLsgkNwdQcVHCFAdOboeoUdH0JWUGeLEVkiUd+8vx9LcQW4qO5TmXaAab80/KbfaAP4rOsNpiwHbeeZs3yfaBQLVMXrcI8QMgfhAOCgxHPb0Fhcj9fzQkvN7pLWz27l0SMBTon7yfcoCLMrvSOQuyhsgkg9KXNI=
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 156389794899045.895506382023086;
 Tue, 23 Jul 2019 09:05:48 -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 D30B0C065129;
	Tue, 23 Jul 2019 16:05:47 +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 AAAA95D9C5;
	Tue, 23 Jul 2019 16:05: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 6F4651972E;
	Tue, 23 Jul 2019 16:05:47 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6NG5bUb025480 for <libvir-list@listman.util.phx.redhat.com>;
	Tue, 23 Jul 2019 12:05:37 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 6E26B5C234; Tue, 23 Jul 2019 16:05:37 +0000 (UTC)
Received: from localhost.localdomain.com (unknown [10.36.112.10])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 82B165C559;
	Tue, 23 Jul 2019 16:05:36 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Tue, 23 Jul 2019 17:03:19 +0100
Message-Id: <20190723160319.18153-42-berrange@redhat.com>
In-Reply-To: <20190723160319.18153-1-berrange@redhat.com>
References: <20190723160319.18153-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 41/41] libvirt: correctly print out URI returned
	from probing
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.31]);
 Tue, 23 Jul 2019 16:05:48 +0000 (UTC)

Turning a NULL URI instead the empty string is very misleading when
reading the debug logs as the distinction between the two is
functionally important.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/libvirt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libvirt.c b/src/libvirt.c
index 22efd4da95..7055f8e317 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -920,7 +920,7 @@ virConnectOpenInternal(const char *name,
                         goto failed;
                     VIR_DEBUG("%s driver URI probe returned '%s'",
                               virConnectDriverTab[i]->hypervisorDriver->na=
me,
-                              NULLSTR_EMPTY(uristr));
+                              NULLSTR(uristr));
                 }
             }
         }
--=20
2.21.0

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