From nobody Wed May  8 00:05:16 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=1564420316; cv=none;
	d=zoho.com; s=zohoarc;
	b=nFpR3I6HtXNnszvnOgOFBiCIWAaXpq3ufhLESUrAdlejMHj5OdvWG+Av1A5ocjitYfXrb7wMZq+GOgFZtpvkVP+Bl/Mdtc7TTUuFiQTzUnj8eLXpeTdekXZyvETpAMcSRm21pTTrxlJ9GMWbjhWrO8COxjRHg6d4rgKZRFxgPwk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420316;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=nOyXoWREzGvYN7zFmOtaX+rMUEjBwb14VK40VHmkT04=;
	b=M+27ZwIDO+H4M4NEJicWN6moIIOAgZm54KIdsGCy+CVcQlmD+qFOTuUYvEmURL7UOwjer3WlHlk1PsBX4Qj8wkM5wa2APByoAJbdH7xX2eqiYpBYG5PSPi1Roi5Iy5SQvjzSwiGbQgFDgoClVAbMKtVMBm+GompBZOktzcB80HE=
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 1564420316685785.7275210332124;
 Mon, 29 Jul 2019 10:11:56 -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 C35AB3179164;
	Mon, 29 Jul 2019 17:11:53 +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 99A255D6A0;
	Mon, 29 Jul 2019 17:11:53 +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 5BCF5180BA98;
	Mon, 29 Jul 2019 17:11:53 +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 x6THBZYP026989 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:11:35 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 5BCC85C219; Mon, 29 Jul 2019 17:11:35 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 0C6EC5C1A1;
	Mon, 29 Jul 2019 17:11:33 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:10:43 +0100
Message-Id: <20190729171130.25484-2-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 01/48] 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.15
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]);
 Mon, 29 Jul 2019 17:11:54 +0000 (UTC)

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

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

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

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420302; cv=none;
	d=zoho.com; s=zohoarc;
	b=ZKtvx6pr1Ve5XvDGpOjJsyb/l62N4VnK7jvmqEiVmKJdFDcSOohK7I5VbtIEcHqcocM8ilmob+mJW+kGQmI6Um5noJd6CqLhd7Mui/u+E/qr5DTlyUoqD+ZbzTaN6HaFyDSVR8cdOY6WK00Jgu84TxKF8fRy8oVYlekHbAsUK5g=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420302;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=qBBooL8fg9f2vuIeL9hDDBSuebUehfcWQexV2WoZ3Ec=;
	b=HHKBdbOEbSonmSkSMLaZuJ688IrgN/dZc5hkriAaELFNxE+EW756Gr9caAOhvoGDXGxUtWJm6JpT3KhdExHdpx2Dm9hWiT9MCUZf99peibdyxR37PuPwy8tgrci/RfFQtAWLxzfffbDLZc+ng5szJKrBzfhbUWDm0cfdm54GVOY=
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 1564420302865112.33862324407517;
 Mon, 29 Jul 2019 10:11:42 -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 45AB459465;
	Mon, 29 Jul 2019 17:11:41 +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 10D07600CC;
	Mon, 29 Jul 2019 17:11:41 +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 E857A1806B01;
	Mon, 29 Jul 2019 17:11:38 +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 x6THBall027146 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:11:36 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id ADC105C206; Mon, 29 Jul 2019 17:11:36 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id ACE805C1A1;
	Mon, 29 Jul 2019 17:11:35 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:10:44 +0100
Message-Id: <20190729171130.25484-3-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 02/48] build: collapse rules adding augeas
	tests to CLEANFILES
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]);
 Mon, 29 Jul 2019 17:11:42 +0000 (UTC)

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

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

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

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420303; cv=none;
	d=zoho.com; s=zohoarc;
	b=DZnUAXpTIBm+ta7wx/KOoWg+Ly5YDG4hnTHMBlU70KMbLNcIO1z0+Tz+ctpEza01GDJM/bzVHPUpuT+HschJte0G9gSabcgUrPT+iFdNMtA+StB6qYVVOqUTqBflj3U171OvvzuZajL8FGH+ghoo8kRC9icJp5MXz5/sTdwk4XM=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420303;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=yFJHctEnsxn6H7GJTejj8njhvsJKvUCnBDbHSSpuzR0=;
	b=MxuZ25qMcRflgTniCsdlsKwZ8y6UurrDMfXpIj3sAqUOVTvaN5asy04D3BVZlb+6fL7NCs6UtQTRITr635hqxxv0IFo6O8Vk6MB+ye90QEETanOyVwiUgJikKLAmIibFHmYZZLDDbPyxSTX1arGDyQh1oeh++EBXqQsq20FQjsw=
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 1564420302956248.37060962542137;
 Mon, 29 Jul 2019 10:11:42 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
 [10.5.11.12])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 49B7A30001D8;
	Mon, 29 Jul 2019 17:11:41 +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 00A1B60BF3;
	Mon, 29 Jul 2019 17:11: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 EC99318089C8;
	Mon, 29 Jul 2019 17:11:38 +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 x6THBcCQ027166 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:11:38 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 405AA5C21A; Mon, 29 Jul 2019 17:11:38 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 204795C1A1;
	Mon, 29 Jul 2019 17:11:36 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:10:45 +0100
Message-Id: <20190729171130.25484-4-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 03/48] build: create all augeas test files in
	same dir as their source
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]);
 Mon, 29 Jul 2019 17:11:42 +0000 (UTC)

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

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                  |  8 +++++---
 src/bhyve/Makefile.inc.am   |  8 ++++----
 src/libxl/Makefile.inc.am   |  8 ++++----
 src/locking/Makefile.inc.am | 29 +++++++++++++----------------
 src/logging/Makefile.inc.am |  8 ++++----
 src/lxc/Makefile.inc.am     |  8 ++++----
 src/qemu/Makefile.inc.am    |  8 ++++----
 src/remote/Makefile.inc.am  |  8 ++++----
 8 files changed, 42 insertions(+), 43 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..0aef5e17c7 100644
--- a/src/bhyve/Makefile.inc.am
+++ b/src/bhyve/Makefile.inc.am
@@ -49,17 +49,17 @@ libvirt_driver_bhyve_impl_la_SOURCES =3D $(BHYVE_DRIVER=
_SOURCES)
=20
 conf_DATA +=3D bhyve/bhyve.conf
 augeas_DATA +=3D bhyve/libvirtd_bhyve.aug
-augeastest_DATA +=3D test_libvirtd_bhyve.aug
+augeastest_DATA +=3D bhyve/test_libvirtd_bhyve.aug
=20
 AUGEAS_DIRS +=3D bhyve
=20
-test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.aug.in \
+bhyve/test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.aug.in \
 		$(srcdir)/bhyve/bhyve.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/bhyve/bhyve.conf $< > $@
=20
-check-augeas-bhyve: test_libvirtd_bhyve.aug
+check-augeas-bhyve: bhyve/test_libvirtd_bhyve.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/bhyve test_libvirtd_bhyve.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/bhyve bhyve/test_libvirtd_bhyve.aug; \
 	fi
=20
 endif WITH_BHYVE
diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index cfe136f07e..e73f34db8e 100644
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -67,17 +67,17 @@ libvirt_driver_libxl_impl_la_SOURCES =3D $(LIBXL_DRIVER=
_SOURCES)
=20
 conf_DATA +=3D libxl/libxl.conf
 augeas_DATA +=3D libxl/libvirtd_libxl.aug
-augeastest_DATA +=3D test_libvirtd_libxl.aug
+augeastest_DATA +=3D libxl/test_libvirtd_libxl.aug
=20
 AUGEAS_DIRS +=3D libxl
=20
-test_libvirtd_libxl.aug: libxl/test_libvirtd_libxl.aug.in \
+libxl/test_libvirtd_libxl.aug: libxl/test_libvirtd_libxl.aug.in \
 		$(srcdir)/libxl/libxl.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/libxl/libxl.conf $< > $@
=20
-check-augeas-libxl: test_libvirtd_libxl.aug
+check-augeas-libxl: libxl/test_libvirtd_libxl.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/libxl test_libvirtd_libxl.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/libxl libxl/test_libvirtd_libxl.aug; \
 	fi
=20
 INSTALL_DATA_DIRS +=3D libxl
diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index 2c53cff190..0f284faf25 100644
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -114,7 +114,7 @@ lockd_la_CFLAGS +=3D \
 endif WITH_SASL
=20
 if WITH_QEMU
-augeastest_DATA +=3D test_libvirt_lockd.aug
+augeastest_DATA +=3D locking/test_libvirt_lockd.aug
 nodist_conf_DATA +=3D locking/qemu-lockd.conf
 BUILT_SOURCES +=3D locking/qemu-lockd.conf
 DISTCLEANFILES +=3D locking/qemu-lockd.conf
@@ -169,7 +169,7 @@ sanlock_la_LIBADD =3D -lsanlock_client libvirt.la ../gn=
ulib/lib/libgnu.la
 augeas_DATA +=3D locking/libvirt_sanlock.aug
=20
 if WITH_QEMU
-augeastest_DATA +=3D test_libvirt_sanlock.aug
+augeastest_DATA +=3D locking/test_libvirt_sanlock.aug
 nodist_conf_DATA +=3D locking/qemu-sanlock.conf
 BUILT_SOURCES +=3D locking/qemu-sanlock.conf
 DISTCLEANFILES +=3D locking/qemu-sanlock.conf
@@ -201,8 +201,7 @@ man8_MANS +=3D virtlockd.8
 conf_DATA +=3D locking/virtlockd.conf
=20
 augeas_DATA +=3D locking/virtlockd.aug
-augeastest_DATA +=3D test_virtlockd.aug
-
+augeastest_DATA +=3D locking/test_virtlockd.aug
=20
 INSTALL_DATA_DIRS +=3D locking
=20
@@ -224,13 +223,13 @@ endif WITH_SANLOCK
=20
 if WITH_SANLOCK
 if WITH_QEMU
-test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \
+locking/test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \
 		locking/qemu-sanlock.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< > $@
=20
-check-augeas-sanlock: test_libvirt_sanlock.aug
+check-augeas-sanlock: locking/test_libvirt_sanlock.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_sanlock.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/locking locking/test_libvirt_sanlock.aug; \
 	fi
 else ! WITH_QEMU
 check-augeas-sanlock:
@@ -240,29 +239,27 @@ check-augeas-sanlock:
 endif ! WITH_SANLOCK
=20
 if WITH_QEMU
-test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \
+locking/test_libvirt_lockd.aug: locking/test_libvirt_lockd.aug.in \
 		locking/qemu-lockd.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) locking/qemu-lockd.conf $< > $@
-else ! WITH_QEMU
-test_libvirt_lockd.aug:
-endif ! WITH_QEMU
+endif WITH_QEMU
=20
-test_virtlockd.aug: locking/test_virtlockd.aug.in \
+locking/test_virtlockd.aug: locking/test_virtlockd.aug.in \
 		locking/virtlockd.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/locking/virtlockd.conf $< > $@
=20
 if WITH_QEMU
-check-augeas-lockd: test_libvirt_lockd.aug
+check-augeas-lockd: locking/test_libvirt_lockd.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/locking test_libvirt_lockd.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/locking locking/test_libvirt_lockd.aug; \
 	fi
 else ! WITH_QEMU
 check-augeas-lockd:
 endif ! WITH_QEMU
=20
-check-augeas-virtlockd: test_virtlockd.aug
+check-augeas-virtlockd: locking/test_virtlockd.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/locking test_virtlockd.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/locking locking/test_virtlockd.aug; \
 	fi
=20
 AUGEAS_DIRS +=3D locking
diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am
index bf89c47b3b..58a139ec2f 100644
--- a/src/logging/Makefile.inc.am
+++ b/src/logging/Makefile.inc.am
@@ -95,17 +95,17 @@ endif WITH_SASL
 conf_DATA +=3D logging/virtlogd.conf
=20
 augeas_DATA +=3D logging/virtlogd.aug
-augeastest_DATA +=3D test_virtlogd.aug
+augeastest_DATA +=3D logging/test_virtlogd.aug
=20
-test_virtlogd.aug: logging/test_virtlogd.aug.in \
+logging/test_virtlogd.aug: logging/test_virtlogd.aug.in \
 		logging/virtlogd.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/logging/virtlogd.conf $< > $@
=20
 AUGEAS_DIRS +=3D logging
=20
-check-augeas-logging: test_virtlogd.aug
+check-augeas-logging: logging/test_virtlogd.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/logging test_virtlogd.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/logging logging/test_virtlogd.aug; \
 	fi
=20
 endif WITH_LIBVIRTD
diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index df8d5db110..f011d90e95 100644
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -156,17 +156,17 @@ endif
 conf_DATA +=3D lxc/lxc.conf
=20
 augeas_DATA +=3D lxc/libvirtd_lxc.aug
-augeastest_DATA +=3D test_libvirtd_lxc.aug
+augeastest_DATA +=3D lxc/test_libvirtd_lxc.aug
=20
 AUGEAS_DIRS +=3D lxc
=20
-test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \
+lxc/test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \
 		$(srcdir)/lxc/lxc.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/lxc/lxc.conf $< > $@
=20
-check-augeas-lxc: test_libvirtd_lxc.aug
+check-augeas-lxc: lxc/test_libvirtd_lxc.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/lxc test_libvirtd_lxc.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/lxc lxc/test_libvirtd_lxc.aug; \
 	fi
=20
 INSTALL_DATA_DIRS +=3D lxc
diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index 69aaeb46c2..750b8a5c85 100644
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -115,17 +115,17 @@ endif WITH_DTRACE_PROBES
 conf_DATA +=3D qemu/qemu.conf
=20
 augeas_DATA +=3D qemu/libvirtd_qemu.aug
-augeastest_DATA +=3D test_libvirtd_qemu.aug
+augeastest_DATA +=3D qemu/test_libvirtd_qemu.aug
=20
 AUGEAS_DIRS +=3D qemu
=20
-test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in \
+qemu/test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in \
 		$(srcdir)/qemu/qemu.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/qemu/qemu.conf $< > $@
=20
-check-augeas-qemu: test_libvirtd_qemu.aug
+check-augeas-qemu: qemu/test_libvirtd_qemu.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/qemu test_libvirtd_qemu.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/qemu qemu/test_libvirtd_qemu.aug; \
 	fi
=20
 INSTALL_DATA_DIRS +=3D qemu
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 7d5c90cff1..18519b129d 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -126,7 +126,7 @@ sbin_PROGRAMS +=3D libvirtd
=20
 augeas_DATA +=3D remote/libvirtd.aug
=20
-augeastest_DATA +=3D test_libvirtd.aug
+augeastest_DATA +=3D remote/test_libvirtd.aug
=20
 conf_DATA +=3D remote/libvirtd.conf
=20
@@ -186,13 +186,13 @@ uninstall-data-remote:
=20
 AUGEAS_DIRS +=3D remote
=20
-test_libvirtd.aug: remote/test_libvirtd.aug.in \
+remote/test_libvirtd.aug: remote/test_libvirtd.aug.in \
 		remote/libvirtd.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/remote/libvirtd.conf $< > $@
=20
-check-augeas-remote: test_libvirtd.aug
+check-augeas-remote: remote/test_libvirtd.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/remote test_libvirtd.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/remote remote/test_libvirtd.aug; \
 	fi
=20
 if WITH_SYSCTL
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420315; cv=none;
	d=zoho.com; s=zohoarc;
	b=daNfQzr6T3jJ/jNGC2aznbPjG/+HntawR/TA7+UPwgKW1dXc9P4aikcZtQV1x4SgttYYy2RgYIO7dQYphaqRyHglbNAZ/O+JVJGMDoBeEYF8Ks0WqE4SDQoca58RCZhPmmhEu29iIn+f8DgVk9JEEfzBjxgrf9SvgY5p35M+24s=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420315;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=+bSMAOEC4gosjW7Cz9sy4RmdJySYx1yvTIq3ZgD41yc=;
	b=hN0wdETKHdz0LhTFPiFX3scRTcUo0rg3B0kyBXyShPSfADnSNoh7ETiKsjazUPxmaG+SdS3j/rwvxbWuOKL4zmcyg3hxFFO4SVyvwUhPmu5uRfIxpXgBGy+o4bMjOc6jKRHrMldaHBmaeF3gZ1ofBUQeuxWcncKY9FgxknZNLa0=
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 1564420315242742.3539578256998;
 Mon, 29 Jul 2019 10:11:55 -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 91D0E308FC23;
	Mon, 29 Jul 2019 17:11:53 +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 6938B5DE00;
	Mon, 29 Jul 2019 17:11:53 +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 16ACC1800B74;
	Mon, 29 Jul 2019 17:11:53 +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 x6THBeHW027187 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:11:40 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 0115E5C21A; Mon, 29 Jul 2019 17:11:40 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id E58805C1A1;
	Mon, 29 Jul 2019 17:11:38 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:10:46 +0100
Message-Id: <20190729171130.25484-5-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 04/48] 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.14
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]);
 Mon, 29 Jul 2019 17:11:54 +0000 (UTC)

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

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

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

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

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420314; cv=none;
	d=zoho.com; s=zohoarc;
	b=PlJnQQpmN7OPYXiJkyXB7964OU9RKbBzANig4pVpae//fd3RK5ri7MZPPMuH6MffcP5eC7ZKdUKNif0pTjBrguv0ZORF91mhx7LrsMjuo9O7a7qKoh/g/sHwtou++SHXIrWXFqm9u0v7iepzvYASDoRHgAQ8ti2kq10fP+HJV/Y=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420314;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=fVuTtu7nMONerFpVDM07ZqQbKk1ULnZp+70aAZvgzpM=;
	b=hi41MpZwEeFlPOjDHli9E9ut/KSHujVIvDR527b9fR3IHv7pgGy8mJHsjJIhtNMsPexKh3o7I0Wn646jvsZsszBlnTSD8q8RKSn1IE3pjcoZrZp9bAip49aDK8Bu4RM/+GcnOZH7oXDeeVU5sOl8gszmFtkeDDatzxC45Jr/NCA=
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 1564420314674434.76317437009243;
 Mon, 29 Jul 2019 10:11:54 -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 8E70781F0F;
	Mon, 29 Jul 2019 17:11:53 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 62DE75C21A;
	Mon, 29 Jul 2019 17:11:53 +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 162751972F;
	Mon, 29 Jul 2019 17:11:53 +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 x6THBfVX027197 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:11:41 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id B222E5C219; Mon, 29 Jul 2019 17:11:41 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 7BF1E5C1A1;
	Mon, 29 Jul 2019 17:11:40 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:10:47 +0100
Message-Id: <20190729171130.25484-6-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 05/48] build: centralize rule for handling
	generated config files
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]);
 Mon, 29 Jul 2019 17:11:54 +0000 (UTC)

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

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 6bb33524cf..255e8e2b57 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 Wed May  8 00:05:16 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=1564420319; cv=none;
	d=zoho.com; s=zohoarc;
	b=Jdu0+7XfMh4Mds+WZGI1eM9aoMpI1qOIG/jI/FCUyIFubDDOdcpq4Iyh1L8LBQOPwiJ2eWsGJbrURY8LpRDyZpJMEHQ0ZdlTUKyFPGhHOrKEIeKlnjjxvlT2ZXR++CPP4G3x0Acy4iN8YckrFFh9M+Htw7EBI+A8jnJToln7esU=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420319;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=jlBXm62HMPn/CpB4+XuW3UiZIR3QPR+vBXcIaKy9TjU=;
	b=JODisuiGaf0vmgIqseRH1+xJzIO+lTvP+9WiGWTHwPFTMk0bHcc2Mkw4a+kNEQ3MBquzKHcwZ+7SAgPvAx0hqPDf5O+uzplFjemP4NACPABfJXlfLxq7Fa+BNDvAntnUbop47HS8VxKw5Upaj413dGl9l2PG8dh/AkI69FbAomo=
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 1564420319491861.3954270925557;
 Mon, 29 Jul 2019 10:11:59 -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 13993C001F03;
	Mon, 29 Jul 2019 17:11:58 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id A1CD645D4;
	Mon, 29 Jul 2019 17:11:57 +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 592EA19731;
	Mon, 29 Jul 2019 17:11:57 +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 x6THBhGk027207 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:11:43 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 2CFED5C21A; Mon, 29 Jul 2019 17:11:43 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 2CF235C1A1;
	Mon, 29 Jul 2019 17:11:41 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:10:48 +0100
Message-Id: <20190729171130.25484-7-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 06/48] 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.31]);
 Mon, 29 Jul 2019 17:11:58 +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>
Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
---
 src/remote/remote_daemon.c | 128 ++++++++++++++++++-------------------
 src/remote/remote_driver.h |   1 -
 2 files changed, 64 insertions(+), 65 deletions(-)

diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index d887b7abfb..69385af1c4 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -859,75 +859,75 @@ daemonSetupHostUUID(const struct daemonConfig *config)
     return 0;
 }
=20
+typedef struct {
+    const char *opts;
+    const char *help;
+} virOptionHelp;
+
 /* Print command-line usage. */
 static void
 daemonUsage(const char *argv0, bool privileged)
 {
-    fprintf(stderr,
-            _("\n"
-              "Usage:\n"
-              "  %s [options]\n"
-              "\n"
-              "Options:\n"
-              "  -h | --help            Display program help:\n"
-              "  -v | --verbose         Verbose messages.\n"
-              "  -d | --daemon          Run as a daemon & write PID file.\=
n"
-              "  -l | --listen          Listen for TCP/IP connections.\n"
-              "  -t | --timeout <secs>  Exit after timeout period.\n"
-              "  -f | --config <file>   Configuration file.\n"
-              "  -V | --version         Display version information.\n"
-              "  -p | --pid-file <file> Change name of PID file.\n"
-              "\n"
-              "libvirt management daemon:\n"),
-            argv0);
+    size_t i;
+    virOptionHelp opthelp[] =3D {
+        { "-h | --help", N_("Display program help") },
+        { "-v | --verbose", N_("Verbose messages") },
+        { "-d | --daemon", N_("Run as a daemon & write PID file") },
+        { "-l | --listen", N_("Listen for TCP/IP connections") },
+        { "-t | --timeout <secs>", N_("Exit after timeout period") },
+        { "-f | --config <file>", N_("Configuration file") },
+        { "-V | --version", N_("Display version information") },
+        { "-p | --pid-file <file>", N_("Change name of PID file") },
+    };
=20
-    if (privileged) {
-        fprintf(stderr,
-                _("\n"
-                  "  Default paths:\n"
-                  "\n"
-                  "    Configuration file (unless overridden by -f):\n"
-                  "      %s\n"
-                  "\n"
-                  "    Sockets:\n"
-                  "      %s\n"
-                  "      %s\n"
-                  "\n"
-                  "    TLS:\n"
-                  "      CA certificate:     %s\n"
-                  "      Server certificate: %s\n"
-                  "      Server private key: %s\n"
-                  "\n"
-                  "    PID file (unless overridden by -p):\n"
-                  "      %s/run/libvirtd.pid\n"
-                  "\n"),
-                LIBVIRTD_CONFIGURATION_FILE,
-                LIBVIRTD_PRIV_UNIX_SOCKET,
-                LIBVIRTD_PRIV_UNIX_SOCKET_RO,
-                LIBVIRT_CACERT,
-                LIBVIRT_SERVERCERT,
-                LIBVIRT_SERVERKEY,
-                LOCALSTATEDIR);
-    } else {
-        fprintf(stderr, "%s",
-                _("\n"
-                  "  Default paths:\n"
-                  "\n"
-                  "    Configuration file (unless overridden by -f):\n"
-                  "      $XDG_CONFIG_HOME/libvirt/libvirtd.conf\n"
-                  "\n"
-                  "    Sockets:\n"
-                  "      $XDG_RUNTIME_DIR/libvirt/libvirt-sock\n"
-                  "\n"
-                  "    TLS:\n"
-                  "      CA certificate:     $HOME/.pki/libvirt/cacert.pem=
\n"
-                  "      Server certificate: $HOME/.pki/libvirt/servercert=
.pem\n"
-                  "      Server private key: $HOME/.pki/libvirt/serverkey.=
pem\n"
-                  "\n"
-                  "    PID file:\n"
-                  "      $XDG_RUNTIME_DIR/libvirt/libvirtd.pid\n"
-                  "\n"));
-    }
+    fprintf(stderr, "\n");
+    fprintf(stderr, "%s:\n", _("Usage"));
+    fprintf(stderr, "  %s [%s]\n", argv0, _("options"));
+    fprintf(stderr, "\n");
+
+    fprintf(stderr, "%s:\n", _("Options"));
+    for (i =3D 0; i < ARRAY_CARDINALITY(opthelp); i++)
+        fprintf(stderr, "  %-22s %s\n", opthelp[i].opts, 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) {
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 Wed May  8 00:05:16 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=1564420319; cv=none;
	d=zoho.com; s=zohoarc;
	b=HnWvDZZqJ2XPQR515OZ/6vABfSQMJrmgpwkK5mqQPk4Xdc0S/ETWiT9B3oK7EZIogYxy/SJW/vdxqsqhLrwcT5SIAEcTwod9QaUS3JU6BKffUvISRLLMxE5rHuHZbDHxapW9n/AGAyaa99Gq2ytkkuwGuELa+yohdbebpNOS+JA=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420319;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=aEZJpo9qq/QBJrZ45UOtWsXIVFeGXmpY//xfpC2dgiw=;
	b=LHTDFg9YaoyBZiecKDhqFzzRTQ7BYhTtTtkiiBzyZ+nOzW6bEDmF0StobgnAgqQMvZyIxnkY6QV+GVwPD0VdOCc+PDZsK7e1IiOaybDMpVRrmEN5vx9EL5e0S1eZZp734hZezHQVITHH7LeNn8ek/L0KzBXSysQCxdWCSdZhw14=
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 1564420319465947.1813358349467;
 Mon, 29 Jul 2019 10:11:59 -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 F14072D6A0F;
	Mon, 29 Jul 2019 17:11: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 C8DB460BF3;
	Mon, 29 Jul 2019 17:11:57 +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 8893D1972D;
	Mon, 29 Jul 2019 17:11:57 +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 x6THBiOE027212 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:11:44 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id A9D6E5C21A; Mon, 29 Jul 2019 17:11:44 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 8CFCB5C1A1;
	Mon, 29 Jul 2019 17:11:43 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:10:49 +0100
Message-Id: <20190729171130.25484-8-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 07/48] 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.12
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]);
 Mon, 29 Jul 2019 17:11:58 +0000 (UTC)

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

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
---
 src/remote/Makefile.inc.am |  1 +
 src/remote/remote_daemon.c | 34 +++++++++++++++++++++-------------
 2 files changed, 22 insertions(+), 13 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 69385af1c4..f9d923b357 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -221,19 +221,25 @@ daemonUnixSocketPaths(struct daemonConfig *config,
     char *rundir =3D NULL;
=20
     if (config->unix_sock_dir) {
-        if (virAsprintf(sockfile, "%s/libvirt-sock", config->unix_sock_dir=
) < 0)
+        if (virAsprintf(sockfile, "%s/%s-sock",
+                        SOCK_PREFIX, config->unix_sock_dir) < 0)
             goto cleanup;
=20
         if (privileged) {
-            if (virAsprintf(rosockfile, "%s/libvirt-sock-ro", config->unix=
_sock_dir) < 0 ||
-                virAsprintf(admsockfile, "%s/libvirt-admin-sock", config->=
unix_sock_dir) < 0)
+            if (virAsprintf(rosockfile, "%s/%s-sock-ro",
+                            SOCK_PREFIX, config->unix_sock_dir) < 0 ||
+                virAsprintf(admsockfile, "%s/%s-admin-sock",
+                            SOCK_PREFIX, config->unix_sock_dir) < 0)
                 goto cleanup;
         }
     } else {
         if (privileged) {
-            if (VIR_STRDUP(*sockfile, LOCALSTATEDIR "/run/libvirt/libvirt-=
sock") < 0 ||
-                VIR_STRDUP(*rosockfile, LOCALSTATEDIR "/run/libvirt/libvir=
t-sock-ro") < 0 ||
-                VIR_STRDUP(*admsockfile, LOCALSTATEDIR "/run/libvirt/libvi=
rt-admin-sock") < 0)
+            if (virAsprintf(sockfile, "%s/run/libvirt/%s-sock",
+                            LOCALSTATEDIR, SOCK_PREFIX) < 0 ||
+                virAsprintf(sockfile, "%s/run/libvirt/%s-sock-ro",
+                            LOCALSTATEDIR, SOCK_PREFIX) < 0 ||
+                virAsprintf(sockfile, "%s/run/libvirt/%s-admin-sock",
+                            LOCALSTATEDIR, SOCK_PREFIX) < 0)
                 goto cleanup;
         } else {
             mode_t old_umask;
@@ -248,8 +254,10 @@ daemonUnixSocketPaths(struct daemonConfig *config,
             }
             umask(old_umask);
=20
-            if (virAsprintf(sockfile, "%s/libvirt-sock", rundir) < 0 ||
-                virAsprintf(admsockfile, "%s/libvirt-admin-sock", rundir) =
< 0)
+            if (virAsprintf(sockfile, "%s/%s-sock",
+                            rundir, SOCK_PREFIX) < 0 ||
+                virAsprintf(admsockfile, "%s/%s-admin-sock",
+                            rundir, SOCK_PREFIX) < 0)
                 goto cleanup;
         }
     }
@@ -902,12 +910,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/%s-sock\n",
+            privileged ? LOCALSTATEDIR "/run" : "$XDG_RUNTIME_DIR",
+            SOCK_PREFIX);
     if (privileged)
-        fprintf(stderr, "      %s\n",
-                LOCALSTATEDIR "/run/libvirt/libvirt-sock-ro");
+        fprintf(stderr, "      %s/run/libvirt/%s-sock-ro\n",
+                LOCALSTATEDIR, SOCK_PREFIX);
     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 Wed May  8 00:05:16 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=1564420323; cv=none;
	d=zoho.com; s=zohoarc;
	b=FJS3vyKVnq+tyE7SHQslrUs5BUnT0KtYpbo/OpvrjDrVK8aV7QUcrbFVRwfUDvoRDpZU2AX6siChCvcOKXPc3Zeun60UrnTbOWnxl9UTEsUj2PgYpJZL2TRyhEe2o2ma1Ml8Z2V/j1B13OUpGnEe5NoxiTGU9QLk739oewoukuU=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420323;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=HiZ+AzJMBeKA33/5hGpsK/Ry3EDLfNc0lZzJgluA/i0=;
	b=ZrMC+U7B8+ABY4xA3hpkytYf/TStGGvk4bHX1POkomu83M7KMZO7M0ziNa0aNVsgYjPSm9+lqzSod3vtQsdGymoqeHjiomw1R4m0lr+tlBRsnPcbRFvquiWIU5W6WHEE0RZq9XXkQSz6L+r8BaFp68bVh75bXWC5jq++low3TMo=
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 1564420323665180.74230309868994;
 Mon, 29 Jul 2019 10:12:03 -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 0D6EF3092651;
	Mon, 29 Jul 2019 17:12:02 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id A18753DB6;
	Mon, 29 Jul 2019 17:12:01 +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 53DA8180BA9D;
	Mon, 29 Jul 2019 17:12:01 +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 x6THBkLi027229 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:11:46 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 973D45C22B; Mon, 29 Jul 2019 17:11:46 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 066465C1A1;
	Mon, 29 Jul 2019 17:11:44 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:10:50 +0100
Message-Id: <20190729171130.25484-9-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 08/48] 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.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.43]);
 Mon, 29 Jul 2019 17:12:03 +0000 (UTC)

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

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

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

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420323; cv=none;
	d=zoho.com; s=zohoarc;
	b=QB1ELofVMiVkNaG275UXarFctuUgvhsQO3EJXwEfmhJd/tJicwGUD+BqdcGBP4NO/cNaAvqdGFzdNwxoko44ln1Es6zpiohAxII8FZfzaBv9kzHVvKw7IZceyzy2MoR3j6125bmKBqWVdDRReJedNryFuVpke1F+E26EtrHWIAc=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420323;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=GfPwmPjK3brlxs9l+/5I7QS24tg6BLGuszkKCCQPJeQ=;
	b=HnWDKtRRqVTRNgqaflbcbUcFNvUuJTILKdrSN5NPFy2sMfmqp3plydPVtc+jUm1DtsMF13ZFXOd34F1S4q5AaoaiMOZwC0WnByV3quTliZxsh9BXJAdW3gcI1voB6TgcTc6f7GLb6YG5emhlo9rRLUifo+BW/gmBPVwN0fwSXuQ=
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 1564420323426727.7446714636781;
 Mon, 29 Jul 2019 10:12:03 -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 8F4F630A8853;
	Mon, 29 Jul 2019 17:12:01 +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 4A7573DA5;
	Mon, 29 Jul 2019 17:12:01 +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 F2FB719731;
	Mon, 29 Jul 2019 17:12:00 +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 x6THBmOA027236 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:11:48 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 2C0105C232; Mon, 29 Jul 2019 17:11:48 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 2AF605C219;
	Mon, 29 Jul 2019 17:11:47 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:10:51 +0100
Message-Id: <20190729171130.25484-10-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 09/48] remote: conditionalize driver loading in
	libvirtd daemon
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]);
 Mon, 29 Jul 2019 17:12:02 +0000 (UTC)

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

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

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

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

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

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420326; cv=none;
	d=zoho.com; s=zohoarc;
	b=CWjzlxwOUNbxuG5Nu5P/LnmF0FN+NRPN+CPzKei6F1hjTqN5lZeY8JWZh62idpTY+9gqvTtcj84PAPEd4a52N4E5w9DWxGBjXJLrc4+luXAN4nGlnJVrvPKGmo5WSEEn4/9iXoZvFI/SAoYQnKkfPIoTXAs1+GoOGXFebZJvyME=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420326;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=vnt3PeVHasdrLstvCEkZ0GEF6WGNuzDrF/X0BqMLzCU=;
	b=SqrtntLSwDQHO78Npy07pXbXp160z9mkS6PAF+LQPQJYjjB91HVIC9d44+9tsFGbtcoXsiaPRbnWwhjI3dsV2QfoeKgqy1xjgll3YyMIZpP49kdIZIaX7Y3ubma8t3Tax+5OCPFS7TWWvy0BPyUc4Pve9oTC2rVTlkTnCQepZHk=
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 1564420326656759.8721263323267;
 Mon, 29 Jul 2019 10:12:06 -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 73E1B30BD1C1;
	Mon, 29 Jul 2019 17:12:05 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 494FA10013A1;
	Mon, 29 Jul 2019 17:12:05 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 09E82180BA9F;
	Mon, 29 Jul 2019 17:12:05 +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 x6THBoFi027249 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:11:50 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 2612E5C21A; Mon, 29 Jul 2019 17:11:50 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id BF94B5C1A1;
	Mon, 29 Jul 2019 17:11:48 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:10:52 +0100
Message-Id: <20190729171130.25484-11-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 10/48] remote: conditionalize IP socket usage
	in libvirtd daemon
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]);
 Mon, 29 Jul 2019 17:12:05 +0000 (UTC)

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

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

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

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index b72186109a..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 97621884b0..fadfc7c016 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -381,11 +381,13 @@ static int ATTRIBUTE_NONNULL(3)
 daemonSetupNetworking(virNetServerPtr srv,
                       virNetServerPtr srvAdm,
                       struct daemonConfig *config,
+#ifdef 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;
@@ -397,15 +399,19 @@ daemonSetupNetworking(virNetServerPtr srv,
         { .name =3D DAEMON_NAME ".socket", .family =3D AF_UNIX, .path =3D =
sock_path },
         { .name =3D DAEMON_NAME "-ro.socket", .family =3D AF_UNIX, .path =
=3D sock_path_ro },
         { .name =3D DAEMON_NAME "-admin.socket", .family =3D AF_UNIX, .pat=
h =3D sock_path_adm },
+#ifdef 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;
@@ -470,6 +476,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,
@@ -544,6 +551,7 @@ daemonSetupNetworking(virNetServerPtr srv,
         }
         virObjectUnref(ctxt);
     }
+#endif /* ! ENABLE_IP */
=20
     if (act &&
         virSystemdActivationComplete(act) < 0)
@@ -892,7 +900,9 @@ daemonUsage(const char *argv0, bool privileged)
         { "-h | --help", N_("Display program help") },
         { "-v | --verbose", N_("Verbose messages") },
         { "-d | --daemon", N_("Run as a daemon & write PID file") },
+#ifdef 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") },
@@ -929,6 +939,7 @@ daemonUsage(const char *argv0, bool privileged)
                 LOCALSTATEDIR, SOCK_PREFIX);
     fprintf(stderr, "\n");
=20
+#ifdef ENABLE_IP
     fprintf(stderr, "    %s:\n", _("TLS"));
     fprintf(stderr, "      %s: %s\n",
             _("CA certificate"),
@@ -940,6 +951,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)"));
@@ -966,7 +978,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;
@@ -976,7 +990,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'},
@@ -999,8 +1015,13 @@ int main(int argc, char **argv) {
         int optidx =3D 0;
         int c;
         char *tmp;
+#ifdef ENABLE_IP
+        const char *optstr =3D "ldf:p:t:vVh";
+#else /* ! ENABLE_IP */
+        const char *optstr =3D "df:p:t:vVh";
+#endif /* ! ENABLE_IP */
=20
-        c =3D getopt_long(argc, argv, "ldf:p:t:vVh", opts, &optidx);
+        c =3D getopt_long(argc, argv, optstr, opts, &optidx);
=20
         if (c =3D=3D -1)
             break;
@@ -1015,9 +1036,12 @@ 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
@@ -1331,10 +1355,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..5a54abed85 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,27 @@ 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 Wed May  8 00:05:16 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=1564420320; cv=none;
	d=zoho.com; s=zohoarc;
	b=QKofDk2P3vRgAZ9skOjwMveKXjhstfaerxA+UmcsHPdpmierZkpOM68lyjU1aZv851OqbicJJ1db3krXmy6eTcn1oAO3zo5B33s0aEoWU8lt8CVeLGDmnqLnEmfQPfDQ4chqd2OTUhmw1zVc0NqmQZQShI96bCzq7kG0ujfTuS8=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420320;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=t28VqbpBxAJlT5aQQzcP3/YTa5fbun39SHyY8Ds0yg8=;
	b=gnnZX2AziKBu0voadG8vNUD52Z531NYZW4kqdOAPqGvHQx8XfEhjyyDhUlDcUCmX56lQOe7lCkLYzwBgRtX4jphsxAJmDpDoh3rUlk6oLaC9ynCGAVvmElx+7FF4JkdIoM0R497NUd9+87iegM4LIyzVs4bP8bVSThq6a2bgw5k=
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 1564420320078593.1247524057648;
 Mon, 29 Jul 2019 10:12:00 -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 A89FD8F030;
	Mon, 29 Jul 2019 17:11:58 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 70DC4410E;
	Mon, 29 Jul 2019 17:11:58 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 3789119732;
	Mon, 29 Jul 2019 17:11: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 x6THBpOQ027256 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:11:51 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 907655C21A; Mon, 29 Jul 2019 17:11:51 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 82F715C1A1;
	Mon, 29 Jul 2019 17:11:50 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:10:53 +0100
Message-Id: <20190729171130.25484-12-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 11/48] build: use @CONFIG@ instead of
	::CONFIG:: in augeas tests
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.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.26]);
 Mon, 29 Jul 2019 17:11:59 +0000 (UTC)

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

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

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

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420326; cv=none;
	d=zoho.com; s=zohoarc;
	b=ByeA7h2uLxkuem+qqSFeA07rbPUblLRNepd3kI2rxZiMQVU7S8J14iYtLDT/K6WiJrvwdsIM74eoNmO26t+TBVpZwiBhI3YZuZYmUurzqc1F2LtPDsUOgsoqPyuUDelUhY6Dx66ojdVsjWcsympGo6+5K/WDaIvs1jzahOpVTls=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420326;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=QC7Zp2B1JamWWiiVFpMND6dg58N4zpUYpWjOZTvwZ2Y=;
	b=Ppe7Pq0cUYqyR5wIoyz1dk87Lj4s50zfC/Fa1BZ3A8K7Pi8FsiMTrX0SGCJniPswR7YDr3lRu98eg4VwIDScYiGs9V2nFaVPhz+B7QykBO9Q/r4ls8+XaYYB05CeEm0SIwLLsq7pQ81cJldLEWr73gVII7NgMPNTBpmPwMnUdN0=
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 1564420326870410.7653682978778;
 Mon, 29 Jul 2019 10:12:06 -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 65C3DA3B71;
	Mon, 29 Jul 2019 17:12:05 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 1B2C85C238;
	Mon, 29 Jul 2019 17:12:05 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id B3391180BA9D;
	Mon, 29 Jul 2019 17:12: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 x6THBr9n027273 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:11:53 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 169415C21A; Mon, 29 Jul 2019 17:11:53 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id EDA205C1A1;
	Mon, 29 Jul 2019 17:11:51 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:10:54 +0100
Message-Id: <20190729171130.25484-13-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 12/48] 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.16
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]);
 Mon, 29 Jul 2019 17:12:05 +0000 (UTC)

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

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

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

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420330; cv=none;
	d=zoho.com; s=zohoarc;
	b=E2yO/7nFCsK9o2GsAAVIB5MIIJmg5jF0HZvN2YnAdt4T0dQXvh2WbfcbOIbzcsyMEVPjg3VMpp9RoXMZAH28aWP/88FEG7sMIvrq57tHqNCi1B/3S91jWbAIlyBu3Q7IzQbRmTltIPZieZwDs0U6UdY51trt+bOmnQf+eCxaZ9w=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420330;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=f9SapXz8/T6RsAYEVEYztABaOji9+fuNvWmXXJWCcoo=;
	b=JCCECZBPWCcho+XAQVT6IosEYXVVPbmHgRQypx+qB7smbHQYlQdpGXp8VXXWxw+k1P/8ijFX99q6IUH3elUeqU6S0+dBavWy+59hGqY+4CNPU92lvOAy4G3RGfAD4D/jAjNTSyMQlURtieFf/3yTpSdkzaNhZ4CnpoEXPD1G6eY=
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 1564420330701566.7691714901525;
 Mon, 29 Jul 2019 10:12:10 -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 771DF7EBAE;
	Mon, 29 Jul 2019 17:12:09 +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 507725C206;
	Mon, 29 Jul 2019 17:12: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 0E6A419732;
	Mon, 29 Jul 2019 17:12: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 x6THBt2G027286 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:11:55 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 277D85C219; Mon, 29 Jul 2019 17:11:55 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 859225C1A1;
	Mon, 29 Jul 2019 17:11:53 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:10:55 +0100
Message-Id: <20190729171130.25484-14-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 13/48] 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.16
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]);
 Mon, 29 Jul 2019 17:12:09 +0000 (UTC)

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

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                                   |  1 +
 src/remote/Makefile.inc.am                   | 20 +++++++++++++--
 src/remote/{libvirtd.aug =3D> libvirtd.aug.in} | 26 +++++++++++++-------
 src/remote/test_libvirtd.aug.in              | 12 ++++++---
 4 files changed, 45 insertions(+), 14 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/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 93a7a6c14e..45dd6cc1cb 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..eec3433f29 100644
--- a/src/remote/libvirtd.aug
+++ b/src/remote/libvirtd.aug.in
@@ -1,6 +1,6 @@
-(* /etc/libvirt/libvirtd.conf *)
+(* /etc/libvirt/@DAEMON_NAME@.conf *)
=20
-module Libvirtd =3D
+module @DAEMON_NAME_UC@ =3D
    autoload xfm
=20
    let eol   =3D del /[ \t]*\n/ "\n"
@@ -24,11 +24,13 @@ module Libvirtd =3D
=20
=20
    (* Config entry grouped by function - same order as example config *)
+@CUT_ENABLE_IP@
    let network_entry =3D bool_entry "listen_tls"
                      | bool_entry "listen_tcp"
                      | str_entry "tls_port"
                      | str_entry "tcp_port"
                      | str_entry "listen_addr"
+@END@
=20
    let sock_acl_entry =3D str_entry "unix_sock_group"
                       | str_entry "unix_sock_ro_perms"
@@ -38,6 +40,7 @@ module Libvirtd =3D
=20
    let authentication_entry =3D str_entry "auth_unix_ro"
                             | str_entry "auth_unix_rw"
+@CUT_ENABLE_IP@
                             | str_entry "auth_tcp"
                             | str_entry "auth_tls"
=20
@@ -46,12 +49,14 @@ module Libvirtd =3D
                          | str_entry "ca_file"
                          | str_entry "crl_file"
=20
-   let authorization_entry =3D bool_entry "tls_no_verify_certificate"
+   let tls_authorization_entry =3D bool_entry "tls_no_verify_certificate"
                            | bool_entry "tls_no_sanity_certificate"
                            | str_array_entry "tls_allowed_dn_list"
-                           | str_array_entry "sasl_allowed_username_list"
-                           | str_array_entry "access_drivers"
                            | str_entry "tls_priority"
+@END@
+
+   let misc_authorization_entry =3D str_array_entry "sasl_allowed_username=
_list"
+                           | str_array_entry "access_drivers"
=20
    let processing_entry =3D int_entry "min_workers"
                         | int_entry "max_workers"
@@ -87,11 +92,14 @@ module Libvirtd =3D
                   | int_entry "ovs_timeout"
=20
    (* Each enty in the config is one of the following three ... *)
-   let entry =3D network_entry
-             | sock_acl_entry
+   let entry =3D sock_acl_entry
              | authentication_entry
+@CUT_ENABLE_IP@
+             | network_entry
              | certificate_entry
-             | authorization_entry
+             | tls_authorization_entry
+@END@
+             | misc_authorization_entry
              | processing_entry
              | admin_processing_entry
              | logging_entry
@@ -106,7 +114,7 @@ module Libvirtd =3D
=20
    let lns =3D ( record | comment | empty ) *
=20
-   let filter =3D incl "/etc/libvirt/libvirtd.conf"
+   let filter =3D incl "/etc/libvirt/@DAEMON_NAME@.conf"
               . Util.stdexcl
=20
    let xfm =3D transform lns filter
diff --git a/src/remote/test_libvirtd.aug.in b/src/remote/test_libvirtd.aug=
.in
index d768b30b55..2fd809af4a 100644
--- a/src/remote/test_libvirtd.aug.in
+++ b/src/remote/test_libvirtd.aug.in
@@ -1,12 +1,14 @@
-module Test_libvirtd =3D
+module Test_@DAEMON_NAME@ =3D
    @CONFIG@
=20
-   test Libvirtd.lns get conf =3D
+   test @DAEMON_NAME_UC@.lns get conf =3D
+@CUT_ENABLE_IP@
         { "listen_tls" =3D "0" }
         { "listen_tcp" =3D "1" }
         { "tls_port" =3D "16514" }
         { "tcp_port" =3D "16509" }
         { "listen_addr" =3D "192.168.0.1" }
+@END@
         { "unix_sock_group" =3D "libvirt" }
         { "unix_sock_ro_perms" =3D "0777" }
         { "unix_sock_rw_perms" =3D "0770" }
@@ -14,11 +16,14 @@ module Test_libvirtd =3D
         { "unix_sock_dir" =3D "/var/run/libvirt" }
         { "auth_unix_ro" =3D "none" }
         { "auth_unix_rw" =3D "none" }
+@CUT_ENABLE_IP@
         { "auth_tcp" =3D "sasl" }
         { "auth_tls" =3D "none" }
+@END@
         { "access_drivers"
              { "1" =3D "polkit" }
         }
+@CUT_ENABLE_IP@
         { "key_file" =3D "/etc/pki/libvirt/private/serverkey.pem" }
         { "cert_file" =3D "/etc/pki/libvirt/servercert.pem" }
         { "ca_file" =3D "/etc/pki/CA/cacert.pem" }
@@ -30,6 +35,7 @@ module Test_libvirtd =3D
              { "2" =3D "DN2"}
         }
         { "tls_priority" =3D "NORMAL" }
+@END@
         { "sasl_allowed_username_list"
              { "1" =3D "joe@EXAMPLE.COM" }
              { "2" =3D "fred@EXAMPLE.COM" }
@@ -48,7 +54,7 @@ module Test_libvirtd =3D
         { "admin_max_client_requests" =3D "5" }
         { "log_level" =3D "3" }
         { "log_filters" =3D "1:qemu 1:libvirt 4:object 4:json 4:event 1:ut=
il" }
-        { "log_outputs" =3D "3:syslog:libvirtd" }
+        { "log_outputs" =3D "3:syslog:@DAEMON_NAME@" }
         { "audit_level" =3D "2" }
         { "audit_logging" =3D "1" }
         { "host_uuid" =3D "00000000-0000-0000-0000-000000000000" }
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420329; cv=none;
	d=zoho.com; s=zohoarc;
	b=m2wEwwl6vIOOoMLnT/P+poKKC0vb/YVdEBaG7PDYtri0PjbACkb0Tpcxbuah9LII0Iqmp7DRSp1ZclH2OSW0myYLU8/G9+xsN9nfzW5Yh3h2Ksa8HFAjBpeBLju69zk6DQZFc/oV6MgRffLtBExad0eMXxHMz8NQ+0nei5LwSO8=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420329;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=ZxbFfd+Xoq+EnSSeLRcCDOPfZU87cEUwJeDEAenYunE=;
	b=m8DYV269xb8MPkKX53agAmBHZqyhVhCSUS2PQmHZkfNKzRWMI3MIpG+se4mYEKjIX9SusaYumASj6hNNJ9qhPd9lJtiSZ1CXEGwPohhIDH0H8BPFqlNOFnsi4cer87Bu0ZPu4oBQUJ3BCkdS2QA1T/+9InMkfR6Gfd9QIxAav7I=
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 1564420329874785.0505629471824;
 Mon, 29 Jul 2019 10:12:09 -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 C48CFE8CC6;
	Mon, 29 Jul 2019 17:12:08 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 63F8E5C232;
	Mon, 29 Jul 2019 17:12:08 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 27C2219732;
	Mon, 29 Jul 2019 17:12:08 +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 x6THBvg8027324 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:11:57 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 2619B5C238; Mon, 29 Jul 2019 17:11:57 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id D0CD15C1A1;
	Mon, 29 Jul 2019 17:11:55 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:10:56 +0100
Message-Id: <20190729171130.25484-15-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 14/48] remote: refactor & rename variables for
	building libvirtd
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]);
 Mon, 29 Jul 2019 17:12:09 +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.

LIBSOCKET is dropped as it is only set on Windows and we don't
build the libvirtd daemon under mingw.

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

diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 45dd6cc1cb..0ec7abb880 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -18,13 +18,13 @@ REMOTE_DRIVER_SOURCES =3D \
 	$(REMOTE_DRIVER_GENERATED) \
 	$(NULL)
=20
-LIBVIRTD_GENERATED =3D \
+REMOTE_DAEMON_GENERATED =3D \
 	remote/remote_daemon_dispatch_stubs.h \
 	remote/remote_daemon_dispatch_lxc_stubs.h \
 	remote/remote_daemon_dispatch_qemu_stubs.h \
 	$(NULL)
=20
-LIBVIRTD_SOURCES =3D \
+REMOTE_DAEMON_SOURCES =3D \
 	remote/remote_daemon.c \
 	remote/remote_daemon.h \
 	remote/remote_daemon_config.c \
@@ -33,9 +33,49 @@ LIBVIRTD_SOURCES =3D \
 	remote/remote_daemon_dispatch.h \
 	remote/remote_daemon_stream.c \
 	remote/remote_daemon_stream.h \
-	$(LIBVIRTD_GENERATED) \
+	$(REMOTE_DAEMON_GENERATED) \
 	$(NULL)
=20
+REMOTE_DAEMON_CFLAGS =3D \
+	$(LIBXML_CFLAGS) \
+	$(GNUTLS_CFLAGS) \
+	$(SASL_CFLAGS) \
+	$(XDR_CFLAGS) \
+	$(DBUS_CFLAGS) \
+	$(LIBNL_CFLAGS) \
+	$(WARN_CFLAGS) \
+	$(PIE_CFLAGS) \
+	-I$(srcdir)/access \
+	-I$(srcdir)/conf \
+	-I$(srcdir)/rpc \
+	$(NULL)
+
+REMOTE_DAEMON_LD_FLAGS =3D \
+	$(RELRO_LDFLAGS) \
+	$(PIE_LDFLAGS) \
+	$(NO_INDIRECT_LDFLAGS) \
+	$(NO_UNDEFINED_LDFLAGS) \
+	$(NULL)
+
+REMOTE_DAEMON_LD_ADD =3D \
+	libvirt_driver_admin.la \
+	libvirt-lxc.la \
+	libvirt-qemu.la \
+	libvirt.la \
+	$(LIBXML_LIBS) \
+	$(GNUTLS_LIBS) \
+	$(SASL_LIBS) \
+	$(DBUS_LIBS) \
+	$(LIBNL_LIBS) \
+	$(NULL)
+
+if WITH_DTRACE_PROBES
+REMOTE_DAEMON_LD_ADD +=3D ../src/libvirt_probes.lo
+endif WITH_DTRACE_PROBES
+
+REMOTE_DAEMON_LD_ADD +=3D \
+	../gnulib/lib/libgnu.la \
+	$(NULL)
=20
 LOGROTATE_FILES_IN +=3D \
 	remote/libvirtd.qemu.logrotate.in \
@@ -73,7 +113,7 @@ DRIVER_SOURCE_FILES +=3D $(REMOTE_DRIVER_SOURCES)
 EXTRA_DIST +=3D \
 	$(REMOTE_DRIVER_PROTOCOL) \
 	$(REMOTE_DRIVER_SOURCES) \
-	$(LIBVIRTD_SOURCES) \
+	$(REMOTE_DAEMON_SOURCES) \
 	remote/test_libvirtd.aug.in \
 	remote/libvirtd.aug.in \
 	remote/libvirtd.conf.in \
@@ -87,11 +127,11 @@ EXTRA_DIST +=3D \
 # the WITH_REMOTE/WITH_LIBVIRTD conditionals
 BUILT_SOURCES +=3D \
 	$(REMOTE_DRIVER_GENERATED) \
-	$(LIBVIRTD_GENERATED) \
+	$(REMOTE_DAEMON_GENERATED) \
 	$(NULL)
 MAINTAINERCLEANFILES +=3D \
 	$(REMOTE_DRIVER_GENERATED) \
-	$(LIBVIRTD_GENERATED) \
+	$(REMOTE_DAEMON_GENERATED) \
 	$(NULL)
 CLEANFILES +=3D \
 	remote/libvirtd.conf \
@@ -137,52 +177,18 @@ CLEANFILES +=3D remote/libvirtd.aug
=20
 man8_MANS +=3D libvirtd.8
=20
-libvirtd_SOURCES =3D $(LIBVIRTD_SOURCES)
+libvirtd_SOURCES =3D $(REMOTE_DAEMON_SOURCES)
=20
 libvirtd_CFLAGS =3D \
-	$(LIBXML_CFLAGS) \
-	$(GNUTLS_CFLAGS) \
-	$(SASL_CFLAGS) \
-	$(XDR_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	$(LIBNL_CFLAGS) \
-	$(WARN_CFLAGS) \
-	$(PIE_CFLAGS) \
-	-I$(srcdir)/access \
-	-I$(srcdir)/conf \
-	-I$(srcdir)/rpc \
+	$(REMOTE_DAEMON_CFLAGS) \
 	-DSOCK_PREFIX=3D"\"libvirt\"" \
 	-DDAEMON_NAME=3D"\"libvirtd\"" \
 	-DENABLE_IP \
 	$(NULL)
=20
-libvirtd_LDFLAGS =3D \
-	$(RELRO_LDFLAGS) \
-	$(PIE_LDFLAGS) \
-	$(NO_INDIRECT_LDFLAGS) \
-	$(NO_UNDEFINED_LDFLAGS) \
-	$(NULL)
+libvirtd_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS)
=20
-libvirtd_LDADD =3D \
-	libvirt_driver_admin.la \
-	libvirt-lxc.la \
-	libvirt-qemu.la \
-	libvirt.la \
-	$(LIBXML_LIBS) \
-	$(GNUTLS_LIBS) \
-	$(SASL_LIBS) \
-	$(DBUS_LIBS) \
-	$(LIBNL_LIBS) \
-	$(NULL)
-
-if WITH_DTRACE_PROBES
-libvirtd_LDADD +=3D ../src/libvirt_probes.lo
-endif WITH_DTRACE_PROBES
-
-libvirtd_LDADD +=3D \
-	../gnulib/lib/libgnu.la \
-	$(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 Wed May  8 00:05:16 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=1564420334; cv=none;
	d=zoho.com; s=zohoarc;
	b=IaL/XPQ74BiDrZZMN2CKwJ3o6TISz2i40EvJ8GiaJzOQnDSY5oiGhMM5a4IhrClVt//iwj6FRZOY92+eTg0GywmWo18BH0NKgDedqmgVSVFBSEn/lM35ILPlSMCqWBNxY2dRcXIJES7Y7iI93XouO/1XYbuAKNKILaVOLDN52S8=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420334;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=WKH66oEE0d5Om7iunrBOnKYo1oYYXSGEtg0SwcyPQK0=;
	b=WicfUlKrf6iBzeG3v3wsiVwvR6i0vS2adRyqbEHKrF+ff6rqht3Waih8EshwwM9zqxCxkunj9t5d4d5xrXUhzvHY+T6lRnPq6O29e0TKPIRXsnH9eqhDFVHDGFjWjmkXSfS5Eh4NmBYgIniHJkIEY7BzCwJdGCJaFY5YJKa67rA=
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 1564420334531978.7976859486788;
 Mon, 29 Jul 2019 10:12:14 -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 0A5F7308338F;
	Mon, 29 Jul 2019 17:12: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 992AC19C58;
	Mon, 29 Jul 2019 17:12: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 47390180BAA4;
	Mon, 29 Jul 2019 17:12: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 x6THBwLo027466 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:11:58 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id B09155C206; Mon, 29 Jul 2019 17:11:58 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 76C1C5C21A;
	Mon, 29 Jul 2019 17:11:57 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:10:57 +0100
Message-Id: <20190729171130.25484-16-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 15/48] build: don't hardcode /etc in the config
	related files
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]);
 Mon, 29 Jul 2019 17:12:13 +0000 (UTC)

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

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

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

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420337; cv=none;
	d=zoho.com; s=zohoarc;
	b=m5yrtD7BIlDcKg+VCK1Z4rBuak+4J40nJ3Lp7Lgv0lYRsyG1eyMar/t1RLUwQ8D7WtqlpYQJm4lVHcEBL+Fkk4rcklb85s23y5BQjjs7vLqA1SUoH6+1a2BKH2saFxoUHtcbQiNfiykspjKRXtFBxQhW/virWY/RyF5ZkOIf7dg=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420337;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=eCUnt4SpeLODihpAKEVRTZ9QGtguQb+YBBs9uFkLkxU=;
	b=WI9GbIvtFpWEIy059ODERccvQ1XQ8tACMx8tpcJs2wcpK49ufDOJRrXOFgikY123Fci+xUzbMXWqzRU/3hfgeg5nFgntIgLVFQmbqzapEZ7xIrfRJX6yVb63IedFuoTh9miW41uoR2KgoOvTCs+HTrP0f3BFgKzzuppBJ5FMpiQ=
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 1564420337536653.7358908579743;
 Mon, 29 Jul 2019 10:12:17 -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 44B00793D1;
	Mon, 29 Jul 2019 17:12:16 +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 11D1B608C2;
	Mon, 29 Jul 2019 17:12:16 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id C3915180BAA4;
	Mon, 29 Jul 2019 17:12: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 x6THC0W8027619 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:00 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 733375C21F; Mon, 29 Jul 2019 17:12:00 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 10D0B5C1A1;
	Mon, 29 Jul 2019 17:11:58 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:10:58 +0100
Message-Id: <20190729171130.25484-17-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 16/48] remote: reduce duplication in systemd
	unit file make rules into one
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]);
 Mon, 29 Jul 2019 17:12:16 +0000 (UTC)

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

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 255e8e2b57..b4544b12a7 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 fc04af5cb5..0c6d859a41 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -292,48 +292,15 @@ INSTALL_DATA_LOCAL +=3D install-sasl
 UNINSTALL_LOCAL +=3D uninstall-sasl
 endif WITH_SASL
=20
+LIBVIRTD_UNIT_VARS =3D \
+	$(COMMON_UNIT_VARS) \
+	$(NULL)
+
 libvirtd.service: remote/libvirtd.service.in $(top_builddir)/config.status
-	$(AM_V_GEN)sed \
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
-	    -e 's|[@]sbindir[@]|$(sbindir)|g' \
-	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
-	    < $< > $@-t && \
-	    mv $@-t $@
-
-libvirtd.socket: remote/libvirtd.socket.in $(top_builddir)/config.status
-	$(AM_V_GEN)sed \
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
-	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
-	    < $< > $@-t && \
-	    mv $@-t $@
-
-libvirtd-ro.socket: remote/libvirtd-ro.socket.in $(top_builddir)/config.st=
atus
-	$(AM_V_GEN)sed \
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
-	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
-	    < $< > $@-t && \
-	    mv $@-t $@
-
-libvirtd-admin.socket: remote/libvirtd-admin.socket.in $(top_builddir)/con=
fig.status
-	$(AM_V_GEN)sed \
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
-	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
-	    < $< > $@-t && \
-	    mv $@-t $@
-
-libvirtd-tcp.socket: remote/libvirtd-tcp.socket.in $(top_builddir)/config.=
status
-	$(AM_V_GEN)sed \
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
-	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
-	    < $< > $@-t && \
-	    mv $@-t $@
-
-libvirtd-tls.socket: remote/libvirtd-tls.socket.in $(top_builddir)/config.=
status
-	$(AM_V_GEN)sed \
-	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
-	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
-	    < $< > $@-t && \
-	    mv $@-t $@
+	$(AM_V_GEN)sed $(LIBVIRTD_UNIT_VARS) < $< > $@-t && mv $@-t $@
+
+libvirt%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
+	$(AM_V_GEN)sed $(LIBVIRTD_UNIT_VARS) < $< > $@-t && mv $@-t $@
=20
 virt-guest-shutdown.target: remote/virt-guest-shutdown.target.in \
 			$(top_builddir)/config.status
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420340; cv=none;
	d=zoho.com; s=zohoarc;
	b=KfovKKWgAil5D1VciOYjB4X3qvt5njODOPU9t7GI/r6e2CWoyKb68W6GiYia2Um3Gwj913fJpCWLdbkY7LW2uTf2CHiDfF+RS8lh8GC2KB0f9dN+BgY6uh5cjzmp5tH05KqkjDM3bvNGSkxAo/Hw5wPvT3267XHq20NJ4wocUzI=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420340;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=Ipvae9GQFOrKUAipVgziONu4VT1Q07QOOL2irU73yKA=;
	b=cWIbqZxkFq7WHtQJXrNUcXw5gdwXPjIgQjhZUtu+mdc9Scxb+uCDZLzSeaY1FhJXABLY8tM+DfU6X73O7sCrvj0Aur7V3AJ3EXhGy62tdVsGpIhsMt1snfxdkh9cmWVNJZDKC3ZBk8LXI5k5/wxe8NcTxvpuD6q7v118Lrf52XY=
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 1564420340801852.0504208069757;
 Mon, 29 Jul 2019 10:12:20 -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 A03EDC09AD1B;
	Mon, 29 Jul 2019 17:12:19 +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 7342C10013A1;
	Mon, 29 Jul 2019 17:12:19 +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 3B7BF19737;
	Mon, 29 Jul 2019 17:12:19 +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 x6THC2sM027634 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:02 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 117545C22B; Mon, 29 Jul 2019 17:12:02 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id CFF595C22E;
	Mon, 29 Jul 2019 17:12:00 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:10:59 +0100
Message-Id: <20190729171130.25484-18-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 17/48] 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.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.32]);
 Mon, 29 Jul 2019 17:12:20 +0000 (UTC)

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

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

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

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420330; cv=none;
	d=zoho.com; s=zohoarc;
	b=M9m5bCAVbCOLFxcDZ16QqbhDA5zxCTr2NmSEw+q/KA4Zz5ovLfhSGGMkKJlhMwYtnfkCWhrypaI/L1H+yD6ha3E11qrb5fjvYNAn7nSwsEeQ2J/KsWzwClhJmqF73XadXRLYj0bflVa+TTZwNvCv7KsuvVExJwB+3GEAwwdYDrs=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420330;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=KSLMA17gy7Em63LjRTgKOC647Ve5r5Q8kVSp1XaEAVI=;
	b=bRR1NDCozvHpi5a1SX+rlm9hvYqdaVXBFEOMeatsvACRj34zuZuZ9Z/QmytHKoJ328+EyZk8KBmaygD49YdxiLVa+5ZiK08stySsvZyFSg22vKGohpKzsn3gw/UWUFWPVG90YiGaYtgSWdM9XcKnMToPRR16fhv4hXTz5pS3uB4=
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 1564420330599148.6841827809801;
 Mon, 29 Jul 2019 10:12:10 -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 58A15A96E9;
	Mon, 29 Jul 2019 17:12: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 2E32E10013A1;
	Mon, 29 Jul 2019 17:12: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 DEC17180BA9E;
	Mon, 29 Jul 2019 17:12:08 +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 x6THC31O027657 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:03 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 9D8245C21F; Mon, 29 Jul 2019 17:12:03 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 671025C21A;
	Mon, 29 Jul 2019 17:12:02 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:00 +0100
Message-Id: <20190729171130.25484-19-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 18/48] 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.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.38]);
 Mon, 29 Jul 2019 17:12:09 +0000 (UTC)

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

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

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

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

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420334; cv=none;
	d=zoho.com; s=zohoarc;
	b=lqyh4kGpZSsGZl0T1bj6EMXksrVGbotioPjG78F75vRq0qve1qxdyXquZae5EjtrHd/wXkIYOwtAxd+ZP3wXQidLGfpb9EPQ52tMgxHgIsuIWyTGR1dAq0y1lI3hHdfr5EfDfDnmxnQlA9KiskDWcONtkclLJ4N+swxT4UzT4fs=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420334;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=QW+DFq48cHInqOHEIxL7rWWDb/hVU0OYQ/cv3bpnHQ4=;
	b=RimXCj9a4hcuraLzqZK2jm2KmCuPj1Y71ktAVIetz0iZAsVscTYu0LszD4WLfbcWp1Ak6JkUePtDiv5OpCFF+1zdAh6X8qDyfArn7sVqgvFYX1tzq3L0kOUsk1kBNQ2H5ZUOZcx/ZHztUChElgGM1NSxw4Knd52f+kXNgjsCH6Y=
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 1564420334687995.8178086187326;
 Mon, 29 Jul 2019 10:12:14 -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 1A4A63CA0D;
	Mon, 29 Jul 2019 17:12:13 +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 DF2E06031A;
	Mon, 29 Jul 2019 17:12: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 9B9D719735;
	Mon, 29 Jul 2019 17:12: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 x6THC51T027699 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:05 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 63AE35C21F; Mon, 29 Jul 2019 17:12:05 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 0EEFB5C1A1;
	Mon, 29 Jul 2019 17:12:03 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:01 +0100
Message-Id: <20190729171130.25484-20-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 19/48] remote: in per-driver daemons ensure
	that state initialize succeeds
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]);
 Mon, 29 Jul 2019 17:12:14 +0000 (UTC)

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

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

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

diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index 5387ac5570..e2c1b00080 100644
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -1220,16 +1220,16 @@ bhyveStateInitialize(bool privileged,
 {
     if (!privileged) {
         VIR_INFO("Not running privileged, disabling driver");
-        return 0;
+        return VIR_DRV_STATE_INIT_SKIPPED;
     }
=20
     if (VIR_ALLOC(bhyve_driver) < 0)
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
=20
     bhyve_driver->lockFD =3D -1;
     if (virMutexInit(&bhyve_driver->lock) < 0) {
         VIR_FREE(bhyve_driver);
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
     }
=20
     if (!(bhyve_driver->closeCallbacks =3D virCloseCallbacksNew()))
@@ -1303,11 +1303,11 @@ bhyveStateInitialize(bool privileged,
=20
     bhyveAutostartDomains(bhyve_driver);
=20
-    return 0;
+    return VIR_DRV_STATE_INIT_COMPLETE;
=20
  cleanup:
     bhyveStateCleanup();
-    return -1;
+    return VIR_DRV_STATE_INIT_ERROR;
 }
=20
 unsigned
diff --git a/src/driver-state.h b/src/driver-state.h
index 974b2252ee..69e2678dfc 100644
--- a/src/driver-state.h
+++ b/src/driver-state.h
@@ -24,7 +24,13 @@
 # error "Don't include this file directly, only use driver.h"
 #endif
=20
-typedef int
+typedef enum {
+    VIR_DRV_STATE_INIT_ERROR =3D -1,
+    VIR_DRV_STATE_INIT_SKIPPED,
+    VIR_DRV_STATE_INIT_COMPLETE,
+} virDrvStateInitResult;
+
+typedef virDrvStateInitResult
 (*virDrvStateInitialize)(bool privileged,
                          virStateInhibitCallback callback,
                          void *opaque);
diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interf=
ace_backend_netcf.c
index 0000587cee..eb509ccc13 100644
--- a/src/interface/interface_backend_netcf.c
+++ b/src/interface/interface_backend_netcf.c
@@ -93,10 +93,10 @@ netcfStateInitialize(bool privileged,
                      void *opaque ATTRIBUTE_UNUSED)
 {
     if (virNetcfDriverStateInitialize() < 0)
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
=20
     if (!(driver =3D virObjectLockableNew(virNetcfDriverStateClass)))
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
=20
     driver->privileged =3D privileged;
=20
@@ -129,12 +129,12 @@ netcfStateInitialize(bool privileged,
                        _("failed to initialize netcf"));
         goto error;
     }
-    return 0;
+    return VIR_DRV_STATE_INIT_COMPLETE;
=20
  error:
     virObjectUnref(driver);
     driver =3D NULL;
-    return -1;
+    return VIR_DRV_STATE_INIT_ERROR;
 }
=20
=20
diff --git a/src/interface/interface_backend_udev.c b/src/interface/interfa=
ce_backend_udev.c
index fea5108dbc..ef748540d1 100644
--- a/src/interface/interface_backend_udev.c
+++ b/src/interface/interface_backend_udev.c
@@ -1172,7 +1172,7 @@ udevStateInitialize(bool privileged,
                     virStateInhibitCallback callback ATTRIBUTE_UNUSED,
                     void *opaque ATTRIBUTE_UNUSED)
 {
-    int ret =3D -1;
+    int ret =3D VIR_DRV_STATE_INIT_ERROR;
=20
     if (VIR_ALLOC(driver) < 0)
         goto cleanup;
@@ -1210,7 +1210,7 @@ udevStateInitialize(bool privileged,
     }
     driver->privileged =3D privileged;
=20
-    ret =3D 0;
+    ret =3D VIR_DRV_STATE_INIT_COMPLETE;
=20
  cleanup:
     if (ret < 0)
diff --git a/src/libvirt.c b/src/libvirt.c
index f0a768fc7e..9390a767f9 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,22 @@ virStateInitialize(bool privileged,
=20
     for (i =3D 0; i < virStateDriverTabCount; i++) {
         if (virStateDriverTab[i]->stateInitialize) {
+            virDrvStateInitResult ret;
             VIR_DEBUG("Running global init for %s state driver",
                       virStateDriverTab[i]->name);
-            if (virStateDriverTab[i]->stateInitialize(privileged,
-                                                      callback,
-                                                      opaque) < 0) {
+            ret =3D virStateDriverTab[i]->stateInitialize(privileged,
+                                                        callback,
+                                                        opaque);
+            VIR_DEBUG("State init result %d (mandatory=3D%d)", ret, mandat=
ory);
+            if (ret =3D=3D VIR_DRV_STATE_INIT_ERROR) {
                 VIR_ERROR(_("Initialization of %s state driver failed: %s"=
),
                           virStateDriverTab[i]->name,
                           virGetLastErrorMessage());
                 return -1;
+            } else if (ret =3D=3D VIR_DRV_STATE_INIT_SKIPPED && mandatory)=
 {
+                VIR_ERROR(_("Initialization of mandatory %s state driver s=
kipped"),
+                          virStateDriverTab[i]->name);
+                return -1;
             }
         }
     }
diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h
index 3f012fdd4b..4a74dbc2af 100644
--- a/src/libvirt_internal.h
+++ b/src/libvirt_internal.h
@@ -30,6 +30,7 @@ typedef void (*virStateInhibitCallback)(bool inhibit,
                                         void *opaque);
=20
 int virStateInitialize(bool privileged,
+                       bool mandatory,
                        virStateInhibitCallback inhibit,
                        void *opaque);
 int virStateCleanup(void);
diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 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 4ca3eb7bde..d4fc8bbbd6 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -730,7 +730,7 @@ qemuStateInitialize(bool privileged,
     size_t i;
=20
     if (VIR_ALLOC(qemu_driver) < 0)
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
=20
     qemu_driver->lockFD =3D -1;
=20
@@ -738,7 +738,7 @@ qemuStateInitialize(bool privileged,
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("cannot initialize mutex"));
         VIR_FREE(qemu_driver);
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
     }
=20
     qemu_driver->inhibitCallback =3D callback;
@@ -1074,14 +1074,14 @@ qemuStateInitialize(bool privileged,
=20
     qemuAutostartDomains(qemu_driver);
=20
-    return 0;
+    return VIR_DRV_STATE_INIT_COMPLETE;
=20
  error:
     VIR_FREE(driverConf);
     VIR_FREE(hugepagePath);
     VIR_FREE(memoryBackingPath);
     qemuStateCleanup();
-    return -1;
+    return VIR_DRV_STATE_INIT_ERROR;
 }
=20
 static void qemuNotifyLoadDomain(virDomainObjPtr vm, int newVM, void *opaq=
ue)
diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index fadfc7c016..42c51c1329 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -792,6 +792,11 @@ static void daemonRunStateInit(void *opaque)
 {
     virNetDaemonPtr dmn =3D opaque;
     virIdentityPtr sysident =3D virIdentityGetSystem();
+#ifdef MODULE_NAME
+    bool mandatory =3D true;
+#else /* ! MODULE_NAME */
+    bool mandatory =3D false;
+#endif /* ! MODULE_NAME */
=20
     virIdentitySetCurrent(sysident);
=20
@@ -804,6 +809,7 @@ static void daemonRunStateInit(void *opaque)
      * we're ready, since it can take a long time and this will
      * seriously delay OS bootup process */
     if (virStateInitialize(virNetDaemonIsPrivileged(dmn),
+                           mandatory,
                            daemonInhibitCallback,
                            dmn) < 0) {
         VIR_ERROR(_("Driver state initialization failed"));
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 72c2336b7a..8e1024dca3 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -195,7 +195,7 @@ remoteStateInitialize(bool privileged ATTRIBUTE_UNUSED,
      * re-entering ourselves
      */
     inside_daemon =3D true;
-    return 0;
+    return VIR_DRV_STATE_INIT_COMPLETE;
 }
=20
=20
diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
index 0af2bcef96..0d5ea05f56 100644
--- a/src/secret/secret_driver.c
+++ b/src/secret/secret_driver.c
@@ -457,12 +457,12 @@ secretStateInitialize(bool privileged,
                       void *opaque ATTRIBUTE_UNUSED)
 {
     if (VIR_ALLOC(driver) < 0)
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
=20
     driver->lockFD =3D -1;
     if (virMutexInit(&driver->lock) < 0) {
         VIR_FREE(driver);
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
     }
     secretDriverLock();
=20
@@ -514,12 +514,12 @@ secretStateInitialize(bool privileged,
         goto error;
=20
     secretDriverUnlock();
-    return 0;
+    return VIR_DRV_STATE_INIT_COMPLETE;
=20
  error:
     secretDriverUnlock();
     secretStateCleanup();
-    return -1;
+    return VIR_DRV_STATE_INIT_ERROR;
 }
=20
=20
diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index 03ac6a6845..dfa654178b 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -255,12 +255,12 @@ storageStateInitialize(bool privileged,
     VIR_AUTOFREE(char *) rundir =3D NULL;
=20
     if (VIR_ALLOC(driver) < 0)
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
=20
     driver->lockFD =3D -1;
     if (virMutexInit(&driver->lock) < 0) {
         VIR_FREE(driver);
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
     }
     storageDriverLock();
=20
@@ -326,12 +326,12 @@ storageStateInitialize(bool privileged,
=20
     storageDriverUnlock();
=20
-    return 0;
+    return VIR_DRV_STATE_INIT_COMPLETE;
=20
  error:
     storageDriverUnlock();
     storageStateCleanup();
-    return -1;
+    return VIR_DRV_STATE_INIT_ERROR;
 }
=20
 /**
diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index f5d05a7f43..da72b209d1 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -4118,36 +4118,36 @@ vzStateInitialize(bool privileged,
                   void *opaque ATTRIBUTE_UNUSED)
 {
     if (!privileged)
-        return 0;
+        return VIR_DRV_STATE_INIT_SKIPPED;
=20
     vz_driver_privileged =3D privileged;
=20
     if (virFileMakePathWithMode(VZ_STATEDIR, S_IRWXU) < 0) {
         virReportSystemError(errno, _("cannot create state directory '%s'"=
),
                              VZ_STATEDIR);
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
     }
=20
     if ((vz_driver_lock_fd =3D
          virPidFileAcquire(VZ_STATEDIR, "driver", false, getpid())) < 0)
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
=20
     if (prlsdkInit() < 0) {
         VIR_DEBUG("%s", _("Can't initialize Parallels SDK"));
-        return -1;
+        return VIR_DRV_STATE_INIT_ERROR;
     }
=20
-   if (virMutexInit(&vz_driver_lock) < 0)
+    if (virMutexInit(&vz_driver_lock) < 0)
         goto error;
=20
     /* Failing to create driver here is not fatal and only means
      * that next driver client will try once more when connecting */
     vz_driver =3D vzDriverObjNew();
-    return 0;
+    return VIR_DRV_STATE_INIT_COMPLETE;
=20
  error:
     vzStateCleanup();
-    return -1;
+    return VIR_DRV_STATE_INIT_ERROR;
 }
=20
 static virStateDriver vzStateDriver =3D {
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420335; cv=none;
	d=zoho.com; s=zohoarc;
	b=PhhLLwlJvWuDRvu3NeKOh9ef+3OoyZY0Qw5ndqVRgYkREFztW+V4lWnQNXOxmj/0CgibGZTeJ050+AwxBiyBfvzMA8TlRnjG85TVH5czsHR9bNgU7tRtsmCJiBKXwO3UlAnuQ3+3a+iqz6FsS6bZrvLDMeme6teSkXZhUNxx3Ro=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420335;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=FBe2ZNd8g37z8G0Kli3NKXF4KAzMLfzhv39rgO8nx9U=;
	b=UMSe61R8xVQXmkfEbjgPqA3orvCOSpd02v96iKHMdcniCjjHyY86U8KlmAJ8mxsyc5Nv1X0JAkbgk6JwX97CbsDNMGDBXYULdbB++Fxw6FECTtY6w+9vua9QiaalVIr0OW2zVTVd6MKzOMEumvGjb/UQ3Ockadf9fn2/R/jbOi0=
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 1564420335955416.58956343349064;
 Mon, 29 Jul 2019 10:12:15 -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 95593A96F8;
	Mon, 29 Jul 2019 17:12: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 5A6EB5C219;
	Mon, 29 Jul 2019 17:12: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 14A28180BAA2;
	Mon, 29 Jul 2019 17:12: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 x6THC71u027751 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:07 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 65DB64A6; Mon, 29 Jul 2019 17:12:07 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 00C745C1A1;
	Mon, 29 Jul 2019 17:12:05 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:02 +0100
Message-Id: <20190729171130.25484-21-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 20/48] 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.16
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]);
 Mon, 29 Jul 2019 17:12:14 +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>
Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
---
 .gitignore                        |   4 ++
 libvirt.spec.in                   |  10 +++
 src/remote/Makefile.inc.am        | 111 +++++++++++++++++++++++++++---
 src/remote/remote_daemon.c        |  28 +++++---
 src/remote/remote_daemon_config.c |   6 +-
 src/remote/virtproxyd.service.in  |  24 +++++++
 6 files changed, 163 insertions(+), 20 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 045c0fed1a..c7f276b2bc 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 c9c3c7203a..344f19311a 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -89,18 +89,40 @@ SYSCONF_FILES +=3D remote/libvirtd.sysconf
 PODFILES +=3D remote/libvirtd.pod
 MANINFILES +=3D libvirtd.8.in
=20
-LIBVIRTD_UNIT_FILES_IN =3D \
-	remote/libvirtd.service.in \
+LIBVIRTD_SOCKET_UNIT_FILES_IN =3D \
 	remote/libvirtd.socket.in \
 	remote/libvirtd-ro.socket.in \
 	remote/libvirtd-admin.socket.in \
 	remote/libvirtd-tcp.socket.in \
 	remote/libvirtd-tls.socket.in \
+	$(NULL)
+
+LIBVIRTD_SOCKET_UNIT_FILES =3D $(notdir $(LIBVIRTD_SOCKET_UNIT_FILES_IN:%.=
in=3D%))
+
+LIBVIRTD_UNIT_FILES_IN =3D \
+	remote/libvirtd.service.in \
+	$(LIBVIRTD_SOCKET_UNIT_FILES_IN) \
+	$(NULL)
+
+VIRTPROXYD_UNIT_FILES_IN =3D \
+	remote/virtproxyd.service.in \
+	$(NULL)
+
+GUEST_UNIT_FILES_IN =3D \
 	remote/virt-guest-shutdown.target.in \
 	$(NULL)
=20
-SYSTEMD_UNIT_FILES +=3D $(notdir $(LIBVIRTD_UNIT_FILES_IN:%.in=3D%))
-SYSTEMD_UNIT_FILES_IN +=3D $(LIBVIRTD_UNIT_FILES_IN)
+
+SYSTEMD_UNIT_FILES +=3D \
+	$(notdir $(LIBVIRTD_UNIT_FILES_IN:%.in=3D%)) \
+	$(notdir $(LIBVIRTD_UNIT_FILES_IN:remote/libvirtd%.in=3Dremote/virtproxyd=
%)) \
+	$(notdir $(GUEST_UNIT_FILES_IN:%.in=3D%)) \
+	$(NULL)
+SYSTEMD_UNIT_FILES_IN +=3D \
+	$(LIBVIRTD_UNIT_FILES_IN) \
+	$(VIRTPROXYD_UNIT_FILES_IN) \
+	$(GUEST_UNIT_FILES_IN) \
+	$(NULL)
=20
 REMOTE_PROTOCOL =3D $(srcdir)/remote/remote_protocol.x
 LXC_PROTOCOL =3D $(srcdir)/remote/lxc_protocol.x
@@ -138,6 +160,7 @@ MAINTAINERCLEANFILES +=3D \
 	$(NULL)
 CLEANFILES +=3D \
 	remote/libvirtd.conf \
+	remote/virtproxyd.conf \
 	$(NULL)
=20
 if WITH_REMOTE
@@ -168,15 +191,27 @@ endif ! WITH_REMOTE
=20
 if WITH_LIBVIRTD
=20
-sbin_PROGRAMS +=3D libvirtd
+sbin_PROGRAMS +=3D libvirtd virtproxyd
=20
-augeas_DATA +=3D remote/libvirtd.aug
+augeas_DATA +=3D \
+	remote/libvirtd.aug \
+	remote/virtproxyd.aug \
+	$(NULL)
=20
-augeastest_DATA +=3D remote/test_libvirtd.aug
+augeastest_DATA +=3D \
+	remote/test_libvirtd.aug \
+	remote/test_virtproxyd.aug \
+	$(NULL)
=20
-nodist_conf_DATA +=3D remote/libvirtd.conf
+nodist_conf_DATA +=3D \
+	remote/libvirtd.conf \
+	remote/virtproxyd.conf \
+	$(NULL)
=20
-CLEANFILES +=3D remote/libvirtd.aug
+CLEANFILES +=3D \
+	remote/libvirtd.aug \
+	remote/virtproxyd.aug \
+	$(NULL)
=20
 man8_MANS +=3D libvirtd.8
=20
@@ -187,12 +222,23 @@ libvirtd_CFLAGS =3D \
 	-DSOCK_PREFIX=3D"\"libvirt\"" \
 	-DDAEMON_NAME=3D"\"libvirtd\"" \
 	-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:
@@ -218,6 +271,14 @@ remote/libvirtd.aug: remote/libvirtd.aug.in
 		-e 's|[@]DAEMON_NAME_UC[@]|Libvirtd|' \
 		$< > $@
=20
+remote/virtproxyd.aug: remote/libvirtd.aug.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/d' \
+		-e '/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtproxyd/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtproxyd/' \
+		$< > $@
+
 remote/test_libvirtd.aug: remote/test_libvirtd.aug.in \
 		remote/libvirtd.conf $(AUG_GENTEST)
 	$(AM_V_GEN)$(AUG_GENTEST) remote/libvirtd.conf \
@@ -229,6 +290,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
@@ -303,11 +374,31 @@ LIBVIRTD_UNIT_VARS =3D \
 	-e 's|[@]deps[@]||g' \
 	$(NULL)
=20
+VIRTD_UNIT_VARS =3D \
+	$(COMMON_UNIT_VARS) \
+	-e 's|[@]deps[@]|Conflicts=3D$(LIBVIRTD_SOCKET_UNIT_FILES)|g' \
+	$(NULL)
+
+VIRTPROXYD_UNIT_VARS =3D \
+	$(VIRTD_UNIT_VARS) \
+	-e 's|[@]name[@]|Libvirt proxy|g' \
+	-e 's|[@]service[@]|virtproxyd|g' \
+	-e 's|[@]sockprefix[@]|libvirt|g' \
+	$(NULL)
+
 libvirtd.service: remote/libvirtd.service.in $(top_builddir)/config.status
 	$(AM_V_GEN)sed $(LIBVIRTD_UNIT_VARS) < $< > $@-t && mv $@-t $@
=20
 libvirt%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
-	$(AM_V_GEN)sed $(LIBVIRTD_UNIT_VARS) < $< > $@-t && mv $@-t $@
+	$(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 42c51c1329..02a33d6754 100644
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -311,10 +311,16 @@ static int daemonErrorLogFilter(virErrorPtr err, int =
priority)
=20
 static int daemonInitialize(void)
 {
-#ifdef MODULE_NAME
+#ifndef LIBVIRTD
+# ifdef MODULE_NAME
     /* This a dedicated per-driver daemon build */
     if (virDriverLoadModule(MODULE_NAME, MODULE_NAME "Register", true) < 0)
         return -1;
+# else
+    /* This is virtproxyd which merely proxies to the per-driver
+     * daemons for back compat, and also allows IP connectivity.
+     */
+# endif
 #else
     /* This is the legacy monolithic libvirtd built with all drivers
      *
@@ -906,9 +912,9 @@ daemonUsage(const char *argv0, bool privileged)
         { "-h | --help", N_("Display program help") },
         { "-v | --verbose", N_("Verbose messages") },
         { "-d | --daemon", N_("Run as a daemon & write PID file") },
-#ifdef 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") },
@@ -985,7 +991,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;
@@ -996,9 +1006,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'},
@@ -1021,11 +1031,11 @@ int main(int argc, char **argv) {
         int optidx =3D 0;
         int c;
         char *tmp;
-#ifdef ENABLE_IP
+#if defined(ENABLE_IP) && defined(LIBVIRTD)
         const char *optstr =3D "ldf:p:t:vVh";
-#else /* ! ENABLE_IP */
+#else /* ! ENABLE_IP && ! LIBVIRTD */
         const char *optstr =3D "df:p:t:vVh";
-#endif /* ! ENABLE_IP */
+#endif /* ! ENABLE_IP && ! LIBVIRTD */
=20
         c =3D getopt_long(argc, argv, optstr, opts, &optidx);
=20
@@ -1043,7 +1053,7 @@ int main(int argc, char **argv) {
             godaemon =3D 1;
             break;
=20
-#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..e99e2af19c
--- /dev/null
+++ b/src/remote/virtproxyd.service.in
@@ -0,0 +1,24 @@
+[Unit]
+Description=3DVirtualization daemon
+Conflicts=3Dlibvirtd.service
+Requires=3Dvirtproxyd.socket
+Requires=3Dvirtproxyd-ro.socket
+Requires=3Dvirtproxyd-admin.socket
+After=3Dnetwork.target
+After=3Ddbus.service
+After=3Dapparmor.service
+After=3Dlocal-fs.target
+Documentation=3Dman:libvirtd(8)
+Documentation=3Dhttps://libvirt.org
+
+[Service]
+Type=3Dnotify
+ExecStart=3D@sbindir@/virtproxyd --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+Restart=3Don-failure
+
+[Install]
+WantedBy=3Dmulti-user.target
+Also=3Dvirtproxyd.socket
+Also=3Dvirtproxyd-ro.socket
+Also=3Dvirtproxyd-admin.socket
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420339; cv=none;
	d=zoho.com; s=zohoarc;
	b=hM11gqh3bfbelLaatRP/tvSGcLj7YtrshELcYYDXTV5OxHTqqVe6IkS8P1FhlZRMiQUnB60BoLXcmv89OtZk2db0zngkNn5+eRIxfIaG8YLLFbgeEFrKFgGL1/VH4jixr4E5nEZC5oOG4HjD9zCB/q598+kDbiU4Q98WKVvcXT0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420339;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=A+3SJA/PkdN9HZZDlR0p+sHhfCGuwNKUOc02JCjC1ks=;
	b=avB/oJT8R6zZuXfqqp1SUI3a0efhd393bt58NpR5j7eNvFgVMFXN9KyQ+aNQn7WaSE/OrVaTYn2CdKZ9wHFc16tWmHfXoHzMpPxwyNf1b372JC+42+rECxp+P0ZZpen7ciJbhakFLpVuKwU3OLIqXJ+Z8qIntW7SLks15WBmFKA=
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 1564420339238885.6230430314035;
 Mon, 29 Jul 2019 10:12:19 -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 A13D13079B65;
	Mon, 29 Jul 2019 17:12: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 623455C21F;
	Mon, 29 Jul 2019 17:12: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 2403219738;
	Mon, 29 Jul 2019 17:12:17 +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 x6THC85M027777 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:08 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id C05D95C27C; Mon, 29 Jul 2019 17:12:08 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id B6C065C1A1;
	Mon, 29 Jul 2019 17:12:07 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:03 +0100
Message-Id: <20190729171130.25484-22-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 21/48] 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.16
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]);
 Mon, 29 Jul 2019 17:12:18 +0000 (UTC)

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

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
Reviewed-by: Christophe de Dinechin <dinechin@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 c7f276b2bc..7eeb2b4f07 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..5535fc5862 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 Wed May  8 00:05:16 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=1564420344; cv=none;
	d=zoho.com; s=zohoarc;
	b=clfa6rau2zlE9LN8lwTazVwKL56ecVlM/EMvdIC4UhI5bBOrSM45pOftueQ3ogv/W8BFepIQGs1C+ERrqS9wvai8npuOY3CAjC9XGKLvf+f3t7phjOCEsNrJ38igWyeadfctRuwHI4NH8WSkJ2jCBq+Qo+T/wwVgJGURxnFoME4=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420344;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=yFXyEOh8CdErtUzTI6cFpnrq3r9ZWTI4bLa3WrYQ1h0=;
	b=nsLOFffOxCKbGuWTCr9NU7sdkqgASy4h3UyzRIQpw0sxTo5HQ6chj9aPOw/elJo+ja/es9nY6e8PZNfysxnu3HJ8YSsPZqRWPDS4cx0NSGI1kj7iMcOTHzpr8Hh17Cj2UCN94uJPQa5zlxhsjf3uegbaxV/RguGivZ7NNPVs3Qk=
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 1564420344672320.1747708167102;
 Mon, 29 Jul 2019 10:12:24 -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 5CEDC30B8E02;
	Mon, 29 Jul 2019 17:12:23 +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 34B1660C61;
	Mon, 29 Jul 2019 17:12: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 F0B9E19736;
	Mon, 29 Jul 2019 17:12: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 x6THCA40027785 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:10 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 412065C206; Mon, 29 Jul 2019 17:12:10 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 1BAC15C1A1;
	Mon, 29 Jul 2019 17:12:08 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:04 +0100
Message-Id: <20190729171130.25484-23-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 22/48] 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.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.47]);
 Mon, 29 Jul 2019 17:12:24 +0000 (UTC)

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

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
---
 .gitignore                          |  4 ++
 libvirt.spec.in                     |  8 ++++
 src/network/Makefile.inc.am         | 61 +++++++++++++++++++++++++++++
 src/network/virtnetworkd.service.in | 25 ++++++++++++
 4 files changed, 98 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 7eeb2b4f07..52a671d908 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..672142452e 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..656e8b4f84
--- /dev/null
+++ b/src/network/virtnetworkd.service.in
@@ -0,0 +1,25 @@
+[Unit]
+Description=3DVirtualization network daemon
+Conflicts=3Dlibvirtd.service
+Requires=3Dvirtnetworkd.socket
+Requires=3Dvirtnetworkd-ro.socket
+Requires=3Dvirtnetworkd-admin.socket
+After=3Dnetwork.target
+After=3Ddbus.service
+After=3Dapparmor.service
+After=3Dlocal-fs.target
+Documentation=3Dman:libvirtd(8)
+Documentation=3Dhttps://libvirt.org
+
+[Service]
+Type=3Dnotify
+ExecStart=3D@sbindir@/virtnetworkd --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+Restart=3Don-failure
+KillMode=3Dprocess
+
+[Install]
+WantedBy=3Dmulti-user.target
+Also=3Dvirtnetworkd.socket
+Also=3Dvirtnetworkd-ro.socket
+Also=3Dvirtnetworkd-admin.socket
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420338; cv=none;
	d=zoho.com; s=zohoarc;
	b=LNGOuzy1ZB9nWiPWaqcoGBaq/6Za4/1csasvNz+8/JzgkZR2p3wdqdSbT5b/iQbRuPETkWY41JaKeHkgqLiHw/7VkfYAJ5kgOsUidFsxq9pz2B7gvFiL3VcK+2qBaoaZcJsa4jugicdHIiIItVo8+aNhb9ytGva5uh97F27IDOU=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420338;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=Mek0QTsLw9kRyNZXAtaxLdSmYpwCoQK9lCmmJVsgjYI=;
	b=FUmNW2ImHRyG89cuNy1aWka9PIX7X+5iPvunJGqZqLyOn894cx0m5vRcNIjy+JsZOtLWpSon+y6XgRrCuYWL23DeBUmJhUjvMVVdljVR1kAHIgrzQsyvbfVMvGglUg9uxRlP8qNWhVZq1gBg94OaCwnIH++5uJAhcM+bwKZhmeY=
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 1564420338400734.6417689995385;
 Mon, 29 Jul 2019 10:12:18 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com
 [10.5.11.23])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 4879330BD1B5;
	Mon, 29 Jul 2019 17:12: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 0085D45D4;
	Mon, 29 Jul 2019 17:12:16 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id A71E719733;
	Mon, 29 Jul 2019 17:12: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 x6THCBor027820 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:11 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id C26C55C277; Mon, 29 Jul 2019 17:12:11 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 922115C1A1;
	Mon, 29 Jul 2019 17:12:10 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:05 +0100
Message-Id: <20190729171130.25484-24-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 23/48] interface: introduce virtinterfaced
	daemon
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]);
 Mon, 29 Jul 2019 17:12:17 +0000 (UTC)

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

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
Reviewed-by: Christophe de Dinechin <dinechin@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 52a671d908..b4fab26ea4 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..4c989bebec 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 Wed May  8 00:05:16 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=1564420348; cv=none;
	d=zoho.com; s=zohoarc;
	b=KVsb0eMVUmXUIexZCpOsHThVHuKJJvefJRdEfwntKJRISUWbah0xHf/V1SvXqQ42sftkUXGQp8Swkl3mxV9EyTVlPT30HzlKMn9JnnRSFzOG1PFjuBwGWYOnHCWsJMrNI3ytGLsWjjwb74d2eAz3aXYkSlNNRW7Fv7mfsn8b9fM=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420348;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=QoP4V5I1gKC4t2jYd/S8LMf4u+DCyxYkQUh9eA43Yzc=;
	b=UdnhpjBS8KXw7bhf7JGh0N5p4FABp/Uc9gv/8fkJIu+wfgA+SGQoByOHeDin+0ytzfg/OIXoGGbEsQnHEOfCsReZobLt8uGLkS2o7MTfONTcqFm/EzU2DkKAG4SuYM26sm+oR3CH9cT1QM37jPDLxa8nCf7g6iMSETJXb/lS7T4=
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 1564420348268182.35195964318166;
 Mon, 29 Jul 2019 10:12:28 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
 [10.5.11.22])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id E97F13CA10;
	Mon, 29 Jul 2019 17:12:26 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id BA85C10002D3;
	Mon, 29 Jul 2019 17:12: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 76A751972F;
	Mon, 29 Jul 2019 17:12: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 x6THCDGL027850 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:13 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 744AE5C239; Mon, 29 Jul 2019 17:12:13 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 1AFCE5C22C;
	Mon, 29 Jul 2019 17:12:11 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:06 +0100
Message-Id: <20190729171130.25484-25-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 24/48] 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.22
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]);
 Mon, 29 Jul 2019 17:12:27 +0000 (UTC)

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

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
---
 .gitignore                          |  4 ++
 libvirt.spec.in                     |  8 ++++
 src/storage/Makefile.inc.am         | 61 +++++++++++++++++++++++++++++
 src/storage/virtstoraged.service.in | 26 ++++++++++++
 4 files changed, 99 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 b4fab26ea4..c34445090d 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..767875785a 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..9aa26764a9
--- /dev/null
+++ b/src/storage/virtstoraged.service.in
@@ -0,0 +1,26 @@
+[Unit]
+Description=3DVirtualization storage daemon
+Conflicts=3Dlibvirtd.service
+Requires=3Dvirtstoraged.socket
+Requires=3Dvirtstoraged-ro.socket
+Requires=3Dvirtstoraged-admin.socket
+After=3Dnetwork.target
+After=3Ddbus.service
+After=3Discsid.service
+After=3Dapparmor.service
+After=3Dlocal-fs.target
+After=3Dremote-fs.target
+Documentation=3Dman:libvirtd(8)
+Documentation=3Dhttps://libvirt.org
+
+[Service]
+Type=3Dnotify
+ExecStart=3D@sbindir@/virtstoraged --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+Restart=3Don-failure
+
+[Install]
+WantedBy=3Dmulti-user.target
+Also=3Dvirtstoraged.socket
+Also=3Dvirtstoraged-ro.socket
+Also=3Dvirtstoraged-admin.socket
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420342; cv=none;
	d=zoho.com; s=zohoarc;
	b=X1lzlKaPPAnxifJ1YcbOpCJbVf4nUeEO4lLciPZERtXQLUtlBw9BrKRy5kyLyIAQg3L0PFUCTPNXF+MA/4eD4UEcwfGBTfb5phRhin3VDW92ojAgTat/4/ovBlfv/jk2vVpXhwXt7LXcFdmuAf5+SVXgc2IxVbDV56lABvhsiYs=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420342;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=qL7wo1v1nE9bC5QF8z/W1aeBXsMrMtlkqFk8SvVbNeo=;
	b=NGOW1dteyRDtBZnITAp7K7B4gd3lmpP0KG3pgPE8UFn2e7qoZuBinF24NQ4tqbK+Shoap9nfufeSQXS78ZOgzjaoo97A8ab6UxJ5vf0ZaVuGOvJrL4Ti8Jh9cIiN9OdllO/cHR7GPTz07kgEMkvZG0foVWl3V9sbJvTAgMU6s/A=
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 1564420342238604.2733951520437;
 Mon, 29 Jul 2019 10:12:22 -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 DF2FA30C1E2F;
	Mon, 29 Jul 2019 17:12:20 +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 AFA8C601A9;
	Mon, 29 Jul 2019 17:12: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 68757180BAA1;
	Mon, 29 Jul 2019 17:12: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 x6THCESF027886 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:14 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id C33085C206; Mon, 29 Jul 2019 17:12:14 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id C41245C21F;
	Mon, 29 Jul 2019 17:12:13 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:07 +0100
Message-Id: <20190729171130.25484-26-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 25/48] 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.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]);
 Mon, 29 Jul 2019 17:12:21 +0000 (UTC)

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

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                              |  4 ++
 libvirt.spec.in                         |  8 ++++
 src/node_device/Makefile.inc.am         | 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 c34445090d..7519ebebcf 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..e71b790735 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 Wed May  8 00:05:16 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=1564420341; cv=none;
	d=zoho.com; s=zohoarc;
	b=ZTNzVt87q1HccFViPbSuivDzMRtfOZY73wyQt0tuBgIEp0dManLaiJsgDfgaLPstUJrvFnIYPkzUWaWzjMYJ79CpRWoYshuB11puA5MFpYe+JEVipTrzOQJxtO25SKUmxECJcqjVNyCTPn8WBIXi+RI/BJ8cxKTi5j0fxURGkcE=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420341;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=xmYcpUHwGQGDzNcwFdj4i3DwS57CzM/oI3BJzmC44JU=;
	b=ZGcVwO5pEAKQ2B1oR8RTBvwmWpFKs1DGNL4l5Hk4pVROhxJMmpgT1Wf/onjCnNPsILttaww7ms+x2XzqV3n8edaSJ9Ja/psjtoxcexQ9ThImp5uw0nm0EHIpyAZGA5Q/Xhc/yJQqVMg6GyZJclsWOeWrtK5a2Vs0NNC0v2VcUpw=
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 156442034196771.54734268512868;
 Mon, 29 Jul 2019 10:12:21 -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 52A9DB0CF5;
	Mon, 29 Jul 2019 17:12:20 +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 256901001B14;
	Mon, 29 Jul 2019 17:12: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 D981B180BA9A;
	Mon, 29 Jul 2019 17:12:19 +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 x6THCGlm027923 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:16 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 313FD5C232; Mon, 29 Jul 2019 17:12:16 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 20E0D5C1A1;
	Mon, 29 Jul 2019 17:12:14 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:08 +0100
Message-Id: <20190729171130.25484-27-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 26/48] nwfilter: introduce virtnwfilterd daemon
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]);
 Mon, 29 Jul 2019 17:12:21 +0000 (UTC)

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

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                            |  4 ++
 libvirt.spec.in                       |  8 ++++
 src/nwfilter/Makefile.inc.am          | 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 7519ebebcf..3c0194df29 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..5c5e636ccc 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 Wed May  8 00:05:16 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=1564420345; cv=none;
	d=zoho.com; s=zohoarc;
	b=k94MrrD1rlGthdFP1R/XgZWHf0w2Q6Nyu7rmQv/VAFx47nKFx58oC+D3h6/fCASBkqjP/5iofG4VCQT4YYsUrEUfX/OeSj4/xnCdTobuD+lJ6hprlH1NWhsKQx4QbClpDb0WYwoYwkRJJkIhDFjWpEkfeI9odIzmafq4qd1+oM0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420345;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=od/o70WqhuwBHIR3vKCh/R0uSY3IK1RF7wmkrGqPTak=;
	b=AHh8ceKlI80DVqB4XYmfh9iXGS0KywZ9oXrqyprjYICBYnpAVWB/XIZ2lz/IMTIpGkDXuARpU+1jcDz361ZwzxnJ4CwY3wm1eebY6kTq0Wj9vXgWls6rQZIqgO2Uk0Ohd3OU7sHpYGJb2CASQ1bolOReH86etB2YSKFEaD3ToqU=
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 15644203457861009.100002757783;
 Mon, 29 Jul 2019 10:12:25 -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 A157B7E421;
	Mon, 29 Jul 2019 17:12:24 +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 6220B19C58;
	Mon, 29 Jul 2019 17:12:24 +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 1BCDC19733;
	Mon, 29 Jul 2019 17:12:24 +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 x6THCHiT027941 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:17 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 83A895C232; Mon, 29 Jul 2019 17:12:17 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 8C1295C206;
	Mon, 29 Jul 2019 17:12:16 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:09 +0100
Message-Id: <20190729171130.25484-28-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 27/48] 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.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]);
 Mon, 29 Jul 2019 17:12:25 +0000 (UTC)

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

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

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

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                    |  4 +++
 libvirt.spec.in               |  8 +++++
 src/libxl/Makefile.inc.am     | 62 +++++++++++++++++++++++++++++++++++
 src/libxl/virtxend.service.in | 26 +++++++++++++++
 4 files changed, 100 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 3c0194df29..a9d12faa2a 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..6f303cc66c 100644
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -65,6 +65,68 @@ libvirt_driver_libxl_impl_la_LIBADD =3D \
 	$(NULL)
 libvirt_driver_libxl_impl_la_SOURCES =3D $(LIBXL_DRIVER_SOURCES)
=20
+sbin_PROGRAMS +=3D virtxend
+
+nodist_conf_DATA +=3D libxl/virtxend.conf
+augeas_DATA +=3D libxl/virtxend.aug
+augeastest_DATA +=3D libxl/test_virtxend.aug
+CLEANFILES +=3D libxl/virtxend.aug
+
+virtxend_SOURCES =3D $(REMOTE_DAEMON_SOURCES)
+virtxend_CFLAGS =3D \
+       $(REMOTE_DAEMON_CFLAGS) \
+       -DDAEMON_NAME=3D"\"virtxend\"" \
+       -DMODULE_NAME=3D"\"libxl\"" \
+       $(NULL)
+virtxend_LDFLAGS =3D $(REMOTE_DAEMON_LD_FLAGS)
+virtxend_LDADD =3D $(REMOTE_DAEMON_LD_ADD)
+
+SYSTEMD_UNIT_FILES +=3D \
+	virtxend.service \
+	virtxend.socket \
+	virtxend-ro.socket \
+	virtxend-admin.socket \
+	$(NULL)
+SYSTEMD_UNIT_FILES_IN +=3D \
+	libxl/virtxend.service.in \
+	$(NULL)
+
+VIRTXEND_UNIT_VARS =3D \
+	$(COMMON_UNIT_VARS) \
+	-e 's|[@]deps[@]|Conflicts=3D$(LIBVIRTD_SOCKET_UNIT_FILES)\nConditionPath=
Exists=3D/proc/xen/capabilities|g' \
+	-e 's|[@]name[@]|Libvirt libxl|g' \
+	-e 's|[@]service[@]|virtxend|g' \
+	-e 's|[@]sockprefix[@]|virtxend|g' \
+	$(NULL)
+
+virtxend.service: libxl/virtxend.service.in $(top_builddir)/config.status
+	$(AM_V_GEN)sed $(VIRTXEND_UNIT_VARS) < $< > $@-t && mv $@-t $@
+
+virtxen%.socket: remote/libvirt%.socket.in $(top_builddir)/config.status
+	$(AM_V_GEN)sed $(VIRTXEND_UNIT_VARS) < $< > $@-t && mv $@-t $@
+
+libxl/virtxend.conf: remote/libvirtd.conf.in
+	$(AM_V_GEN)sed \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtxend/' \
+		< $^ > $@
+
+libxl/virtxend.aug: remote/libvirtd.aug.in
+	$(AM_V_GEN)$(SED) \
+		-e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtxend/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtxend/' \
+		$< > $@
+
+libxl/test_virtxend.aug: remote/test_libvirtd.aug.in \
+		libxl/virtxend.conf $(AUG_GENTEST)
+	$(AM_V_GEN)$(AUG_GENTEST) libxl/virtxend.conf \
+		$(srcdir)/remote/test_libvirtd.aug.in | \
+		$(SED) -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \
+		-e 's/[@]DAEMON_NAME[@]/virtxend/' \
+		-e 's/[@]DAEMON_NAME_UC[@]/Virtxend/' \
+		> $@ || rm -f $@
+
 conf_DATA +=3D libxl/libxl.conf
 augeas_DATA +=3D libxl/libvirtd_libxl.aug
 augeastest_DATA +=3D libxl/test_libvirtd_libxl.aug
diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in
new file mode 100644
index 0000000000..059d79be77
--- /dev/null
+++ b/src/libxl/virtxend.service.in
@@ -0,0 +1,26 @@
+[Unit]
+Description=3DVirtualization xen daemon
+Conflicts=3Dlibvirtd.service
+Requires=3Dvirtxend.socket
+Requires=3Dvirtxend-ro.socket
+Requires=3Dvirtxend-admin.socket
+After=3Dnetwork.target
+After=3Ddbus.service
+After=3Dapparmor.service
+After=3Dlocal-fs.target
+After=3Dremote-fs.target
+Documentation=3Dman:libvirtd(8)
+Documentation=3Dhttps://libvirt.org
+ConditionPathExists=3D/proc/xen/capabilities
+
+[Service]
+Type=3Dnotify
+ExecStart=3D@sbindir@/virtxend --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+Restart=3Don-failure
+
+[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 Wed May  8 00:05:16 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=1564420351; cv=none;
	d=zoho.com; s=zohoarc;
	b=YYZREtDKd5tAXGtM5hFbthwcMATLI0iVIGygAOt5SoX900G9NcTQNl/d6ExDeUhcQiDRV0i/adK5kwdGK/RGXutYX5ldjtGV3bYZw8WgeHklFJcgpIZrhXPlED6Fva6Mgx+iyT/lHwwOGruqlQ08Bvymxh4SMZqUztB/+MX4gJY=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420351;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=6O8eqWDUQiuTANBw3jMuNeo1d9EzeCn2XfgY9aiVEws=;
	b=cj48YkKUmA00YmPNszF2peYcouN9bp9z7Q976L/WA8waEpg0iaWq0a656G2vGLumENmYhsW952aFwqhY4w5myy6FfvSdS5g6DUVeUzDl9x1m4wgDyXVLrRMmnofRGiK/Ls8coZkKCuSHxKunoMQw2noT42oCKkmHw9sXd4m0RzY=
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 1564420351358303.5544345246884;
 Mon, 29 Jul 2019 10:12:31 -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 384B9C050007;
	Mon, 29 Jul 2019 17:12:30 +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 0838A5E1A7;
	Mon, 29 Jul 2019 17:12: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 C22F1180BA9D;
	Mon, 29 Jul 2019 17:12: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 x6THCIwm027991 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:18 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id DB0C55C21F; Mon, 29 Jul 2019 17:12:18 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id D83525C22E;
	Mon, 29 Jul 2019 17:12:17 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:10 +0100
Message-Id: <20190729171130.25484-29-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 28/48] 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.31]);
 Mon, 29 Jul 2019 17:12:30 +0000 (UTC)

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

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                    |  4 +++
 libvirt.spec.in               |  8 +++++
 src/qemu/Makefile.inc.am      | 61 +++++++++++++++++++++++++++++++++++
 src/qemu/virtqemud.service.in | 40 +++++++++++++++++++++++
 4 files changed, 113 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 a9d12faa2a..f86b0212c7 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..215283cecd 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..44eb2a2bf7
--- /dev/null
+++ b/src/qemu/virtqemud.service.in
@@ -0,0 +1,40 @@
+[Unit]
+Description=3DVirtualization qemu daemon
+Conflicts=3Dlibvirtd.service
+Requires=3Dvirtqemud.socket
+Requires=3Dvirtqemud-ro.socket
+Requires=3Dvirtqemud-admin.socket
+Wants=3Dsystemd-machined.service
+Before=3Dlibvirt-guests.service
+After=3Dnetwork.target
+After=3Ddbus.service
+After=3Dapparmor.service
+After=3Dlocal-fs.target
+After=3Dremote-fs.target
+After=3Dsystemd-logind.service
+After=3Dsystemd-machined.service
+Documentation=3Dman:libvirtd(8)
+Documentation=3Dhttps://libvirt.org
+
+[Service]
+Type=3Dnotify
+ExecStart=3D@sbindir@/virtqemud --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+KillMode=3Dprocess
+Restart=3Don-failure
+# At least 1 FD per guest, often 2 (eg qemu monitor + qemu agent).
+# eg if we want to support 4096 guests, we'll typically need 8192 FDs
+# If changing this, also consider virtlogd.service & virtlockd.service
+# limits which are also related to number of guests
+LimitNOFILE=3D8192
+# The cgroups pids controller can limit the number of tasks started by
+# the daemon, which can limit the number of domains for some hypervisors.
+# A conservative default of 8 tasks per guest results in a TasksMax of
+# 32k to support 4096 guests.
+TasksMax=3D32768
+
+[Install]
+WantedBy=3Dmulti-user.target
+Also=3Dvirtqemud.socket
+Also=3Dvirtqemud-ro.socket
+Also=3Dvirtqemud-admin.socket
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420347; cv=none;
	d=zoho.com; s=zohoarc;
	b=ODrAVh/ipJKTHbESgZ02xOZntVIA0D4MD/GfH6mTnPj8FLjYiiBNU5xZNL/eF57Cr/cOriOSdu2ZLNZ3E/kTYiZ0udr2E1NLLyyG0MAX/6m5+vxGiX4nn5GSuLfX0l6mTKD+RUCjeAjjj+LY1V2Z9/HmWrrS9NVpD0iGGdcsmoU=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420347;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=weCmbdxOubQqruWsE4vpbfl2r3h119teKws5o38TeTU=;
	b=CHOsRW3I0JZ9X288xEPWd9C88ry2/3YmoEtUERPywxAjq3ZzuxrKh/ktXRT/x9Qtbu6NitdN0RTGFehJ/T0aimDtJRG303xczA+hKl7QY0d1HQD7NDWOubUqHP0SvZ1iOK46jcpxPXRYdIaS80GIrLMHG4uySSjlCXgBcr+bfg0=
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 15644203471101009.8047367468988;
 Mon, 29 Jul 2019 10:12:27 -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 0157E30BD1BD;
	Mon, 29 Jul 2019 17:12: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 CD25A5C206;
	Mon, 29 Jul 2019 17:12:25 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 916CC180B7B0;
	Mon, 29 Jul 2019 17:12:25 +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 x6THCKZi028027 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:20 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id AD85F5C23D; Mon, 29 Jul 2019 17:12:20 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 809DA5C1A1;
	Mon, 29 Jul 2019 17:12:19 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:11 +0100
Message-Id: <20190729171130.25484-30-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 29/48] 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.49]);
 Mon, 29 Jul 2019 17:12:26 +0000 (UTC)

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

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                  |  4 +++
 libvirt.spec.in             |  8 +++++
 src/lxc/Makefile.inc.am     | 62 +++++++++++++++++++++++++++++++++++++
 src/lxc/virtlxcd.service.in | 40 ++++++++++++++++++++++++
 4 files changed, 114 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 f86b0212c7..81fc1481e0 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..4960ee4324 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..c732499a64
--- /dev/null
+++ b/src/lxc/virtlxcd.service.in
@@ -0,0 +1,40 @@
+[Unit]
+Description=3DVirtualization lxc daemon
+Conflicts=3Dlibvirtd.service
+Requires=3Dvirtlxcd.socket
+Requires=3Dvirtlxcd-ro.socket
+Requires=3Dvirtlxcd-admin.socket
+Wants=3Dsystemd-machined.service
+Before=3Dlibvirt-guests.service
+After=3Dnetwork.target
+After=3Ddbus.service
+After=3Dapparmor.service
+After=3Dlocal-fs.target
+After=3Dremote-fs.target
+After=3Dsystemd-logind.service
+After=3Dsystemd-machined.service
+Documentation=3Dman:libvirtd(8)
+Documentation=3Dhttps://libvirt.org
+
+[Service]
+Type=3Dnotify
+ExecStart=3D@sbindir@/virtlxcd --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+KillMode=3Dprocess
+Restart=3Don-failure
+# At least 1 FD per guest, often 2 (eg qemu monitor + qemu agent).
+# eg if we want to support 4096 guests, we'll typically need 8192 FDs
+# If changing this, also consider virtlogd.service & virtlockd.service
+# limits which are also related to number of guests
+LimitNOFILE=3D8192
+# The cgroups pids controller can limit the number of tasks started by
+# the daemon, which can limit the number of domains for some hypervisors.
+# A conservative default of 8 tasks per guest results in a TasksMax of
+# 32k to support 4096 guests.
+TasksMax=3D32768
+
+[Install]
+WantedBy=3Dmulti-user.target
+Also=3Dvirtlxcd.socket
+Also=3Dvirtlxcd-ro.socket
+Also=3Dvirtlxcd-admin.socket
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420349; cv=none;
	d=zoho.com; s=zohoarc;
	b=dHJrDRFFyO+xCOI413FBzifW8n+58evI5KbwPq+TkTf0x/Pe5w8mGJGv1C8s09p19iaa1SnJcXyC4Pbuy5+V4tEejGET/dvBx0xrbFS9/GhPtMperNskpu+aUMP7OqTXq/CqKkcy+H8wYGblLrcWX/XSWjL3xg+Hv8nT/dQ7NZA=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420349;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=XQBurT/+3W25bCDt8ec/fXPGTqHZ+B7DhKJCHvMG/f0=;
	b=BWebHrbAGwUkLDtEfTASUH+ix8XDyyu5pZ1YQhkM8fCbycDy0H8X5dCHV3fbupT8sgvS26bVXd0S50mYpuqoMQZF0ID1c53alEOv3HuVhto7Cu2zeC8fSPgpCePE9ZDFGr0PauibZ9o84W2FNxo8FOGESbxAm4Kfqlqx5TyqNUA=
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 1564420349046274.91010608018007;
 Mon, 29 Jul 2019 10:12:29 -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 E0095793CC;
	Mon, 29 Jul 2019 17:12: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 B8D0B5DE64;
	Mon, 29 Jul 2019 17:12: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 7E298180B536;
	Mon, 29 Jul 2019 17:12: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 x6THCMVo028054 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:22 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 12A325C22B; Mon, 29 Jul 2019 17:12:22 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 174E65C219;
	Mon, 29 Jul 2019 17:12:20 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:12 +0100
Message-Id: <20190729171130.25484-31-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 30/48] 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.14
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]);
 Mon, 29 Jul 2019 17:12:28 +0000 (UTC)

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

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                    |  4 +++
 libvirt.spec.in               |  8 +++++
 src/vbox/Makefile.inc.am      | 62 +++++++++++++++++++++++++++++++++++
 src/vbox/virtvboxd.service.in | 25 ++++++++++++++
 4 files changed, 99 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 81fc1481e0..c1da28892a 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..74f274eb6a 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..7e0f7518d6
--- /dev/null
+++ b/src/vbox/virtvboxd.service.in
@@ -0,0 +1,25 @@
+[Unit]
+Description=3DVirtualization vbox daemon
+Conflicts=3Dlibvirtd.service
+Requires=3Dvirtvboxd.socket
+Requires=3Dvirtvboxd-ro.socket
+Requires=3Dvirtvboxd-admin.socket
+After=3Dnetwork.target
+After=3Ddbus.service
+After=3Dapparmor.service
+After=3Dlocal-fs.target
+After=3Dremote-fs.target
+Documentation=3Dman:libvirtd(8)
+Documentation=3Dhttps://libvirt.org
+
+[Service]
+Type=3Dnotify
+ExecStart=3D@sbindir@/virtvboxd --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+Restart=3Don-failure
+
+[Install]
+WantedBy=3Dmulti-user.target
+Also=3Dvirtvboxd.socket
+Also=3Dvirtvboxd-ro.socket
+Also=3Dvirtvboxd-admin.socket
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420354; cv=none;
	d=zoho.com; s=zohoarc;
	b=ghRUsvN9pN42e7JjKU2U+SyTCgmON93slLKMt+5FxN9zJTfbx1/TbyaLsHGb8ua1dLRlMKz+YM8hMQnxE8MyOtdIs7UPz8wZxAVow3cXaV5uCZt5LHFNJHw++b7fTS7PZ+FYbfqqPNbcr3/8KvypxSJHmZxo0vl5h5XA5XjddJE=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420354;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=vnP7HcBJwG+beUqlJZ4/DL04Xnj3R956PjTK527Y1qA=;
	b=jJIpsSObSE8gfISxKCMbCpdwvlkye3mr+DDcAnAEnmOPjKIqJouQafADylvIxs6oqGkrLZZNUbQe6OgmAOH9Ji9Trs4N8XHgznHoyXepZOlEVyku6PnRmblrECFi70QL3Q+a3+pKjh/wGQMJAG6o1+qTgYYcXIF23QFoW5gjVZM=
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 156442035490242.30877336178912;
 Mon, 29 Jul 2019 10:12:34 -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 C7F43EC526;
	Mon, 29 Jul 2019 17:12:33 +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 9494810002D8;
	Mon, 29 Jul 2019 17:12:33 +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 516461972E;
	Mon, 29 Jul 2019 17:12:33 +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 x6THCNUv028076 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:23 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id BEFA35F9C7; Mon, 29 Jul 2019 17:12:23 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 622915C21F;
	Mon, 29 Jul 2019 17:12:22 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:13 +0100
Message-Id: <20190729171130.25484-32-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 31/48] bhyve: introduce virtbhyved daemon
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]);
 Mon, 29 Jul 2019 17:12:34 +0000 (UTC)

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

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                |  4 ++++
 src/bhyve/Makefile.inc.am | 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..210f04f240 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 Wed May  8 00:05:16 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=1564420352; cv=none;
	d=zoho.com; s=zohoarc;
	b=ScP4zhN9ITef2TtVcDP0juWqWhHbtX5S7E8tWSdoRS8+SLSZZBfBnThmR4aGjjLkOnxA7hWb/GH2Oekj2HOYjEuEz7DUkbu4aknFdZUau+AjKRWKn3ix3XB9moczqH5hCLe+yu9hDUrHdBo85BtkPq7geSAt/mz/mElnVvHDUSA=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420352;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=cBb/eqGz+bg+hTR/AbyQRTW9SuSX6rDRWkiQLdBx5Qg=;
	b=FcOzAiXjN0pOpVLvMBmHXCSMZdUFfCNF9eeX2ZEuX6C1fOP4nqkvX9SqgVIwCfqewyoo0RRnQ1waV4cnuZS65UQsq2igrOYeBt6wocPF8xUrWlVfSkB2iDZ4hsRnECw6iBVCdd5pV8ulNEnfix7cGL77bS3C1o4xTE3DNYL0Lj4=
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 1564420352563716.4773889788485;
 Mon, 29 Jul 2019 10:12:32 -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 62244C0AD2A9;
	Mon, 29 Jul 2019 17:12:31 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 3B8DD60C4C;
	Mon, 29 Jul 2019 17:12: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 EA63A180BA9F;
	Mon, 29 Jul 2019 17:12: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 x6THCPKd028111 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:25 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 3AD075C22E; Mon, 29 Jul 2019 17:12:25 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 176EB5C22B;
	Mon, 29 Jul 2019 17:12:23 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:14 +0100
Message-Id: <20190729171130.25484-33-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 32/48] 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.12
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]);
 Mon, 29 Jul 2019 17:12:31 +0000 (UTC)

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

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 .gitignore                |  4 +++
 src/vz/Makefile.inc.am    | 62 +++++++++++++++++++++++++++++++++++++++
 src/vz/virtvzd.service.in | 25 ++++++++++++++++
 3 files changed, 91 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..0176586d4c 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..cd0f558768
--- /dev/null
+++ b/src/vz/virtvzd.service.in
@@ -0,0 +1,25 @@
+[Unit]
+Description=3DVirtualization vz daemon
+Conflicts=3Dlibvirtd.service
+Requires=3Dvirtvzd.socket
+Requires=3Dvirtvzd-ro.socket
+Requires=3Dvirtvzd-admin.socket
+After=3Dnetwork.target
+After=3Ddbus.service
+After=3Dapparmor.service
+After=3Dlocal-fs.target
+After=3Dremote-fs.target
+Documentation=3Dman:libvirtd(8)
+Documentation=3Dhttps://libvirt.org
+
+[Service]
+Type=3Dnotify
+ExecStart=3D@sbindir@/virtvzd --timeout 120
+ExecReload=3D/bin/kill -HUP $MAINPID
+Restart=3Don-failure
+
+[Install]
+WantedBy=3Dmulti-user.target
+Also=3Dvirtvzd.socket
+Also=3Dvirtvzd-ro.socket
+Also=3Dvirtvzd-admin.socket
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420356; cv=none;
	d=zoho.com; s=zohoarc;
	b=QCr77GOu7p8o2SIaCgnRXi01zOmQqmL1jUEVp+VMyW9zUii6ay/Brcbnlr4ni9rQoeSX9No8we9qZlhFGOnfqgYe3QzMkd+/HKgZGs0fu2lJsuGD7RO7OyyEuazXr4KwW5nwdb9mroJlYqWR7I74T9+4vkveFjr3O9CJ56LKxcc=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420356;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=9P9p7t8n4f8IzZv6uymKuUEtT+o5UkuhQjwOfjLOtsw=;
	b=iIf8lJ/3JOllS0zibMrKfFaOFgscH/BW2U4fc78nexNDjKpf9TXx762bn4w1o0D2McRqplgP2+gMHZF+PJZidIL1qDYDk64Bp4ZaDKqc4d2vGFktUryyz9PvbWdOo8sn0V0tai4lwHOabZXQ+V87cBUbfbQiAemcsgG/EA/+qnc=
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 1564420356507831.1488274479166;
 Mon, 29 Jul 2019 10:12:36 -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 DAED5796E0;
	Mon, 29 Jul 2019 17:12:34 +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 B995660C68;
	Mon, 29 Jul 2019 17:12:34 +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 80AD31972D;
	Mon, 29 Jul 2019 17:12: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 x6THCQ8D028136 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:26 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id CDF875C206; Mon, 29 Jul 2019 17:12:26 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id A1D295C1A1;
	Mon, 29 Jul 2019 17:12:25 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:15 +0100
Message-Id: <20190729171130.25484-34-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 33/48] 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.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.25]);
 Mon, 29 Jul 2019 17:12:35 +0000 (UTC)

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

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

diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c
index 74dedf64d8..fa077d5a46 100644
--- a/src/libvirt-admin.c
+++ b/src/libvirt-admin.c
@@ -36,10 +36,6 @@
=20
 #define VIR_FROM_THIS VIR_FROM_ADMIN
=20
-#define LIBVIRTD_ADMIN_SOCK_NAME "libvirt-admin-sock"
-#define VIRTLOGD_ADMIN_SOCK_NAME "virtlogd-admin-sock"
-#define VIRTLOCKD_ADMIN_SOCK_NAME "virtlockd-admin-sock"
-
=20
 VIR_LOG_INIT("libvirt-admin");
=20
@@ -127,27 +123,29 @@ 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, "%s/run/libvirt/%s-admin-sock",
+                            LOCALSTATEDIR,
+                            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 Wed May  8 00:05:16 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=1564420360; cv=none;
	d=zoho.com; s=zohoarc;
	b=LtCoTr6cUVb1nLXAydLMv5stnVzDJbJV1UdbRczJk84FTcuK0DuUE0MgQkWckVi9cHNdzJwp8tsPzhBK+2DTjOjZNb3r4TGXdrVjR9n6Qa1rnZx/OswhtClbKEV7Qr2J7Noh3wawU1lyZNbTorYBy1cICrW4F0MSftEEsK6L3a0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420360;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=+U93zzTFz+XJMhlmE2qtnV7BVsCnjk4hLKVye6xUxwY=;
	b=JeksYzpk54+wO6bJJTVSYibFqDh4e6UwiSmIWjkivMPpJYWXHOmmOMHfyg+2uXN1PFlxx+7HZikz8hne1kTFlcPjpKkg8+UCoUIWQug/ya+SeM5bmTzLxncYekTuSzLpsHHQI4z3mN1cib0difbB77z1blqjUjE0rpTAei9jFQ4=
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 1564420360296954.1679313874381;
 Mon, 29 Jul 2019 10:12:40 -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 DA7267FDE9;
	Mon, 29 Jul 2019 17:12:38 +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 2FCEE1001DC0;
	Mon, 29 Jul 2019 17:12:38 +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 DB06319734;
	Mon, 29 Jul 2019 17:12: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 x6THCTUb028172 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:29 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 291DF5C260; Mon, 29 Jul 2019 17:12:29 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 3A8A95C206;
	Mon, 29 Jul 2019 17:12:27 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:16 +0100
Message-Id: <20190729171130.25484-35-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 34/48] 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.22
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]);
 Mon, 29 Jul 2019 17:12:39 +0000 (UTC)

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

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

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

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420370; cv=none;
	d=zoho.com; s=zohoarc;
	b=gsF461DMqERFL5e9qevTcpetL2c0H6pIpcseq+w0el7MdJYuQSV71Hs0a4Z/jcgKfxDRlfqu0tc2nD+5UwLXfCGCW3FTOskcpVVCBnsdW4xZG62MwG6IC9cQn6R1bl2Onq4XKL/qvizb6Ij+Gf8Rg+x7BylfmE/yhUHaUd9T8yo=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420370;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=zjt6FgyZYsf2ByxFdpgoKpZ8suKU7f8kn7RS6VQ+hjk=;
	b=JN1KBAaQMlcWE2sV8+WPF0GY4yAnElTgFbal+r/sKw1yq22xku0iGSzs4OZJ+P/b/nGlxCiQhAe7RFQWnnMDH6nPrz0/W+564DLcLl2phHQ7hPMRWiGss+XgOQyHgeIm1ts1PbL92dZecL5K4ndV5KqKE/o3NWpxOZwY3q3iovE=
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 1564420370256920.8643376117045;
 Mon, 29 Jul 2019 10:12:50 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 25E1430A8848;
	Mon, 29 Jul 2019 17:12:43 +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 EC604600F8;
	Mon, 29 Jul 2019 17:12:42 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id AEAB919734;
	Mon, 29 Jul 2019 17:12: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 x6THCUlp028206 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:30 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 8563C5C232; Mon, 29 Jul 2019 17:12:30 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 732615C22B;
	Mon, 29 Jul 2019 17:12:29 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:17 +0100
Message-Id: <20190729171130.25484-36-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 35/48] 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.42]);
 Mon, 29 Jul 2019 17:12:49 +0000 (UTC)

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

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

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

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420357; cv=none;
	d=zoho.com; s=zohoarc;
	b=FZgnecOjBwc9Z6WsEgshBWH+wvCM0eqGgTWKcLmu9GrOwNdbZBjxabECj5Y4oBCNSODH9zC2RijeZGKQIBqiKC3f5pMAGnX72vMpJbMW8H6An1+HxSNa9FWv0S8rtdl5I7Z40ARYB7t0a38ht5unFKjUvWUponXkF4QcSsXi2f0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420357;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=RqdKC/o5cE2ppXPIcKVWi7eSPmRIhBkoqiGjO1jP6go=;
	b=UyhNMzgxw7BN4pOSvCJkN9K9HrlUm3PXAb+kZCScZGY0yrgtEaN9SrOOQWEeighU8bSt/56KJWP3QcKzp6mKpTNLVzkSgtS1u7MmeWBLS4+eFZG64uzFOciGem2PWRA5zVLx7TBlsaYl+/ZKV1kVNSxMeoavw8IjXcsDykV6di4=
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 1564420357853196.09668979180424;
 Mon, 29 Jul 2019 10:12:37 -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 37A0D3C916;
	Mon, 29 Jul 2019 17:12: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 05BDA10016E9;
	Mon, 29 Jul 2019 17:12: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 BA8491972F;
	Mon, 29 Jul 2019 17:12: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 x6THCV5x028221 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:31 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id D82645C219; Mon, 29 Jul 2019 17:12:31 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id D653D5C21F;
	Mon, 29 Jul 2019 17:12:30 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:18 +0100
Message-Id: <20190729171130.25484-37-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 36/48] remote: fix lock ordering mistake in
	event registration
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.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.39]);
 Mon, 29 Jul 2019 17:12:37 +0000 (UTC)

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

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

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

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420367; cv=none;
	d=zoho.com; s=zohoarc;
	b=RZ6gjjDc7rQkX+oUTsR8zjK6nYSsz9TE/cgD3j9+xJQELST4DnAx5x7u77R9bnX0iBr8kbThFYbRRS1Em7aalZ28xidG7BjlOiM3Opz3WjdK/qheRFN9l/Vz+x9bkhnd57afM8iPwDsh+YwSHENH6mmEUSaaXM/YtIsCq0myfqk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420367;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=Ap2Vaictdl9cNuyTlA5o1DkfMol/Yi0AZvLvZQJOKIE=;
	b=kO2tSbnUbi2TkoT6YjG7wIpapTh7pdsaQfQT6Wl9FFHcJoID30oPZ6SxbCz1LgKOy++bMu8DN+cYgox1J9l35bYyZVkL+LQUF9APDgTZC5gutbGFZLJiuuvM3d+xpHwVNarX9xiI6oQlsL4MTNWifEuEP7ZaBUX3sk5YaZGtnRY=
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 1564420367839129.4070061535897;
 Mon, 29 Jul 2019 10:12:47 -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 9E27CC09AD0F;
	Mon, 29 Jul 2019 17:12:46 +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 736365D6A0;
	Mon, 29 Jul 2019 17:12:46 +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 3636D19735;
	Mon, 29 Jul 2019 17:12:46 +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 x6THCg3d028416 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:42 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 59BBB5C22B; Mon, 29 Jul 2019 17:12:42 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id DA5B75C21A;
	Mon, 29 Jul 2019 17:12:32 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:19 +0100
Message-Id: <20190729171130.25484-38-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 37/48] 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.32]);
 Mon, 29 Jul 2019 17:12:47 +0000 (UTC)

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

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

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

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420376; cv=none;
	d=zoho.com; s=zohoarc;
	b=Qv3tTliSaW6jaJn+kX98asYNOVewn2dPyJFCME80SsQnORIIp0Qhn9GXQSSVN3YMqXomyxQ37R4lLQDCY2LSNOtsybrEI0Q/tjEH5mfLU+KAiK0vt0czRIsLR6P4RLrEO5I/gmXrVLv+HaJFa06GIvx+1JJWG84ILn4oAgFWvjM=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420376;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=xYu2EdezRrWBtPz5oVn62EOpG7LXUlhBN12+zXoMxqw=;
	b=AIey52P95lPGma1io81HHEeEW5hfo4oyogunvXghwV16L1XYnggFKVPolYJeQh9433sl0lurPB/buUBgluk5WXz83y3B0ImkOOz/wq+GwdR8x+iw3T5sNwnHdjt4JaM4TPWariSGL1y6XABLXgNN+4AeUSWuWwoSdYWWAFYvMOs=
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 1564420376315136.00293229987415;
 Mon, 29 Jul 2019 10:12:56 -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 75B4E308C38A;
	Mon, 29 Jul 2019 17:12:54 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 4F47B5C22B;
	Mon, 29 Jul 2019 17:12:54 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 11A09180BAA0;
	Mon, 29 Jul 2019 17:12:54 +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 x6THCq2Z028527 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:52 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 6D8D85C232; Mon, 29 Jul 2019 17:12:52 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 2251F5C21A;
	Mon, 29 Jul 2019 17:12:42 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:20 +0100
Message-Id: <20190729171130.25484-39-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 38/48] 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.16
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]);
 Mon, 29 Jul 2019 17:12:55 +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 | 162 ++++++++++++++++++++++------
 2 files changed, 145 insertions(+), 30 deletions(-)

diff --git a/src/remote/remote_daemon.h b/src/remote/remote_daemon.h
index a403d2593a..a2d9af4036 100644
--- a/src/remote/remote_daemon.h
+++ b/src/remote/remote_daemon.h
@@ -70,12 +70,25 @@ struct daemonClientPrivate {
      * called, it will be set back to NULL if that succeeds.
      */
     virConnectPtr conn;
+
+    /* These secondary drivers may point back to 'conn'
+     * in the monolithic daemon setups. Otherwise they
+     * can be NULL and opened on first use, pointing
+     * to remote driver use of an external daemon
+     */
     virConnectPtr interfaceConn;
+    const char *interfaceURI;
     virConnectPtr networkConn;
+    const char *networkURI;
     virConnectPtr nodedevConn;
+    const char *nodedevURI;
     virConnectPtr nwfilterConn;
+    const char *nwfilterURI;
     virConnectPtr secretConn;
+    const char *secretURI;
     virConnectPtr storageConn;
+    const char *storageURI;
+    bool readonly;
=20
     daemonClientStreamPtr streams;
 };
diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon=
_dispatch.c
index 5609eb4caf..8c11bb3f6c 100644
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -1941,6 +1941,33 @@ static void remoteClientCloseFunc(virNetServerClient=
Ptr client)
 }
=20
=20
+static int
+remoteOpenConn(const char *uri,
+               bool readonly,
+               virConnectPtr *conn)
+{
+    VIR_DEBUG("Getting secondary uri=3D%s readonly=3D%d conn=3D%p",
+              NULLSTR(uri), readonly, conn);
+    if (*conn)
+        return 0;
+
+    if (!uri) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection not ope=
n"));
+        return -1;
+    }
+
+    VIR_DEBUG("Opening driver %s", uri);
+    if (readonly)
+        *conn =3D virConnectOpenReadOnly(uri);
+    else
+        *conn =3D virConnectOpen(uri);
+    if (!*conn)
+        return -1;
+    VIR_DEBUG("Opened driver %p", *conn);
+    return 0;
+}
+
+
 static virConnectPtr
 remoteGetHypervisorConn(virNetServerClientPtr client)
 {
@@ -1962,10 +1989,10 @@ remoteGetInterfaceConn(virNetServerClientPtr client)
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
-    if (!priv->interfaceConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
+    if (remoteOpenConn(priv->interfaceURI,
+                       priv->readonly,
+                       &priv->interfaceConn) < 0)
         return NULL;
-    }
=20
     return priv->interfaceConn;
 }
@@ -1977,10 +2004,10 @@ remoteGetNetworkConn(virNetServerClientPtr client)
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
-    if (!priv->networkConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
+    if (remoteOpenConn(priv->networkURI,
+                       priv->readonly,
+                       &priv->networkConn) < 0)
         return NULL;
-    }
=20
     return priv->networkConn;
 }
@@ -1992,10 +2019,10 @@ remoteGetNodeDevConn(virNetServerClientPtr client)
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
-    if (!priv->nodedevConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
+    if (remoteOpenConn(priv->nodedevURI,
+                       priv->readonly,
+                       &priv->nodedevConn) < 0)
         return NULL;
-    }
=20
     return priv->nodedevConn;
 }
@@ -2007,10 +2034,10 @@ remoteGetNWFilterConn(virNetServerClientPtr client)
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
-    if (!priv->nwfilterConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
+    if (remoteOpenConn(priv->nwfilterURI,
+                       priv->readonly,
+                       &priv->nwfilterConn) < 0)
         return NULL;
-    }
=20
     return priv->nwfilterConn;
 }
@@ -2022,10 +2049,10 @@ remoteGetSecretConn(virNetServerClientPtr client)
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
-    if (!priv->secretConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
+    if (remoteOpenConn(priv->secretURI,
+                       priv->readonly,
+                       &priv->secretConn) < 0)
         return NULL;
-    }
=20
     return priv->secretConn;
 }
@@ -2037,10 +2064,10 @@ remoteGetStorageConn(virNetServerClientPtr client)
     struct daemonClientPrivate *priv =3D
         virNetServerClientGetPrivateData(client);
=20
-    if (!priv->storageConn) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("hypervisor connect=
ion not open"));
+    if (remoteOpenConn(priv->storageURI,
+                       priv->readonly,
+                       &priv->storageConn) < 0)
         return NULL;
-    }
=20
     return priv->storageConn;
 }
@@ -2077,6 +2104,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);
@@ -2095,20 +2125,88 @@ remoteDispatchConnectOpen(virNetServerPtr server AT=
TRIBUTE_UNUSED,
     if (virNetServerClientGetReadonly(client))
         flags |=3D VIR_CONNECT_RO;
=20
-    priv->conn =3D
-        flags & VIR_CONNECT_RO
-        ? virConnectOpenReadOnly(name)
-        : virConnectOpen(name);
+    priv->readonly =3D flags & VIR_CONNECT_RO;
=20
-    if (priv->conn =3D=3D NULL)
+    VIR_DEBUG("Opening driver %s", name);
+    if (priv->readonly) {
+        if (!(priv->conn =3D virConnectOpenReadOnly(name)))
+            goto cleanup;
+    } else {
+        if (!(priv->conn =3D virConnectOpen(name)))
+            goto cleanup;
+    }
+    VIR_DEBUG("Opened %p", priv->conn);
+
+#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");
+        if (getuid() =3D=3D 0) {
+            priv->interfaceURI =3D "interface:///system";
+            priv->networkURI =3D "network:///system";
+            priv->nodedevURI =3D "nodedev:///system";
+            priv->nwfilterURI =3D "nwfilter:///system";
+            priv->secretURI =3D "secret:///system";
+            priv->storageURI =3D "storage:///system";
+        } else {
+            priv->interfaceURI =3D "interface:///session";
+            priv->networkURI =3D "network:///session";
+            priv->nodedevURI =3D "nodedev:///session";
+            /* No nwfilterURI as this is a root-only driver */
+            priv->secretURI =3D "secret:///session";
+            priv->storageURI =3D "storage:///session";
+        }
+    } else if (STREQ(type, "interface")) {
+        VIR_DEBUG("Interface driver found");
+        priv->interfaceConn =3D virObjectRef(priv->conn);
+    } else if (STREQ(type, "network")) {
+        VIR_DEBUG("Network driver found");
+        priv->networkConn =3D virObjectRef(priv->conn);
+    } else if (STREQ(type, "nodedev")) {
+        VIR_DEBUG("Nodedev driver found");
+        priv->nodedevConn =3D virObjectRef(priv->conn);
+    } else if (STREQ(type, "nwfilter")) {
+        VIR_DEBUG("NWFilter driver found");
+        priv->nwfilterConn =3D virObjectRef(priv->conn);
+    } else if (STREQ(type, "secret")) {
+        VIR_DEBUG("Secret driver found");
+        priv->secretConn =3D virObjectRef(priv->conn);
+    } else if (STREQ(type, "storage")) {
+        VIR_DEBUG("Storage driver found");
+        priv->storageConn =3D virObjectRef(priv->conn);
+
+        /* Co-open the secret driver, as apps using the storage driver may=
 well
+         * need access to secrets for storage auth
+         */
+        if (getuid() =3D=3D 0)
+            priv->secretURI =3D "secret:///system";
+        else
+            priv->secretURI =3D "secret:///session";
+    } else if (STREQ(type, "remote")) {
+#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
+    } else {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Unexpected driver type '%s' opened"), type);
         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);
+    }
+#endif /* !LIBVIRTD */
=20
     /* force update the @readonly attribute which was inherited from the
      * virNetServerService object - this is important for sockets that are=
 RW
@@ -2120,6 +2218,10 @@ remoteDispatchConnectOpen(virNetServerPtr server ATT=
RIBUTE_UNUSED,
  cleanup:
     if (rv < 0)
         virNetMessageSaveError(rerr);
+    if (priv->conn) {
+        virObjectUnref(priv->conn);
+        priv->conn =3D NULL;
+    }
     virMutexUnlock(&priv->lock);
     return rv;
 }
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420380; cv=none;
	d=zoho.com; s=zohoarc;
	b=nWPGXoRV/VH+kTDMp/YXho0AjGXjVGHggn/2xMXrDf8K3tboHIaM9GASo7bmkd7U3zWLltco+xthIhSDeRdkoDeVfND6JKx5eIK2+D0/WLFY/OTTu+5e4Vlf33RVmqRX9uuUo+FwJrNoYgPMWtd0cTx9ru0aBnnfpi35at7YwIs=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420380;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=Z05CRZKXDp76Vw+ylELCwIwM2eus6YWZx1FJB61+ZB0=;
	b=inwcoIMXVfl+p87ond4+X7DtjbRJQTSK4P3jS0hmPrG9CyENAg1PBLW537E8gDqAatnXY857Jw/RNs/a8zPKnQUn5BfJml4XHrEQZVYNGwxvjFocrzFc/M/c7OM/0dRtlgaf12MbvoumaXvNMjfKW8jC3pDTai0gewbT1FU0Dcc=
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 1564420380877963.3747458369381;
 Mon, 29 Jul 2019 10:13:00 -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 1BC7B81109;
	Mon, 29 Jul 2019 17:12: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 E8BD15C219;
	Mon, 29 Jul 2019 17:12:58 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id ACCBA180B536;
	Mon, 29 Jul 2019 17:12: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 x6THCvKb028598 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:57 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 806835C22C; Mon, 29 Jul 2019 17:12:57 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 984FF5C22B;
	Mon, 29 Jul 2019 17:12:52 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:21 +0100
Message-Id: <20190729171130.25484-40-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 39/48] 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.16
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]);
 Mon, 29 Jul 2019 17:13:00 +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>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
---
 src/remote/Makefile.inc.am          |   1 +
 src/remote/remote_daemon_dispatch.c | 137 ++++++++++++++++++++++++++++
 2 files changed, 138 insertions(+)

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

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420384; cv=none;
	d=zoho.com; s=zohoarc;
	b=izPM9rMwrteoviSTm8kHZ3Ekd7yhlBxBQ2j22VyqyX06VUZZNgV5BZZL5bnp4JOokVBBCEaXexptu9hK5jDJv1XtpUaD2rDxEYu6bYP86YjXWO6XibmyOEEHGqkBqG85hVxicPUVuxpasUoaFfQtqHbW2PH9/C8eXFYpUqmpRaw=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420384;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=FcF6CS+hqEE29QA8AQgNY33Z3cFuAgXIUFS29U/8MRI=;
	b=Fda1gJQfGLxVvF67s/hmyhDTEQrseqzP1efFJqzk9Q/dgvA4DG3Ynd9vy2M0lojd6sECYMuBRu6r9m8rYv5L86A/3fZMdbMvimcq3Oceal/JrmmYNoJYsXtzuvNQOGSXWFqDzJ2K5qKoldJSITp8Y2Be50TLbRXYMX++16wQTKI=
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 1564420384332596.4770869025244;
 Mon, 29 Jul 2019 10:13:04 -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 A8B747FDF9;
	Mon, 29 Jul 2019 17:13:02 +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 778A360127;
	Mon, 29 Jul 2019 17:13:02 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 394F719731;
	Mon, 29 Jul 2019 17:13: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 x6THCw9H028612 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:58 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id BC9135C22C; Mon, 29 Jul 2019 17:12:58 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id D08D95C219;
	Mon, 29 Jul 2019 17:12:57 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:22 +0100
Message-Id: <20190729171130.25484-41-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 40/48] 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.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]);
 Mon, 29 Jul 2019 17:13:03 +0000 (UTC)

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

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

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 8e1024dca3..706d9e6e14 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -49,11 +49,35 @@
 #include "virauth.h"
 #include "virauthconfig.h"
 #include "virstring.h"
+#include "c-ctype.h"
=20
 #define VIR_FROM_THIS VIR_FROM_REMOTE
=20
 VIR_LOG_INIT("remote.remote_driver");
=20
+typedef enum {
+    REMOTE_DRIVER_TRANSPORT_TLS,
+    REMOTE_DRIVER_TRANSPORT_UNIX,
+    REMOTE_DRIVER_TRANSPORT_SSH,
+    REMOTE_DRIVER_TRANSPORT_LIBSSH2,
+    REMOTE_DRIVER_TRANSPORT_EXT,
+    REMOTE_DRIVER_TRANSPORT_TCP,
+    REMOTE_DRIVER_TRANSPORT_LIBSSH,
+
+    REMOTE_DRIVER_TRANSPORT_LAST,
+} remoteDriverTransport;
+
+VIR_ENUM_DECL(remoteDriverTransport);
+VIR_ENUM_IMPL(remoteDriverTransport,
+              REMOTE_DRIVER_TRANSPORT_LAST,
+              "tls",
+              "unix",
+              "ssh",
+              "libssh2",
+              "ext",
+              "tcp",
+              "libssh");
+
 #if SIZEOF_LONG < 8
 # define HYPER_TO_TYPE(_type, _to, _from) \
     do { \
@@ -176,10 +200,17 @@ static int remoteSplitURIScheme(virURIPtr uri,
     if (VIR_STRNDUP(*driver, uri->scheme, p ? p - uri->scheme : -1) < 0)
         return -1;
=20
-    if (p &&
-        VIR_STRDUP(*transport, p + 1) < 0) {
-        VIR_FREE(*driver);
-        return -1;
+    if (p) {
+        if (VIR_STRDUP(*transport, p + 1) < 0) {
+            VIR_FREE(*driver);
+            return -1;
+        }
+
+        p =3D *transport;
+        while (*p) {
+            *p =3D c_tolower(*p);
+            p++;
+        }
     }
=20
     return 0;
@@ -778,15 +809,7 @@ doRemoteOpen(virConnectPtr conn,
              virConfPtr conf,
              unsigned int flags)
 {
-    enum {
-        trans_tls,
-        trans_unix,
-        trans_ssh,
-        trans_libssh2,
-        trans_ext,
-        trans_tcp,
-        trans_libssh,
-    } transport;
+    int transport;
 #ifndef WIN32
     VIR_AUTOFREE(char *) daemonPath =3D NULL;
 #endif
@@ -815,42 +838,29 @@ doRemoteOpen(virConnectPtr conn,
     if (conn->uri) {
         if (!transport_str) {
             if (conn->uri->server)
-                transport =3D trans_tls;
+                transport =3D REMOTE_DRIVER_TRANSPORT_TLS;
             else
-                transport =3D trans_unix;
+                transport =3D REMOTE_DRIVER_TRANSPORT_UNIX;
         } else {
-            if (STRCASEEQ(transport_str, "tls")) {
-                transport =3D trans_tls;
-            } else if (STRCASEEQ(transport_str, "unix")) {
-                if (conn->uri->server) {
-                    virReportError(VIR_ERR_INVALID_ARG,
-                                   _("using unix socket and remote "
-                                     "server '%s' is not supported."),
-                                   conn->uri->server);
-                    return VIR_DRV_OPEN_ERROR;
-                } else {
-                    transport =3D trans_unix;
-                }
-            } else if (STRCASEEQ(transport_str, "ssh")) {
-                transport =3D trans_ssh;
-            } else if (STRCASEEQ(transport_str, "libssh2")) {
-                transport =3D trans_libssh2;
-            } else if (STRCASEEQ(transport_str, "ext")) {
-                transport =3D trans_ext;
-            } else if (STRCASEEQ(transport_str, "tcp")) {
-                transport =3D trans_tcp;
-            } else if (STRCASEEQ(transport_str, "libssh")) {
-                transport =3D trans_libssh;
-            } else {
+            if ((transport =3D remoteDriverTransportTypeFromString(transpo=
rt_str)) < 0) {
                 virReportError(VIR_ERR_INVALID_ARG, "%s",
                                _("remote_open: transport in URL not recogn=
ised "
                                  "(should be tls|unix|ssh|ext|tcp|libssh2|=
libssh)"));
                 return VIR_DRV_OPEN_ERROR;
             }
+
+            if (transport =3D=3D REMOTE_DRIVER_TRANSPORT_UNIX &&
+                conn->uri->server) {
+                virReportError(VIR_ERR_INVALID_ARG,
+                               _("using unix socket and remote "
+                                 "server '%s' is not supported."),
+                               conn->uri->server);
+                return VIR_DRV_OPEN_ERROR;
+            }
         }
     } else {
         /* No URI, then must be probing so use UNIX socket */
-        transport =3D trans_unix;
+        transport =3D REMOTE_DRIVER_TRANSPORT_UNIX;
     }
=20
     /*
@@ -861,7 +871,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;
@@ -872,10 +882,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 */
@@ -959,7 +969,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;
@@ -967,8 +977,8 @@ doRemoteOpen(virConnectPtr conn,
=20
     VIR_DEBUG("Connecting with transport %d", transport);
     /* Connect to the remote service. */
-    switch (transport) {
-    case trans_tls:
+    switch ((remoteDriverTransport)transport) {
+    case REMOTE_DRIVER_TRANSPORT_TLS:
         if (conf && !tls_priority &&
             virConfGetValueString(conf, "tls_priority", &tls_priority) < 0)
             goto failed;
@@ -991,7 +1001,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;
@@ -1006,7 +1016,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) {
@@ -1041,7 +1051,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) {
@@ -1077,7 +1087,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();
@@ -1103,7 +1113,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
@@ -1135,7 +1145,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;
@@ -1147,15 +1157,20 @@ doRemoteOpen(virConnectPtr conn,
=20
 #else /* WIN32 */
=20
-    case trans_unix:
-    case trans_ssh:
-    case trans_ext:
+    case REMOTE_DRIVER_TRANSPORT_UNIX:
+    case REMOTE_DRIVER_TRANSPORT_SSH:
+    case REMOTE_DRIVER_TRANSPORT_EXT:
         virReportError(VIR_ERR_INVALID_ARG, "%s",
                        _("transport methods unix, ssh and ext are not supp=
orted "
                          "under Windows"));
         goto failed;
=20
 #endif /* WIN32 */
+
+    case REMOTE_DRIVER_TRANSPORT_LAST:
+    default:
+        virReportEnumRangeError(remoteDriverTransport, transport);
+        goto failed;
     } /* switch (transport) */
=20
=20
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420387; cv=none;
	d=zoho.com; s=zohoarc;
	b=cURO6atMC/Q7SZst2hGdh78x1gjGOcXM9l9CfsixOwtrk/nzpU+jsYQw0NALhUeThRoPy/cqoJj7ra1kppge+wA7/V90Ww9MtgCbpd/jxg4xA5Rcy2fbseLcaEPZr2j+Cb/JNoRvQKiEejI29wiJTAUsWbOhaLuZD/zDtlkFOi0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420387;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=xZy0jWSlkn23mDfbLEpn8IK9VoLXr3oWI0FD2BwX+VY=;
	b=QZj5qy9LkGnDXXxKZu5Uz8Jpw+DpMrzbmePeFVdfvT/mTwU5Oev3jn+lQ+Zc2U4ss+eWVlnPJ2dQlCBoTe4eMuErAEiE8k/KftD2kUQJt9KXTd3c9sI9p/JwvwrP/r9YWodxhS+TLGIxsBV12TgsrUzPGMKbayF3OFb0fd81KV0=
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 1564420387341838.6754566959588;
 Mon, 29 Jul 2019 10:13:07 -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 1E0AF300BEAE;
	Mon, 29 Jul 2019 17:13: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 E826F5DE64;
	Mon, 29 Jul 2019 17:13:05 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id AA41419739;
	Mon, 29 Jul 2019 17:13:05 +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 x6THCxnw028638 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:12:59 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id EAF025C22C; Mon, 29 Jul 2019 17:12:59 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 17E845C21A;
	Mon, 29 Jul 2019 17:12:58 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:23 +0100
Message-Id: <20190729171130.25484-42-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 41/48] 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.14
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]);
 Mon, 29 Jul 2019 17:13:06 +0000 (UTC)

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

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

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 706d9e6e14..e647a77f41 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -747,34 +747,35 @@ remoteConnectSupportsFeatureUnlocked(virConnectPtr co=
nn,
     }
=20
=20
-#ifndef WIN32
-static char *remoteGetUNIXSocketNonRoot(void)
+static char *
+remoteGetUNIXSocket(remoteDriverTransport transport,
+                    unsigned int flags)
 {
     char *sockname =3D NULL;
-    char *userdir =3D virGetUserRuntimeDirectory();
-
-    if (!userdir)
-        return NULL;
+    VIR_AUTOFREE(char *) userdir =3D NULL;
+
+    if (flags & VIR_DRV_OPEN_REMOTE_USER) {
+        if (transport !=3D REMOTE_DRIVER_TRANSPORT_UNIX) {
+            virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
+                           _("Connecting to session instance without "
+                             "socket path is not supported by the %s "
+                             "transport"),
+                           remoteDriverTransportTypeToString(transport));
+            return NULL;
+        }
+        if (!(userdir =3D virGetUserRuntimeDirectory()))
+            return NULL;
=20
-    if (virAsprintf(&sockname, "%s/" LIBVIRTD_USER_UNIX_SOCKET, userdir) <=
 0) {
-        VIR_FREE(userdir);
-        return NULL;
+        if (virAsprintf(&sockname,
+                        "%s/" LIBVIRTD_USER_UNIX_SOCKET, userdir) < 0)
+            return NULL;
+    } else {
+        if (VIR_STRDUP(sockname,
+                       flags & VIR_DRV_OPEN_REMOTE_RO ?
+                       LIBVIRTD_PRIV_UNIX_SOCKET_RO :
+                       LIBVIRTD_PRIV_UNIX_SOCKET) < 0)
+            return NULL;
     }
-    VIR_FREE(userdir);
-
-    VIR_DEBUG("Chosen UNIX sockname %s", sockname);
-    return sockname;
-}
-#endif /* WIN32 */
-
-static char *remoteGetUNIXSocketRoot(unsigned int flags)
-{
-    char *sockname =3D NULL;
-
-    if (VIR_STRDUP(sockname,
-                   flags & VIR_DRV_OPEN_REMOTE_RO ?
-                   LIBVIRTD_PRIV_UNIX_SOCKET_RO : LIBVIRTD_PRIV_UNIX_SOCKE=
T) < 0)
-        return NULL;
=20
     VIR_DEBUG("Chosen UNIX sockname %s", sockname);
     return sockname;
@@ -976,6 +977,29 @@ doRemoteOpen(virConnectPtr conn,
     }
=20
     VIR_DEBUG("Connecting with transport %d", transport);
+
+    switch ((remoteDriverTransport)transport) {
+    case REMOTE_DRIVER_TRANSPORT_UNIX:
+    case REMOTE_DRIVER_TRANSPORT_SSH:
+    case REMOTE_DRIVER_TRANSPORT_LIBSSH:
+    case REMOTE_DRIVER_TRANSPORT_LIBSSH2:
+        if (!sockname &&
+            !(sockname =3D remoteGetUNIXSocket(transport, flags)))
+            goto failed;
+
+    case REMOTE_DRIVER_TRANSPORT_TCP:
+    case REMOTE_DRIVER_TRANSPORT_TLS:
+    case REMOTE_DRIVER_TRANSPORT_EXT:
+        break;
+
+    case REMOTE_DRIVER_TRANSPORT_LAST:
+    default:
+        virReportEnumRangeError(remoteDriverTransport, transport);
+        goto failed;
+    }
+
+    VIR_DEBUG("Chosen UNIX socket %s", NULLSTR(sockname));
+
     /* Connect to the remote service. */
     switch ((remoteDriverTransport)transport) {
     case REMOTE_DRIVER_TRANSPORT_TLS:
@@ -1017,20 +1041,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,
@@ -1052,20 +1062,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,
@@ -1088,15 +1084,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,
@@ -1117,20 +1104,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 Wed May  8 00:05:16 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=1564420389; cv=none;
	d=zoho.com; s=zohoarc;
	b=bidPCEI7u3s/Vy67i5hFp5utw0kd5OWgZHqpeO4t+vyazwrnHSfCP09UB1Sb3c07x4AWGhQawQTWZm23NU/IaJpIQ6boHGZT+2QsvlHbPKg2Tn2hja0MQOyNgejD38svVaDul0f2Z5x6z1rrfCL0uRvr1MAvRje0GGrBi9fwEZI=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420389;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=YjdGRsTc7XhIKVco7/oaSeepEPFE6m+25N8TnOCG4M8=;
	b=lox9fVppC/DW44p/8CvzewjszUoG5lsnkHy4ILtNhwfg4dniKO110KnFYtyNh+kCoy6RXH54qoO1/I1bA0+ZU3h7rPM7ISuNsVF6CsfEX/1EYJnq7pUKCvRWueCFJRZoim1WJlIA0o+3sN7rli2Tsw0W6xbq0JLpFd98MusID2Y=
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 1564420389501340.75225043596777;
 Mon, 29 Jul 2019 10:13:09 -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 A72D9C04AC69;
	Mon, 29 Jul 2019 17:13: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 7EC291000321;
	Mon, 29 Jul 2019 17:13:07 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4110E1806B01;
	Mon, 29 Jul 2019 17:13: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 x6THD5Ck028725 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:13:05 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id DEDEA5C22C; Mon, 29 Jul 2019 17:13:05 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 712DC5C232;
	Mon, 29 Jul 2019 17:13:00 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:24 +0100
Message-Id: <20190729171130.25484-43-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 42/48] remote: enable connecting to the
	per-driver daemons
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.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]);
 Mon, 29 Jul 2019 17:13:08 +0000 (UTC)

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/docs/remote.html.in b/docs/remote.html.in
index fbcc8bf01c..78e071a898 100644
--- a/docs/remote.html.in
+++ b/docs/remote.html.in
@@ -206,6 +206,24 @@ Note that parameter values must be
         <td colspan=3D"2"/>
         <td> Example: <code>tls_priority=3DNORMAL:-VERS-SSL3.0</code> </td>
       </tr>
+      <tr>
+        <td>
+          <code>mode</code>
+        </td>
+        <td> unix, ssh, libssh, libssh2 </td>
+        <td>
+          <dl>
+            <dt><code>auto</code></dt><dd>automatically determine the daem=
on</dd>
+            <dt><code>direct</code></dt><dd>connect to per-driver daemons<=
/dd>
+            <dt><code>legacy</code></dt><dd>connect to libvirtd</dd>
+          </dl>
+          Can also be set in <code>libvirt.conf</code> as <code>remote_mod=
e</code>
+        </td>
+      </tr>
+      <tr>
+        <td colspan=3D"2"/>
+        <td> Example: <code>mode=3Ddirect</code> </td>
+      </tr>
       <tr>
         <td>
           <code>command</code>
diff --git a/libvirt.spec.in b/libvirt.spec.in
index c1da28892a..112c3fe7c4 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1170,6 +1170,7 @@ rm -f po/stamp-po
            --without-xenapi \
            --without-vz \
            --without-bhyve \
+           --with-remote-default-mode=3Dlegacy \
            --with-interface \
            --with-network \
            --with-storage-fs \
diff --git a/m4/virt-driver-remote.m4 b/m4/virt-driver-remote.m4
index c7af5b3fc6..8d98e369b3 100644
--- a/m4/virt-driver-remote.m4
+++ b/m4/virt-driver-remote.m4
@@ -19,6 +19,7 @@ dnl
=20
 AC_DEFUN([LIBVIRT_DRIVER_ARG_REMOTE], [
   LIBVIRT_ARG_WITH_FEATURE([REMOTE], [remote driver], [yes])
+  LIBVIRT_ARG_WITH([REMOTE_DEFAULT_MODE], [remote driver default mode], [l=
egacy])
 ])
=20
 AC_DEFUN([LIBVIRT_DRIVER_CHECK_REMOTE], [
@@ -26,6 +27,20 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_REMOTE], [
     AC_DEFINE_UNQUOTED([WITH_REMOTE], 1, [whether Remote driver is enabled=
])
   fi
   AM_CONDITIONAL([WITH_REMOTE], [test "$with_remote" =3D "yes"])
+
+  case "$with_remote_default_mode" in
+    legacy)
+      REMOTE_DRIVER_MODE_DEFAULT=3DREMOTE_DRIVER_MODE_LEGACY
+      ;;
+    direct)
+      REMOTE_DRIVER_MODE_DEFAULT=3DREMOTE_DRIVER_MODE_DIRECT
+      ;;
+    *)
+      AC_MSG_ERROR([Unknown remote mode '$with_remote_default_mode'])
+      ;;
+  esac
+
+  AC_DEFINE_UNQUOTED([REMOTE_DRIVER_MODE_DEFAULT],[$REMOTE_DRIVER_MODE_DEF=
AULT], [Default remote driver mode])
 ])
=20
 AC_DEFUN([LIBVIRT_DRIVER_RESULT_REMOTE], [
diff --git a/src/driver.h b/src/driver.h
index 898fb96df4..f7d667a03c 100644
--- a/src/driver.h
+++ b/src/driver.h
@@ -108,6 +108,8 @@ int virSetSharedNWFilterDriver(virNWFilterDriverPtr dri=
ver) ATTRIBUTE_RETURN_CHE
 int virSetSharedSecretDriver(virSecretDriverPtr driver) ATTRIBUTE_RETURN_C=
HECK;
 int virSetSharedStorageDriver(virStorageDriverPtr driver) ATTRIBUTE_RETURN=
_CHECK;
=20
+bool virHasDriverForURIScheme(const char *scheme);
+
 int virDriverLoadModule(const char *name,
                         const char *regfunc,
                         bool required);
diff --git a/src/libvirt.c b/src/libvirt.c
index 9390a767f9..beafbc3716 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -601,6 +601,33 @@ virRegisterConnectDriver(virConnectDriverPtr driver,
 }
=20
=20
+/**
+ * virHasDriverForURIScheme:
+ * @scheme: the URI scheme
+ *
+ * Determine if there is a driver registered that explicitly
+ * handles URIs with the scheme @scheme.
+ *
+ * Returns: true if a driver is registered
+ */
+bool
+virHasDriverForURIScheme(const char *scheme)
+{
+    size_t i;
+    size_t j;
+
+    for (i =3D 0; i < virConnectDriverTabCount; i++) {
+        if (!virConnectDriverTab[i]->uriSchemes)
+            continue;
+        for (j =3D 0; virConnectDriverTab[i]->uriSchemes[j]; j++) {
+            if (STREQ(virConnectDriverTab[i]->uriSchemes[j], scheme))
+                return true;
+        }
+    }
+
+    return false;
+}
+
 /**
  * virRegisterStateDriver:
  * @driver: pointer to a driver block
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index e647a77f41..889d62ba4f 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -78,6 +78,24 @@ VIR_ENUM_IMPL(remoteDriverTransport,
               "tcp",
               "libssh");
=20
+typedef enum {
+    /* Try to figure out the "best" choice magically */
+    REMOTE_DRIVER_MODE_AUTO,
+    /* Always use the legacy libvirtd */
+    REMOTE_DRIVER_MODE_LEGACY,
+    /* Always use the per-driver virt*d daemons */
+    REMOTE_DRIVER_MODE_DIRECT,
+
+    REMOTE_DRIVER_MODE_LAST
+} remoteDriverMode;
+
+VIR_ENUM_DECL(remoteDriverMode);
+VIR_ENUM_IMPL(remoteDriverMode,
+              REMOTE_DRIVER_MODE_LAST,
+              "auto",
+              "legacy",
+              "direct");
+
 #if SIZEOF_LONG < 8
 # define HYPER_TO_TYPE(_type, _to, _from) \
     do { \
@@ -748,8 +766,9 @@ remoteConnectSupportsFeatureUnlocked(virConnectPtr conn,
=20
=20
 static char *
-remoteGetUNIXSocket(remoteDriverTransport transport,
-                    unsigned int flags)
+remoteGetUNIXSocketHelper(remoteDriverTransport transport,
+                          const char *sock_prefix,
+                          unsigned int flags)
 {
     char *sockname =3D NULL;
     VIR_AUTOFREE(char *) userdir =3D NULL;
@@ -766,21 +785,129 @@ remoteGetUNIXSocket(remoteDriverTransport transport,
         if (!(userdir =3D virGetUserRuntimeDirectory()))
             return NULL;
=20
-        if (virAsprintf(&sockname,
-                        "%s/" LIBVIRTD_USER_UNIX_SOCKET, userdir) < 0)
+        if (virAsprintf(&sockname, "%s/%s-sock",
+                        userdir, sock_prefix) < 0)
             return NULL;
     } else {
-        if (VIR_STRDUP(sockname,
-                       flags & VIR_DRV_OPEN_REMOTE_RO ?
-                       LIBVIRTD_PRIV_UNIX_SOCKET_RO :
-                       LIBVIRTD_PRIV_UNIX_SOCKET) < 0)
+        if (virAsprintf(&sockname, "%s/run/libvirt/%s-%s",
+                        LOCALSTATEDIR, sock_prefix,
+                        flags & VIR_DRV_OPEN_REMOTE_RO ?
+                        "sock-ro" : "sock") < 0)
             return NULL;
     }
=20
-    VIR_DEBUG("Chosen UNIX sockname %s", sockname);
+    VIR_DEBUG("Built UNIX sockname %s for transport %s prefix %s flags=3D0=
x%x",
+              sockname, remoteDriverTransportTypeToString(transport),
+              sock_prefix, flags);
     return sockname;
 }
=20
+
+static char *
+remoteGetUNIXSocket(remoteDriverTransport transport,
+                    remoteDriverMode mode,
+                    const char *driver,
+                    char **daemon,
+                    unsigned int flags)
+{
+    char *sock_name =3D NULL;
+    VIR_AUTOFREE(char *) direct_daemon =3D NULL;
+    VIR_AUTOFREE(char *) legacy_daemon =3D NULL;
+    VIR_AUTOFREE(char *) direct_sock_name =3D NULL;
+    VIR_AUTOFREE(char *) legacy_sock_name =3D NULL;
+
+    if (driver &&
+        virAsprintf(&direct_daemon, "virt%sd", driver) < 0)
+        return NULL;
+
+    if (VIR_STRDUP(legacy_daemon, "libvirtd") < 0)
+        return NULL;
+
+    if (driver &&
+        !(direct_sock_name =3D remoteGetUNIXSocketHelper(transport, direct=
_daemon, flags)))
+        return NULL;
+
+    if (!(legacy_sock_name =3D remoteGetUNIXSocketHelper(transport, "libvi=
rt", flags)))
+        return NULL;
+
+    if (mode =3D=3D REMOTE_DRIVER_MODE_AUTO) {
+        if (transport =3D=3D REMOTE_DRIVER_TRANSPORT_UNIX) {
+            if (direct_sock_name && virFileExists(direct_sock_name)) {
+                mode =3D REMOTE_DRIVER_MODE_DIRECT;
+            } else if (virFileExists(legacy_sock_name)) {
+                mode =3D REMOTE_DRIVER_MODE_LEGACY;
+            } else if (driver) {
+                /*
+                 * This constant comes from the configure script and
+                 * maps to either the direct or legacy mode constant
+                 */
+                mode =3D REMOTE_DRIVER_MODE_DEFAULT;
+            } else {
+                mode =3D REMOTE_DRIVER_MODE_LEGACY;
+            }
+        } else {
+            mode =3D REMOTE_DRIVER_MODE_LEGACY;
+        }
+    }
+
+    switch ((remoteDriverMode)mode) {
+    case REMOTE_DRIVER_MODE_LEGACY:
+        VIR_STEAL_PTR(sock_name, legacy_sock_name);
+        VIR_STEAL_PTR(*daemon, legacy_daemon);
+        break;
+
+    case REMOTE_DRIVER_MODE_DIRECT:
+        if (transport !=3D REMOTE_DRIVER_TRANSPORT_UNIX) {
+            virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
+                           _("Cannot use direct socket mode for %s transpo=
rt"),
+                           remoteDriverTransportTypeToString(transport));
+            return NULL;
+        }
+
+        if (!direct_sock_name) {
+            virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
+                           _("Cannot use direct socket mode if no URI is s=
et"));
+            return NULL;
+        }
+
+        VIR_STEAL_PTR(sock_name, direct_sock_name);
+        VIR_STEAL_PTR(*daemon, direct_daemon);
+        break;
+
+    case REMOTE_DRIVER_MODE_AUTO:
+    case REMOTE_DRIVER_MODE_LAST:
+    default:
+        virReportEnumRangeError(remoteDriverMode, mode);
+        return NULL;
+    }
+
+    VIR_DEBUG("Chosen UNIX sockname %s daemon %s "
+              "for mode %s transport %s flags=3D0x%x",
+              sock_name, NULLSTR(*daemon),
+              remoteDriverModeTypeToString(mode),
+              remoteDriverTransportTypeToString(transport),
+              flags);
+    return sock_name;
+}
+
+
+#ifndef WIN32
+static const char *
+remoteGetDaemonPathEnv(void)
+{
+    /* We prefer a VIRTD_PATH env var to use for all daemons,
+     * but if it is not set we will fallback to LIBVIRTD_PATH
+     * for previous behaviour
+     */
+    if (virGetEnvBlockSUID("VIRTD_PATH") !=3D NULL) {
+        return "VIRTD_PATH";
+    } else {
+        return "LIBVIRTD_PATH";
+    }
+}
+#endif /* WIN32 */
+
+
 /*
  * URIs that this driver needs to handle:
  *
@@ -827,11 +954,20 @@ doRemoteOpen(virConnectPtr conn,
     VIR_AUTOFREE(char *) sshauth =3D NULL;
     VIR_AUTOFREE(char *) knownHostsVerify =3D NULL;
     VIR_AUTOFREE(char *) knownHosts =3D NULL;
+    VIR_AUTOFREE(char *) mode_str =3D NULL;
+    VIR_AUTOFREE(char *) daemon_name =3D NULL;
     bool sanity =3D true;
     bool verify =3D true;
 #ifndef WIN32
     bool tty =3D true;
 #endif
+    int mode;
+
+    if (inside_daemon && !conn->uri->server) {
+        mode =3D REMOTE_DRIVER_MODE_DIRECT;
+    } else {
+        mode =3D REMOTE_DRIVER_MODE_AUTO;
+    }
=20
     /* We handle *ALL* URIs here. The caller has rejected any
      * URIs we don't care about */
@@ -920,7 +1056,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
@@ -967,6 +1103,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. */
@@ -984,7 +1135,8 @@ doRemoteOpen(virConnectPtr conn,
     case REMOTE_DRIVER_TRANSPORT_LIBSSH:
     case REMOTE_DRIVER_TRANSPORT_LIBSSH2:
         if (!sockname &&
-            !(sockname =3D remoteGetUNIXSocket(transport, flags)))
+            !(sockname =3D remoteGetUNIXSocket(transport, mode, driver_str,
+                                             &daemon_name, flags)))
             goto failed;
=20
     case REMOTE_DRIVER_TRANSPORT_TCP:
@@ -1084,13 +1236,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,
@@ -1206,7 +1360,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)
@@ -1308,9 +1462,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 Wed May  8 00:05:16 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=1564420396; cv=none;
	d=zoho.com; s=zohoarc;
	b=cxC3xwmcXtthSn+yO5Ltm6FqHex6ZE7PNUsFlhvyEGurWtqUaQZfwnu7tAJtnGXnn7+W8yDzCNGE0sJPOoj3yl+NJtk2UFM5Qg7H4a4XYrn296960yUCYP83hyCPnHV8WJUHduUWi5KrT/bt0f8vIm4vfNIg0ANee/xEmzKc1f8=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420396;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=kO18hV/CfYlA4tMYJ3OSQrrIkh/wMTnA6P0KR2x6f8Q=;
	b=e41cxL6EPK5v33QM1I1/XFiho25FCvHtHsoK//u1ST1iumTl4Mak4SP5iD6i9v+sDKa0WiIhbcjg1c9crI/5SKa/YvsrEGOI6oaGTNjD8bFuVxvV2KwyqRBchMjpur1+7y4SkCmYcw/qoeltAU4FOE4zejEpe7LBD7qFiVcGF6E=
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 1564420396308112.79486643631071;
 Mon, 29 Jul 2019 10:13:16 -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 777CF30BD1BE;
	Mon, 29 Jul 2019 17:13:14 +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 5492960BE5;
	Mon, 29 Jul 2019 17:13:14 +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 172EF1806134;
	Mon, 29 Jul 2019 17:13:14 +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 x6THDDPO028805 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:13:13 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 572DF5C22E; Mon, 29 Jul 2019 17:13:13 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id C31505C22B;
	Mon, 29 Jul 2019 17:13:06 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:25 +0100
Message-Id: <20190729171130.25484-44-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 43/48] api: introduce virConnectSetIdentity for
	pasing uid, gid, selinux info
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.49]);
 Mon, 29 Jul 2019 17:13:15 +0000 (UTC)

When using the fine grained access control mechanism for APIs, when a
client connects to libvirtd, it will fetch the uid, gid, selinux
info of the remote client on the UNIX domain socket. This is then used
as the identity when checking ACLs.

With the new split daemons things are a bit more complicated. The user
can connect to virtproxyd, which in turn connects to virtqemud. When
virtqemud requests the identity over the UNIX domain socket, it will
get the identity that the virtproxyd is running as, not the identity of
the real end user/application.

virproxyd knows what the real identity is, and needs to be able to
forward this information to virtqemud. The virConnectSetIdentity API
provides a mechanism for doing this. Obviously virtqemud should not
accept such identity overrides from any client, it must only honour it
from a trusted client, aka one running as the same uid/gid as itself.

The typed parameters exposed in the API are the same as those currently
supported by the internal virIdentity class.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 include/libvirt/libvirt-host.h | 75 ++++++++++++++++++++++++++++++++++
 src/driver-hypervisor.h        |  7 ++++
 src/libvirt-host.c             | 51 +++++++++++++++++++++++
 src/libvirt_public.syms        |  1 +
 4 files changed, 134 insertions(+)

diff --git a/include/libvirt/libvirt-host.h b/include/libvirt/libvirt-host.h
index 7debb5f829..8ea3531750 100644
--- a/include/libvirt/libvirt-host.h
+++ b/include/libvirt/libvirt-host.h
@@ -579,6 +579,81 @@ virConnectPtr           virConnectOpenAuth      (const=
 char *name,
                                                  unsigned int flags);
 int                     virConnectRef           (virConnectPtr conn);
 int                     virConnectClose         (virConnectPtr conn);
+
+/**
+ * VIR_CONNECT_IDENTITY_OS_USER_NAME:
+ *
+ * The operating system user name as VIR_TYPED_PARAM_STRING
+ */
+# define VIR_CONNECT_IDENTITY_OS_USER_NAME "os-user-name"
+
+/**
+ * VIR_CONNECT_IDENTITY_OS_USER_ID:
+ *
+ * The operating system user ID as VIR_TYPED_PARAM_ULLONG
+ */
+# define VIR_CONNECT_IDENTITY_OS_USER_ID "os-user-id"
+
+/**
+ * VIR_CONNECT_IDENTITY_OS_GROUP_NAME:
+ *
+ * The operating system user ID as VIR_TYPED_PARAM_STRING
+ */
+# define VIR_CONNECT_IDENTITY_OS_GROUP_NAME "os-group-name"
+
+/**
+ * VIR_CONNECT_IDENTITY_OS_GROUP_ID:
+ *
+ * The operating system user ID as VIR_TYPED_PARAM_ULLONG
+ */
+# define VIR_CONNECT_IDENTITY_OS_GROUP_ID "os-group-id"
+
+/**
+ * VIR_CONNECT_IDENTITY_OS_PROCESS_ID:
+ *
+ * The operating system user ID as VIR_TYPED_PARAM_LLONG
+ */
+# define VIR_CONNECT_IDENTITY_OS_PROCESS_ID "os-process-id"
+
+/**
+ * VIR_CONNECT_IDENTITY_OS_PROCESS_TIME:
+ *
+ * The operating system process start time as VIR_TYPED_PARAM_ULLONG
+ *
+ * The units the time is measured in vary according to the
+ * host operating system. On Linux this is usually clock
+ * ticks (as reported in /proc/$PID/stat field 22).
+ */
+# define VIR_CONNECT_IDENTITY_OS_PROCESS_TIME "os-process-time"
+
+/**
+ * VIR_CONNECT_IDENTITY_SASL_USER_NAME:
+ *
+ * The SASL authenticated username as VIR_TYPED_PARAM_STRING
+ */
+# define VIR_CONNECT_IDENTITY_SASL_USER_NAME "sasl-user-name"
+
+/**
+ * VIR_CONNECT_IDENTITY_X509_DISTINGUISHED_NAME:
+ *
+ * The TLS x509 certificate distinguished named as VIR_TYPED_PARAM_STRING
+ */
+# define VIR_CONNECT_IDENTITY_X509_DISTINGUISHED_NAME "x509-distinguished-=
name"
+
+/**
+ * VIR_CONNECT_IDENTITY_SELINUX_CONTEXT:
+ *
+ * The application's SELinux context as VIR_TYPED_PARAM_STRING
+ *
+ */
+# define VIR_CONNECT_IDENTITY_SELINUX_CONTEXT "selinux-context"
+
+
+int                     virConnectSetIdentity   (virConnectPtr conn,
+                                                 virTypedParameterPtr para=
ms,
+                                                 int nparams,
+                                                 unsigned int flags);
+
 const char *            virConnectGetType       (virConnectPtr conn);
 int                     virConnectGetVersion    (virConnectPtr conn,
                                                  unsigned long *hvVer);
diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h
index c1632ae4c6..f1bc355b65 100644
--- a/src/driver-hypervisor.h
+++ b/src/driver-hypervisor.h
@@ -36,6 +36,12 @@ typedef virDrvOpenStatus
 typedef int
 (*virDrvConnectClose)(virConnectPtr conn);
=20
+typedef int
+(*virDrvConnectSetIdentity)(virConnectPtr conn,
+                            virTypedParameterPtr params,
+                            int nparams,
+                            unsigned int flags);
+
 typedef int
 (*virDrvConnectSupportsFeature)(virConnectPtr conn,
                                 int feature);
@@ -1378,6 +1384,7 @@ struct _virHypervisorDriver {
     virDrvConnectURIProbe connectURIProbe;
     virDrvConnectOpen connectOpen;
     virDrvConnectClose connectClose;
+    virDrvConnectSetIdentity connectSetIdentity;
     virDrvConnectSupportsFeature connectSupportsFeature;
     virDrvConnectGetType connectGetType;
     virDrvConnectGetVersion connectGetVersion;
diff --git a/src/libvirt-host.c b/src/libvirt-host.c
index e5c4e5f72a..d7b1b82277 100644
--- a/src/libvirt-host.c
+++ b/src/libvirt-host.c
@@ -61,6 +61,57 @@ virConnectRef(virConnectPtr conn)
 }
=20
=20
+/**
+ * virConnectSetIdentity:
+ * @conn: pointer to the hypervisor connection
+ * @params: parameters containing the identity attributes
+ * @nparams: size of @params array
+ * @flags: currently unused, pass 0
+ *
+ * Override the default identity information associated with
+ * the connection. When connecting to a stateful driver over
+ * a UNIX socket, the daemon will interrogate the remote end
+ * of the UNIX socket to acquire the application's identity.
+ * This identity is used for the fine grained access control
+ * checks on API calls.
+ *
+ * There may be times when application is operating on behalf
+ * of a variety of users, and thus the identity that the
+ * application runs as is not appropriate for access control
+ * checks. In this case, if the application is considered
+ * trustworthy, it can supply alternative identity information.
+ *
+ * The driver may reject the request to change the identity
+ * on a connection if the application is not trustworthy.
+ *
+ * Returns: 0 if the identity change was accepted, -1 on error
+ */
+int
+virConnectSetIdentity(virConnectPtr conn,
+                      virTypedParameterPtr params,
+                      int nparams,
+                      unsigned int flags)
+{
+    VIR_DEBUG("conn=3D%p params=3D%p nparams=3D%d flags=3D0x%x", conn, par=
ams, nparams, flags);
+    VIR_TYPED_PARAMS_DEBUG(params, nparams);
+
+    virResetLastError();
+
+    if (conn->driver->connectSetIdentity) {
+        int ret =3D conn->driver->connectSetIdentity(conn, params, nparams=
, flags);
+        if (ret < 0)
+            goto error;
+        return ret;
+    }
+
+    virReportUnsupportedError();
+
+ error:
+    virDispatchError(conn);
+    return -1;
+}
+
+
 /*
  * Not for public use.  This function is part of the internal
  * implementation of driver features in the remote case.
diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
index 54256b6317..580b14b6a0 100644
--- a/src/libvirt_public.syms
+++ b/src/libvirt_public.syms
@@ -838,6 +838,7 @@ LIBVIRT_5.5.0 {
=20
 LIBVIRT_5.6.0 {
     global:
+        virConnectSetIdentity;
         virDomainCheckpointCreateXML;
         virDomainCheckpointDelete;
         virDomainCheckpointFree;
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420413; cv=none;
	d=zoho.com; s=zohoarc;
	b=YJ/rHJbEiTrhI3z03HrHpOR82Hbmm9RVFphFNXx7JZ6IJfPVPcFQ53MMPL/FlhB9qLQswkRP+gBbX0dBqMk6OYz49oy/S8ksgxpi/mtTVAncxY/2GF6feyPS6YgxaQo71QxwMAEPHsT9jOTSYoo+kehtW/po1nVi3VNu8lVi/h8=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420413;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=Wbvn2xN7w+1x2jMTS8fiLQpUzFU3+P11wk/aW3PkanQ=;
	b=CSDOxKy5E5uUtZVVZDAKF0+TPm8frmkMZ5Au4UbC1TCplaGr6RhXmmI1z18EZa+vhPNNsgcSRwe0sMuAVs3mextFQvufF3pwPkD0/wn+J81dH/z+vQ4bGfwRi7v5V46LhME4Pjteu7Vy8YkdYeJE+YCEb4sQxi6WMnmeosXQrBo=
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 1564420413049847.9716143577738;
 Mon, 29 Jul 2019 10:13:33 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com
 [10.5.11.14])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 8A745308339B;
	Mon, 29 Jul 2019 17:13:31 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 632045D9C8;
	Mon, 29 Jul 2019 17:13:31 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 20FAB1806B00;
	Mon, 29 Jul 2019 17:13:31 +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 x6THDTCU028970 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:13:29 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id B1BA85C22E; Mon, 29 Jul 2019 17:13:29 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 600A05C22B;
	Mon, 29 Jul 2019 17:13:13 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:26 +0100
Message-Id: <20190729171130.25484-45-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 44/48] util: change identity class attribute
	names
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.44]);
 Mon, 29 Jul 2019 17:13:32 +0000 (UTC)

Change the identity class attribute names with a "UNIX" tag to have a
more generic "OS" tag, since when we expose this in the public API we
want it to be more flexible for the future.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
---
 src/access/viraccessdriverpolkit.c | 12 ++---
 src/admin/admin_server.c           | 10 ++--
 src/libvirt_private.syms           | 24 ++++-----
 src/rpc/virnetserverclient.c       | 12 ++---
 src/util/viridentity.c             | 84 +++++++++++++++---------------
 src/util/viridentity.h             | 60 ++++++++++-----------
 tests/viridentitytest.c            | 18 +++----
 tests/virnetserverclienttest.c     |  8 +--
 8 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdrive=
rpolkit.c
index b1473cd0a4..b98122d4a3 100644
--- a/src/access/viraccessdriverpolkit.c
+++ b/src/access/viraccessdriverpolkit.c
@@ -88,19 +88,19 @@ virAccessDriverPolkitGetCaller(const char *actionid,
         return -1;
     }
=20
-    if (virIdentityGetUNIXProcessID(identity, pid) < 0) {
+    if (virIdentityGetOSProcessID(identity, pid) < 0) {
         virAccessError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("No UNIX process ID available"));
+                       _("No OS process ID available"));
         goto cleanup;
     }
-    if (virIdentityGetUNIXProcessTime(identity, startTime) < 0) {
+    if (virIdentityGetOSProcessTime(identity, startTime) < 0) {
         virAccessError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("No UNIX process start time available"));
+                       _("No OS process start time available"));
         goto cleanup;
     }
-    if (virIdentityGetUNIXUserID(identity, uid) < 0) {
+    if (virIdentityGetOSUserID(identity, uid) < 0) {
         virAccessError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("No UNIX caller UID available"));
+                       _("No OS caller UID available"));
         goto cleanup;
     }
=20
diff --git a/src/admin/admin_server.c b/src/admin/admin_server.c
index f2a38f6dfa..b92eb2fdc6 100644
--- a/src/admin/admin_server.c
+++ b/src/admin/admin_server.c
@@ -257,29 +257,29 @@ adminClientGetInfo(virNetServerClientPtr client,
         pid_t pid;
         uid_t uid;
         gid_t gid;
-        if (virIdentityGetUNIXUserID(identity, &uid) < 0 ||
+        if (virIdentityGetOSUserID(identity, &uid) < 0 ||
             virTypedParamsAddInt(&tmpparams, nparams, &maxparams,
                                  VIR_CLIENT_INFO_UNIX_USER_ID, uid) < 0)
             goto cleanup;
=20
-        if (virIdentityGetUNIXUserName(identity, &attr) < 0 ||
+        if (virIdentityGetOSUserName(identity, &attr) < 0 ||
             virTypedParamsAddString(&tmpparams, nparams, &maxparams,
                                     VIR_CLIENT_INFO_UNIX_USER_NAME,
                                     attr) < 0)
             goto cleanup;
=20
-        if (virIdentityGetUNIXGroupID(identity, &gid) < 0 ||
+        if (virIdentityGetOSGroupID(identity, &gid) < 0 ||
             virTypedParamsAddInt(&tmpparams, nparams, &maxparams,
                                  VIR_CLIENT_INFO_UNIX_GROUP_ID, gid) < 0)
             goto cleanup;
=20
-        if (virIdentityGetUNIXGroupName(identity, &attr) < 0 ||
+        if (virIdentityGetOSGroupName(identity, &attr) < 0 ||
             virTypedParamsAddString(&tmpparams, nparams, &maxparams,
                                     VIR_CLIENT_INFO_UNIX_GROUP_NAME,
                                     attr) < 0)
             goto cleanup;
=20
-        if (virIdentityGetUNIXProcessID(identity, &pid) < 0 ||
+        if (virIdentityGetOSProcessID(identity, &pid) < 0 ||
             virTypedParamsAddInt(&tmpparams, nparams, &maxparams,
                                  VIR_CLIENT_INFO_UNIX_PROCESS_ID, pid) < 0)
             goto cleanup;
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index c323f679b3..ac357583e4 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2138,28 +2138,28 @@ virHostMemSetParameters;
 # util/viridentity.h
 virIdentityGetAttr;
 virIdentityGetCurrent;
+virIdentityGetOSGroupID;
+virIdentityGetOSGroupName;
+virIdentityGetOSProcessID;
+virIdentityGetOSProcessTime;
+virIdentityGetOSUserID;
+virIdentityGetOSUserName;
 virIdentityGetSASLUserName;
 virIdentityGetSELinuxContext;
 virIdentityGetSystem;
-virIdentityGetUNIXGroupID;
-virIdentityGetUNIXGroupName;
-virIdentityGetUNIXProcessID;
-virIdentityGetUNIXProcessTime;
-virIdentityGetUNIXUserID;
-virIdentityGetUNIXUserName;
 virIdentityGetX509DName;
 virIdentityIsEqual;
 virIdentityNew;
 virIdentitySetAttr;
 virIdentitySetCurrent;
+virIdentitySetOSGroupID;
+virIdentitySetOSGroupName;
+virIdentitySetOSProcessID;
+virIdentitySetOSProcessTime;
+virIdentitySetOSUserID;
+virIdentitySetOSUserName;
 virIdentitySetSASLUserName;
 virIdentitySetSELinuxContext;
-virIdentitySetUNIXGroupID;
-virIdentitySetUNIXGroupName;
-virIdentitySetUNIXProcessID;
-virIdentitySetUNIXProcessTime;
-virIdentitySetUNIXUserID;
-virIdentitySetUNIXUserName;
 virIdentitySetX509DName;
=20
=20
diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index 410de253d2..1f020a5a04 100644
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -779,21 +779,21 @@ virNetServerClientCreateIdentity(virNetServerClientPt=
r client)
=20
         if (!(username =3D virGetUserName(uid)))
             goto error;
-        if (virIdentitySetUNIXUserName(ret, username) < 0)
+        if (virIdentitySetOSUserName(ret, username) < 0)
             goto error;
-        if (virIdentitySetUNIXUserID(ret, uid) < 0)
+        if (virIdentitySetOSUserID(ret, uid) < 0)
             goto error;
=20
         if (!(groupname =3D virGetGroupName(gid)))
             goto error;
-        if (virIdentitySetUNIXGroupName(ret, groupname) < 0)
+        if (virIdentitySetOSGroupName(ret, groupname) < 0)
             goto error;
-        if (virIdentitySetUNIXGroupID(ret, gid) < 0)
+        if (virIdentitySetOSGroupID(ret, gid) < 0)
             goto error;
=20
-        if (virIdentitySetUNIXProcessID(ret, pid) < 0)
+        if (virIdentitySetOSProcessID(ret, pid) < 0)
             goto error;
-        if (virIdentitySetUNIXProcessTime(ret, timestamp) < 0)
+        if (virIdentitySetOSProcessTime(ret, timestamp) < 0)
             goto error;
     }
=20
diff --git a/src/util/viridentity.c b/src/util/viridentity.c
index 4ceff3cb74..2c6c0ee91f 100644
--- a/src/util/viridentity.c
+++ b/src/util/viridentity.c
@@ -144,27 +144,27 @@ virIdentityPtr virIdentityGetSystem(void)
     if (!(ret =3D virIdentityNew()))
         goto error;
=20
-    if (virIdentitySetUNIXProcessID(ret, getpid()) < 0)
+    if (virIdentitySetOSProcessID(ret, getpid()) < 0)
         goto error;
=20
     if (virProcessGetStartTime(getpid(), &startTime) < 0)
         goto error;
     if (startTime !=3D 0 &&
-        virIdentitySetUNIXProcessTime(ret, startTime) < 0)
+        virIdentitySetOSProcessTime(ret, startTime) < 0)
         goto error;
=20
     if (!(username =3D virGetUserName(geteuid())))
         return ret;
-    if (virIdentitySetUNIXUserName(ret, username) < 0)
+    if (virIdentitySetOSUserName(ret, username) < 0)
         goto error;
-    if (virIdentitySetUNIXUserID(ret, getuid()) < 0)
+    if (virIdentitySetOSUserID(ret, getuid()) < 0)
         goto error;
=20
     if (!(groupname =3D virGetGroupName(getegid())))
         return ret;
-    if (virIdentitySetUNIXGroupName(ret, groupname) < 0)
+    if (virIdentitySetOSGroupName(ret, groupname) < 0)
         goto error;
-    if (virIdentitySetUNIXGroupID(ret, getgid()) < 0)
+    if (virIdentitySetOSGroupID(ret, getgid()) < 0)
         goto error;
=20
 #if WITH_SELINUX
@@ -310,24 +310,24 @@ bool virIdentityIsEqual(virIdentityPtr identA,
 }
=20
=20
-int virIdentityGetUNIXUserName(virIdentityPtr ident,
-                               const char **username)
+int virIdentityGetOSUserName(virIdentityPtr ident,
+                             const char **username)
 {
     return virIdentityGetAttr(ident,
-                              VIR_IDENTITY_ATTR_UNIX_USER_NAME,
+                              VIR_IDENTITY_ATTR_OS_USER_NAME,
                               username);
 }
=20
=20
-int virIdentityGetUNIXUserID(virIdentityPtr ident,
-                             uid_t *uid)
+int virIdentityGetOSUserID(virIdentityPtr ident,
+                           uid_t *uid)
 {
     int val;
     const char *userid;
=20
     *uid =3D -1;
     if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_UNIX_USER_ID,
+                           VIR_IDENTITY_ATTR_OS_USER_ID,
                            &userid) < 0)
         return -1;
=20
@@ -342,24 +342,24 @@ int virIdentityGetUNIXUserID(virIdentityPtr ident,
     return 0;
 }
=20
-int virIdentityGetUNIXGroupName(virIdentityPtr ident,
-                                const char **groupname)
+int virIdentityGetOSGroupName(virIdentityPtr ident,
+                              const char **groupname)
 {
     return virIdentityGetAttr(ident,
-                              VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,
+                              VIR_IDENTITY_ATTR_OS_GROUP_NAME,
                               groupname);
 }
=20
=20
-int virIdentityGetUNIXGroupID(virIdentityPtr ident,
-                              gid_t *gid)
+int virIdentityGetOSGroupID(virIdentityPtr ident,
+                            gid_t *gid)
 {
     int val;
     const char *groupid;
=20
     *gid =3D -1;
     if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_UNIX_GROUP_ID,
+                           VIR_IDENTITY_ATTR_OS_GROUP_ID,
                            &groupid) < 0)
         return -1;
=20
@@ -375,15 +375,15 @@ int virIdentityGetUNIXGroupID(virIdentityPtr ident,
 }
=20
=20
-int virIdentityGetUNIXProcessID(virIdentityPtr ident,
-                                pid_t *pid)
+int virIdentityGetOSProcessID(virIdentityPtr ident,
+                              pid_t *pid)
 {
     unsigned long long val;
     const char *processid;
=20
     *pid =3D 0;
     if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,
+                           VIR_IDENTITY_ATTR_OS_PROCESS_ID,
                            &processid) < 0)
         return -1;
=20
@@ -399,12 +399,12 @@ int virIdentityGetUNIXProcessID(virIdentityPtr ident,
 }
=20
=20
-int virIdentityGetUNIXProcessTime(virIdentityPtr ident,
-                                  unsigned long long *timestamp)
+int virIdentityGetOSProcessTime(virIdentityPtr ident,
+                                unsigned long long *timestamp)
 {
     const char *processtime;
     if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME,
+                           VIR_IDENTITY_ATTR_OS_PROCESS_TIME,
                            &processtime) < 0)
         return -1;
=20
@@ -445,17 +445,17 @@ int virIdentityGetSELinuxContext(virIdentityPtr ident,
 }
=20
=20
-int virIdentitySetUNIXUserName(virIdentityPtr ident,
-                               const char *username)
+int virIdentitySetOSUserName(virIdentityPtr ident,
+                             const char *username)
 {
     return virIdentitySetAttr(ident,
-                              VIR_IDENTITY_ATTR_UNIX_USER_NAME,
+                              VIR_IDENTITY_ATTR_OS_USER_NAME,
                               username);
 }
=20
=20
-int virIdentitySetUNIXUserID(virIdentityPtr ident,
-                             uid_t uid)
+int virIdentitySetOSUserID(virIdentityPtr ident,
+                           uid_t uid)
 {
     VIR_AUTOFREE(char *) val =3D NULL;
=20
@@ -463,22 +463,22 @@ int virIdentitySetUNIXUserID(virIdentityPtr ident,
         return -1;
=20
     return virIdentitySetAttr(ident,
-                              VIR_IDENTITY_ATTR_UNIX_USER_ID,
+                              VIR_IDENTITY_ATTR_OS_USER_ID,
                               val);
 }
=20
=20
-int virIdentitySetUNIXGroupName(virIdentityPtr ident,
-                                const char *groupname)
+int virIdentitySetOSGroupName(virIdentityPtr ident,
+                              const char *groupname)
 {
     return virIdentitySetAttr(ident,
-                              VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,
+                              VIR_IDENTITY_ATTR_OS_GROUP_NAME,
                               groupname);
 }
=20
=20
-int virIdentitySetUNIXGroupID(virIdentityPtr ident,
-                              gid_t gid)
+int virIdentitySetOSGroupID(virIdentityPtr ident,
+                            gid_t gid)
 {
     VIR_AUTOFREE(char *) val =3D NULL;
=20
@@ -486,13 +486,13 @@ int virIdentitySetUNIXGroupID(virIdentityPtr ident,
         return -1;
=20
     return virIdentitySetAttr(ident,
-                              VIR_IDENTITY_ATTR_UNIX_GROUP_ID,
+                              VIR_IDENTITY_ATTR_OS_GROUP_ID,
                               val);
 }
=20
=20
-int virIdentitySetUNIXProcessID(virIdentityPtr ident,
-                                pid_t pid)
+int virIdentitySetOSProcessID(virIdentityPtr ident,
+                              pid_t pid)
 {
     VIR_AUTOFREE(char *) val =3D NULL;
=20
@@ -500,13 +500,13 @@ int virIdentitySetUNIXProcessID(virIdentityPtr ident,
         return -1;
=20
     return virIdentitySetAttr(ident,
-                              VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,
+                              VIR_IDENTITY_ATTR_OS_PROCESS_ID,
                               val);
 }
=20
=20
-int virIdentitySetUNIXProcessTime(virIdentityPtr ident,
-                                  unsigned long long timestamp)
+int virIdentitySetOSProcessTime(virIdentityPtr ident,
+                                unsigned long long timestamp)
 {
     VIR_AUTOFREE(char *) val =3D NULL;
=20
@@ -514,7 +514,7 @@ int virIdentitySetUNIXProcessTime(virIdentityPtr ident,
         return -1;
=20
     return virIdentitySetAttr(ident,
-                              VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME,
+                              VIR_IDENTITY_ATTR_OS_PROCESS_TIME,
                               val);
 }
=20
diff --git a/src/util/viridentity.h b/src/util/viridentity.h
index 0fde3207ca..4b87506373 100644
--- a/src/util/viridentity.h
+++ b/src/util/viridentity.h
@@ -27,12 +27,12 @@ typedef struct _virIdentity virIdentity;
 typedef virIdentity *virIdentityPtr;
=20
 typedef enum {
-      VIR_IDENTITY_ATTR_UNIX_USER_NAME,
-      VIR_IDENTITY_ATTR_UNIX_USER_ID,
-      VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,
-      VIR_IDENTITY_ATTR_UNIX_GROUP_ID,
-      VIR_IDENTITY_ATTR_UNIX_PROCESS_ID,
-      VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME,
+      VIR_IDENTITY_ATTR_OS_USER_NAME,
+      VIR_IDENTITY_ATTR_OS_USER_ID,
+      VIR_IDENTITY_ATTR_OS_GROUP_NAME,
+      VIR_IDENTITY_ATTR_OS_GROUP_ID,
+      VIR_IDENTITY_ATTR_OS_PROCESS_ID,
+      VIR_IDENTITY_ATTR_OS_PROCESS_TIME,
       VIR_IDENTITY_ATTR_SASL_USER_NAME,
       VIR_IDENTITY_ATTR_X509_DISTINGUISHED_NAME,
       VIR_IDENTITY_ATTR_SELINUX_CONTEXT,
@@ -64,18 +64,18 @@ bool virIdentityIsEqual(virIdentityPtr identA,
     ATTRIBUTE_NONNULL(1)
     ATTRIBUTE_NONNULL(2);
=20
-int virIdentityGetUNIXUserName(virIdentityPtr ident,
-                               const char **username);
-int virIdentityGetUNIXUserID(virIdentityPtr ident,
-                             uid_t *uid);
-int virIdentityGetUNIXGroupName(virIdentityPtr ident,
-                                const char **groupname);
-int virIdentityGetUNIXGroupID(virIdentityPtr ident,
-                              gid_t *gid);
-int virIdentityGetUNIXProcessID(virIdentityPtr ident,
-                                pid_t *pid);
-int virIdentityGetUNIXProcessTime(virIdentityPtr ident,
-                                  unsigned long long *timestamp);
+int virIdentityGetOSUserName(virIdentityPtr ident,
+                             const char **username);
+int virIdentityGetOSUserID(virIdentityPtr ident,
+                           uid_t *uid);
+int virIdentityGetOSGroupName(virIdentityPtr ident,
+                              const char **groupname);
+int virIdentityGetOSGroupID(virIdentityPtr ident,
+                            gid_t *gid);
+int virIdentityGetOSProcessID(virIdentityPtr ident,
+                              pid_t *pid);
+int virIdentityGetOSProcessTime(virIdentityPtr ident,
+                                unsigned long long *timestamp);
 int virIdentityGetSASLUserName(virIdentityPtr ident,
                                const char **username);
 int virIdentityGetX509DName(virIdentityPtr ident,
@@ -84,18 +84,18 @@ int virIdentityGetSELinuxContext(virIdentityPtr ident,
                                  const char **context);
=20
=20
-int virIdentitySetUNIXUserName(virIdentityPtr ident,
-                               const char *username);
-int virIdentitySetUNIXUserID(virIdentityPtr ident,
-                             uid_t uid);
-int virIdentitySetUNIXGroupName(virIdentityPtr ident,
-                                const char *groupname);
-int virIdentitySetUNIXGroupID(virIdentityPtr ident,
-                              gid_t gid);
-int virIdentitySetUNIXProcessID(virIdentityPtr ident,
-                                pid_t pid);
-int virIdentitySetUNIXProcessTime(virIdentityPtr ident,
-                                  unsigned long long timestamp);
+int virIdentitySetOSUserName(virIdentityPtr ident,
+                             const char *username);
+int virIdentitySetOSUserID(virIdentityPtr ident,
+                           uid_t uid);
+int virIdentitySetOSGroupName(virIdentityPtr ident,
+                              const char *groupname);
+int virIdentitySetOSGroupID(virIdentityPtr ident,
+                            gid_t gid);
+int virIdentitySetOSProcessID(virIdentityPtr ident,
+                              pid_t pid);
+int virIdentitySetOSProcessTime(virIdentityPtr ident,
+                                unsigned long long timestamp);
 int virIdentitySetSASLUserName(virIdentityPtr ident,
                                const char *username);
 int virIdentitySetX509DName(virIdentityPtr ident,
diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c
index b60d944d8e..64b511c272 100644
--- a/tests/viridentitytest.c
+++ b/tests/viridentitytest.c
@@ -46,12 +46,12 @@ static int testIdentityAttrs(const void *data ATTRIBUTE=
_UNUSED)
         goto cleanup;
=20
     if (virIdentitySetAttr(ident,
-                           VIR_IDENTITY_ATTR_UNIX_USER_NAME,
+                           VIR_IDENTITY_ATTR_OS_USER_NAME,
                            "fred") < 0)
         goto cleanup;
=20
     if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_UNIX_USER_NAME,
+                           VIR_IDENTITY_ATTR_OS_USER_NAME,
                            &val) < 0)
         goto cleanup;
=20
@@ -61,7 +61,7 @@ static int testIdentityAttrs(const void *data ATTRIBUTE_U=
NUSED)
     }
=20
     if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,
+                           VIR_IDENTITY_ATTR_OS_GROUP_NAME,
                            &val) < 0)
         goto cleanup;
=20
@@ -71,14 +71,14 @@ static int testIdentityAttrs(const void *data ATTRIBUTE=
_UNUSED)
     }
=20
     if (virIdentitySetAttr(ident,
-                           VIR_IDENTITY_ATTR_UNIX_USER_NAME,
+                           VIR_IDENTITY_ATTR_OS_USER_NAME,
                            "joe") !=3D -1) {
         VIR_DEBUG("Unexpectedly overwrote attribute");
         goto cleanup;
     }
=20
     if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_UNIX_USER_NAME,
+                           VIR_IDENTITY_ATTR_OS_USER_NAME,
                            &val) < 0)
         goto cleanup;
=20
@@ -111,7 +111,7 @@ static int testIdentityEqual(const void *data ATTRIBUTE=
_UNUSED)
     }
=20
     if (virIdentitySetAttr(identa,
-                           VIR_IDENTITY_ATTR_UNIX_USER_NAME,
+                           VIR_IDENTITY_ATTR_OS_USER_NAME,
                            "fred") < 0)
         goto cleanup;
=20
@@ -121,7 +121,7 @@ static int testIdentityEqual(const void *data ATTRIBUTE=
_UNUSED)
     }
=20
     if (virIdentitySetAttr(identb,
-                           VIR_IDENTITY_ATTR_UNIX_USER_NAME,
+                           VIR_IDENTITY_ATTR_OS_USER_NAME,
                            "fred") < 0)
         goto cleanup;
=20
@@ -131,11 +131,11 @@ static int testIdentityEqual(const void *data ATTRIBU=
TE_UNUSED)
     }
=20
     if (virIdentitySetAttr(identa,
-                           VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,
+                           VIR_IDENTITY_ATTR_OS_GROUP_NAME,
                            "flintstone") < 0)
         goto cleanup;
     if (virIdentitySetAttr(identb,
-                           VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,
+                           VIR_IDENTITY_ATTR_OS_GROUP_NAME,
                            "flintstone") < 0)
         goto cleanup;
=20
diff --git a/tests/virnetserverclienttest.c b/tests/virnetserverclienttest.c
index cb5071b2d9..280bd24227 100644
--- a/tests/virnetserverclienttest.c
+++ b/tests/virnetserverclienttest.c
@@ -86,7 +86,7 @@ static int testIdentity(const void *opaque ATTRIBUTE_UNUS=
ED)
     }
=20
     if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_UNIX_USER_NAME,
+                           VIR_IDENTITY_ATTR_OS_USER_NAME,
                            &gotUsername) < 0) {
         fprintf(stderr, "Missing username in identity\n");
         goto cleanup;
@@ -98,7 +98,7 @@ static int testIdentity(const void *opaque ATTRIBUTE_UNUS=
ED)
     }
=20
     if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_UNIX_USER_ID,
+                           VIR_IDENTITY_ATTR_OS_USER_ID,
                            &gotUserID) < 0) {
         fprintf(stderr, "Missing user ID in identity\n");
         goto cleanup;
@@ -110,7 +110,7 @@ static int testIdentity(const void *opaque ATTRIBUTE_UN=
USED)
     }
=20
     if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_UNIX_GROUP_NAME,
+                           VIR_IDENTITY_ATTR_OS_GROUP_NAME,
                            &gotGroupname) < 0) {
         fprintf(stderr, "Missing groupname in identity\n");
         goto cleanup;
@@ -122,7 +122,7 @@ static int testIdentity(const void *opaque ATTRIBUTE_UN=
USED)
     }
=20
     if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_UNIX_GROUP_ID,
+                           VIR_IDENTITY_ATTR_OS_GROUP_ID,
                            &gotGroupID) < 0) {
         fprintf(stderr, "Missing group ID in identity\n");
         goto cleanup;
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420420; cv=none;
	d=zoho.com; s=zohoarc;
	b=enLqvOW9s64HtGd4kHIwHXh/kSfHimKrqP2Ra2M2yhMJPi1+reRgOv2lGrYCq5qQqPtXaVQ//fx7qMjYQNewdb0YaHM1BXR4n0a8n1fiq3Ft2XFZo6SaEKMF7HThMB5RMdF+GKIIZXokO6EQppY+yiM/WTNF1G9D3PyFBShM7bk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420420;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=qQQhcbin1Gh722wgdUO+4voyb3vYOh2hpY7MQt7Nosg=;
	b=bmg13nO4krN6AY8DSQpDBm7JKNte/e8HetlLlwxkWjfxKnm5eixGhu4qlG+yVS0atUkTqMtoB0Uh+NAT/qMNC377FCxKr18N/i8gMfmSYbNGpqu8V26z7jTfLvMZWfwRJGL56QeWgCOvNjCWIKJ78kpEXPNURpZA2+xEhEmEqPA=
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 1564420420108457.48211773415096;
 Mon, 29 Jul 2019 10:13:40 -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 DBCA881DE1;
	Mon, 29 Jul 2019 17:13:38 +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 B86035D9C8;
	Mon, 29 Jul 2019 17:13:38 +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 806931972D;
	Mon, 29 Jul 2019 17:13:38 +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 x6THDbfq029032 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:13:37 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 7DD505C21F; Mon, 29 Jul 2019 17:13:37 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 9E8C45C1A1;
	Mon, 29 Jul 2019 17:13:29 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:27 +0100
Message-Id: <20190729171130.25484-46-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 45/48] util: make generic identity accessors
	private
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.25]);
 Mon, 29 Jul 2019 17:13:39 +0000 (UTC)

Only expose the type safe getters/setters to other code in preparation
for changing the internal storage of data.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
---
 src/libvirt_private.syms       |  2 --
 src/util/viridentity.c         | 28 ++++++++++++++++-----
 src/util/viridentity.h         | 25 -------------------
 tests/viridentitytest.c        | 45 +++++++++-------------------------
 tests/virnetserverclienttest.c | 45 +++++++++++++++-------------------
 5 files changed, 54 insertions(+), 91 deletions(-)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index ac357583e4..c7fb8c94e4 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2136,7 +2136,6 @@ virHostMemSetParameters;
=20
=20
 # util/viridentity.h
-virIdentityGetAttr;
 virIdentityGetCurrent;
 virIdentityGetOSGroupID;
 virIdentityGetOSGroupName;
@@ -2150,7 +2149,6 @@ virIdentityGetSystem;
 virIdentityGetX509DName;
 virIdentityIsEqual;
 virIdentityNew;
-virIdentitySetAttr;
 virIdentitySetCurrent;
 virIdentitySetOSGroupID;
 virIdentitySetOSGroupName;
diff --git a/src/util/viridentity.c b/src/util/viridentity.c
index 2c6c0ee91f..fe0c416bba 100644
--- a/src/util/viridentity.c
+++ b/src/util/viridentity.c
@@ -41,6 +41,20 @@
=20
 VIR_LOG_INIT("util.identity");
=20
+typedef enum {
+      VIR_IDENTITY_ATTR_OS_USER_NAME,
+      VIR_IDENTITY_ATTR_OS_USER_ID,
+      VIR_IDENTITY_ATTR_OS_GROUP_NAME,
+      VIR_IDENTITY_ATTR_OS_GROUP_ID,
+      VIR_IDENTITY_ATTR_OS_PROCESS_ID,
+      VIR_IDENTITY_ATTR_OS_PROCESS_TIME,
+      VIR_IDENTITY_ATTR_SASL_USER_NAME,
+      VIR_IDENTITY_ATTR_X509_DISTINGUISHED_NAME,
+      VIR_IDENTITY_ATTR_SELINUX_CONTEXT,
+
+      VIR_IDENTITY_ATTR_LAST,
+} virIdentityAttrType;
+
 struct _virIdentity {
     virObject parent;
=20
@@ -233,9 +247,10 @@ static void virIdentityDispose(void *object)
  *
  * Returns: 0 on success, or -1 on error
  */
-int virIdentitySetAttr(virIdentityPtr ident,
-                       unsigned int attr,
-                       const char *value)
+static int
+virIdentitySetAttr(virIdentityPtr ident,
+                   unsigned int attr,
+                   const char *value)
 {
     int ret =3D -1;
     VIR_DEBUG("ident=3D%p attribute=3D%u value=3D%s", ident, attr, value);
@@ -269,9 +284,10 @@ int virIdentitySetAttr(virIdentityPtr ident,
  *
  * Returns 0 on success, -1 on error
  */
-int virIdentityGetAttr(virIdentityPtr ident,
-                       unsigned int attr,
-                       const char **value)
+static int
+virIdentityGetAttr(virIdentityPtr ident,
+                   unsigned int attr,
+                   const char **value)
 {
     VIR_DEBUG("ident=3D%p attribute=3D%d value=3D%p", ident, attr, value);
=20
diff --git a/src/util/viridentity.h b/src/util/viridentity.h
index 4b87506373..0925b740d9 100644
--- a/src/util/viridentity.h
+++ b/src/util/viridentity.h
@@ -26,20 +26,6 @@
 typedef struct _virIdentity virIdentity;
 typedef virIdentity *virIdentityPtr;
=20
-typedef enum {
-      VIR_IDENTITY_ATTR_OS_USER_NAME,
-      VIR_IDENTITY_ATTR_OS_USER_ID,
-      VIR_IDENTITY_ATTR_OS_GROUP_NAME,
-      VIR_IDENTITY_ATTR_OS_GROUP_ID,
-      VIR_IDENTITY_ATTR_OS_PROCESS_ID,
-      VIR_IDENTITY_ATTR_OS_PROCESS_TIME,
-      VIR_IDENTITY_ATTR_SASL_USER_NAME,
-      VIR_IDENTITY_ATTR_X509_DISTINGUISHED_NAME,
-      VIR_IDENTITY_ATTR_SELINUX_CONTEXT,
-
-      VIR_IDENTITY_ATTR_LAST,
-} virIdentityAttrType;
-
 virIdentityPtr virIdentityGetCurrent(void);
 int virIdentitySetCurrent(virIdentityPtr ident);
=20
@@ -47,17 +33,6 @@ virIdentityPtr virIdentityGetSystem(void);
=20
 virIdentityPtr virIdentityNew(void);
=20
-int virIdentitySetAttr(virIdentityPtr ident,
-                       unsigned int attr,
-                       const char *value)
-    ATTRIBUTE_NONNULL(1)
-    ATTRIBUTE_NONNULL(3);
-
-int virIdentityGetAttr(virIdentityPtr ident,
-                       unsigned int attr,
-                       const char **value)
-    ATTRIBUTE_NONNULL(1)
-    ATTRIBUTE_NONNULL(3);
=20
 bool virIdentityIsEqual(virIdentityPtr identA,
                         virIdentityPtr identB)
diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c
index 64b511c272..e57b68ec43 100644
--- a/tests/viridentitytest.c
+++ b/tests/viridentitytest.c
@@ -45,14 +45,11 @@ static int testIdentityAttrs(const void *data ATTRIBUTE=
_UNUSED)
     if (!(ident =3D virIdentityNew()))
         goto cleanup;
=20
-    if (virIdentitySetAttr(ident,
-                           VIR_IDENTITY_ATTR_OS_USER_NAME,
-                           "fred") < 0)
+    if (virIdentitySetOSUserName(ident, "fred") < 0)
         goto cleanup;
=20
-    if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_OS_USER_NAME,
-                           &val) < 0)
+    if (virIdentityGetOSUserName(ident,
+                                 &val) < 0)
         goto cleanup;
=20
     if (STRNEQ_NULLABLE(val, "fred")) {
@@ -60,9 +57,7 @@ static int testIdentityAttrs(const void *data ATTRIBUTE_U=
NUSED)
         goto cleanup;
     }
=20
-    if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_OS_GROUP_NAME,
-                           &val) < 0)
+    if (virIdentityGetOSGroupName(ident, &val) < 0)
         goto cleanup;
=20
     if (val !=3D NULL) {
@@ -70,16 +65,12 @@ static int testIdentityAttrs(const void *data ATTRIBUTE=
_UNUSED)
         goto cleanup;
     }
=20
-    if (virIdentitySetAttr(ident,
-                           VIR_IDENTITY_ATTR_OS_USER_NAME,
-                           "joe") !=3D -1) {
+    if (virIdentitySetOSUserName(ident, "joe") !=3D -1) {
         VIR_DEBUG("Unexpectedly overwrote attribute");
         goto cleanup;
     }
=20
-    if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_OS_USER_NAME,
-                           &val) < 0)
+    if (virIdentityGetOSUserName(ident, &val) < 0)
         goto cleanup;
=20
     if (STRNEQ_NULLABLE(val, "fred")) {
@@ -110,9 +101,7 @@ static int testIdentityEqual(const void *data ATTRIBUTE=
_UNUSED)
         goto cleanup;
     }
=20
-    if (virIdentitySetAttr(identa,
-                           VIR_IDENTITY_ATTR_OS_USER_NAME,
-                           "fred") < 0)
+    if (virIdentitySetOSUserName(identa, "fred") < 0)
         goto cleanup;
=20
     if (virIdentityIsEqual(identa, identb)) {
@@ -120,9 +109,7 @@ static int testIdentityEqual(const void *data ATTRIBUTE=
_UNUSED)
         goto cleanup;
     }
=20
-    if (virIdentitySetAttr(identb,
-                           VIR_IDENTITY_ATTR_OS_USER_NAME,
-                           "fred") < 0)
+    if (virIdentitySetOSUserName(identb, "fred") < 0)
         goto cleanup;
=20
     if (!virIdentityIsEqual(identa, identb)) {
@@ -130,13 +117,9 @@ static int testIdentityEqual(const void *data ATTRIBUT=
E_UNUSED)
         goto cleanup;
     }
=20
-    if (virIdentitySetAttr(identa,
-                           VIR_IDENTITY_ATTR_OS_GROUP_NAME,
-                           "flintstone") < 0)
+    if (virIdentitySetOSGroupName(identa, "flintstone") < 0)
         goto cleanup;
-    if (virIdentitySetAttr(identb,
-                           VIR_IDENTITY_ATTR_OS_GROUP_NAME,
-                           "flintstone") < 0)
+    if (virIdentitySetOSGroupName(identb, "flintstone") < 0)
         goto cleanup;
=20
     if (!virIdentityIsEqual(identa, identb)) {
@@ -144,9 +127,7 @@ static int testIdentityEqual(const void *data ATTRIBUTE=
_UNUSED)
         goto cleanup;
     }
=20
-    if (virIdentitySetAttr(identb,
-                           VIR_IDENTITY_ATTR_SASL_USER_NAME,
-                           "fred@FLINTSTONE.COM") < 0)
+    if (virIdentitySetSASLUserName(identb, "fred@FLINTSTONE.COM") < 0)
         goto cleanup;
=20
     if (virIdentityIsEqual(identa, identb)) {
@@ -181,9 +162,7 @@ static int testIdentityGetSystem(const void *data)
         goto cleanup;
     }
=20
-    if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_SELINUX_CONTEXT,
-                           &val) < 0)
+    if (virIdentityGetSELinuxContext(ident, &val) < 0)
         goto cleanup;
=20
     if (STRNEQ_NULLABLE(val, context)) {
diff --git a/tests/virnetserverclienttest.c b/tests/virnetserverclienttest.c
index 280bd24227..603afadab4 100644
--- a/tests/virnetserverclienttest.c
+++ b/tests/virnetserverclienttest.c
@@ -53,9 +53,9 @@ static int testIdentity(const void *opaque ATTRIBUTE_UNUS=
ED)
     virNetServerClientPtr client =3D NULL;
     virIdentityPtr ident =3D NULL;
     const char *gotUsername =3D NULL;
-    const char *gotUserID =3D NULL;
+    uid_t gotUserID;
     const char *gotGroupname =3D NULL;
-    const char *gotGroupID =3D NULL;
+    gid_t gotGroupID;
     const char *gotSELinuxContext =3D NULL;
=20
     if (socketpair(PF_UNIX, SOCK_STREAM, 0, sv) < 0) {
@@ -85,9 +85,8 @@ static int testIdentity(const void *opaque ATTRIBUTE_UNUS=
ED)
         goto cleanup;
     }
=20
-    if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_OS_USER_NAME,
-                           &gotUsername) < 0) {
+    if (virIdentityGetOSUserName(ident,
+                                 &gotUsername) < 0) {
         fprintf(stderr, "Missing username in identity\n");
         goto cleanup;
     }
@@ -97,21 +96,19 @@ static int testIdentity(const void *opaque ATTRIBUTE_UN=
USED)
         goto cleanup;
     }
=20
-    if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_OS_USER_ID,
-                           &gotUserID) < 0) {
+    if (virIdentityGetOSUserID(ident,
+                               &gotUserID) < 0) {
         fprintf(stderr, "Missing user ID in identity\n");
         goto cleanup;
     }
-    if (STRNEQ_NULLABLE("666", gotUserID)) {
-        fprintf(stderr, "Want username '666' got '%s'\n",
-                NULLSTR(gotUserID));
+    if (666 !=3D gotUserID) {
+        fprintf(stderr, "Want username '666' got '%llu'\n",
+                (unsigned long long)gotUserID);
         goto cleanup;
     }
=20
-    if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_OS_GROUP_NAME,
-                           &gotGroupname) < 0) {
+    if (virIdentityGetOSGroupName(ident,
+                                  &gotGroupname) < 0) {
         fprintf(stderr, "Missing groupname in identity\n");
         goto cleanup;
     }
@@ -121,27 +118,25 @@ static int testIdentity(const void *opaque ATTRIBUTE_=
UNUSED)
         goto cleanup;
     }
=20
-    if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_OS_GROUP_ID,
-                           &gotGroupID) < 0) {
+    if (virIdentityGetOSGroupID(ident,
+                                &gotGroupID) < 0) {
         fprintf(stderr, "Missing group ID in identity\n");
         goto cleanup;
     }
-    if (STRNEQ_NULLABLE("7337", gotGroupID)) {
-        fprintf(stderr, "Want groupname '7337' got '%s'\n",
-                NULLSTR(gotGroupID));
+    if (7337 !=3D gotGroupID) {
+        fprintf(stderr, "Want groupname '7337' got '%llu'\n",
+                (unsigned long long)gotGroupID);
         goto cleanup;
     }
=20
-    if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_SELINUX_CONTEXT,
-                           &gotSELinuxContext) < 0) {
+    if (virIdentityGetSELinuxContext(ident,
+                                     &gotSELinuxContext) < 0) {
         fprintf(stderr, "Missing SELinux context in identity\n");
         goto cleanup;
     }
     if (STRNEQ_NULLABLE("foo_u:bar_r:wizz_t:s0-s0:c0.c1023", gotSELinuxCon=
text)) {
-        fprintf(stderr, "Want groupname 'foo_u:bar_r:wizz_t:s0-s0:c0.c1023=
' got '%s'\n",
-                NULLSTR(gotGroupID));
+        fprintf(stderr, "Want SELinux context 'foo_u:bar_r:wizz_t:s0-s0:c0=
.c1023' got '%s'\n",
+                NULLSTR(gotSELinuxContext));
         goto cleanup;
     }
=20
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420432; cv=none;
	d=zoho.com; s=zohoarc;
	b=EcoQHtgpYCnO8Q2T16sqtgfPzUX6fxApgJB4+9M2s/0jrQIXrfXt/h+qqebXytrfEiETzTYetlTO3hDp25pDl/bgAX2NnfSAzfP5TLcwHkOCkAzSx8shXDrzun36sg0Xb4FRzgh+ybvvOhxVTlEs92TWOoTtxe5BH2joH1LmKBE=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420432;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=h9Zcz/QTTIguCn+Mz07d+q9Q1ltMFAMoAUMy6J3/pAk=;
	b=Qa/Fi1GwsACucYdc8E8CMIlyFaRZrnaQJqHfgKc5v9Z3+g+4CcCK1+kDjfBaPgMRARGePBzwlczBSRWLRceQ4fmbQYgGC/7ePnQtOXSL20yoF0uTAP8kwbPVgsCSx6hVhkYXbUheASld5qbnu4pX6oj9y48a0bLCYcc+1BLH4io=
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 156442043230655.763734559045815;
 Mon, 29 Jul 2019 10:13:52 -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 BB16430C1E2A;
	Mon, 29 Jul 2019 17:13: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 8B19F5D9E2;
	Mon, 29 Jul 2019 17:13:50 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4ACAB180BA99;
	Mon, 29 Jul 2019 17:13: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 x6THDnVc029078 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:13:49 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 05D6E5C21F; Mon, 29 Jul 2019 17:13:49 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 902245C206;
	Mon, 29 Jul 2019 17:13:37 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:28 +0100
Message-Id: <20190729171130.25484-47-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 46/48] util: storage identity attrs as
	virTypedParameter internally
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.47]);
 Mon, 29 Jul 2019 17:13:51 +0000 (UTC)

We'll shortly be exposing the identity as virTypedParameter in the
public header, so it simplifies life to use that as the internal
representation too.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/libvirt_private.syms |   1 -
 src/util/viridentity.c   | 385 ++++++++++++++++++---------------------
 src/util/viridentity.h   |   6 -
 tests/viridentitytest.c  |  62 +------
 4 files changed, 180 insertions(+), 274 deletions(-)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index c7fb8c94e4..d42a939f5d 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2147,7 +2147,6 @@ virIdentityGetSASLUserName;
 virIdentityGetSELinuxContext;
 virIdentityGetSystem;
 virIdentityGetX509DName;
-virIdentityIsEqual;
 virIdentityNew;
 virIdentitySetCurrent;
 virIdentitySetOSGroupID;
diff --git a/src/util/viridentity.c b/src/util/viridentity.c
index fe0c416bba..5324400650 100644
--- a/src/util/viridentity.c
+++ b/src/util/viridentity.c
@@ -41,24 +41,12 @@
=20
 VIR_LOG_INIT("util.identity");
=20
-typedef enum {
-      VIR_IDENTITY_ATTR_OS_USER_NAME,
-      VIR_IDENTITY_ATTR_OS_USER_ID,
-      VIR_IDENTITY_ATTR_OS_GROUP_NAME,
-      VIR_IDENTITY_ATTR_OS_GROUP_ID,
-      VIR_IDENTITY_ATTR_OS_PROCESS_ID,
-      VIR_IDENTITY_ATTR_OS_PROCESS_TIME,
-      VIR_IDENTITY_ATTR_SASL_USER_NAME,
-      VIR_IDENTITY_ATTR_X509_DISTINGUISHED_NAME,
-      VIR_IDENTITY_ATTR_SELINUX_CONTEXT,
-
-      VIR_IDENTITY_ATTR_LAST,
-} virIdentityAttrType;
-
 struct _virIdentity {
     virObject parent;
=20
-    char *attrs[VIR_IDENTITY_ATTR_LAST];
+    int nparams;
+    int maxparams;
+    virTypedParameterPtr params;
 };
=20
 static virClassPtr virIdentityClass;
@@ -188,6 +176,7 @@ virIdentityPtr virIdentityGetSystem(void)
                                  _("Unable to lookup SELinux process conte=
xt"));
             return ret;
         }
+        VIR_DEBUG("Set con %s", con);
         if (virIdentitySetSELinuxContext(ret, con) < 0) {
             freecon(con);
             goto error;
@@ -229,131 +218,38 @@ virIdentityPtr virIdentityNew(void)
 static void virIdentityDispose(void *object)
 {
     virIdentityPtr ident =3D object;
-    size_t i;
=20
-    for (i =3D 0; i < VIR_IDENTITY_ATTR_LAST; i++)
-        VIR_FREE(ident->attrs[i]);
-}
-
-
-/**
- * virIdentitySetAttr:
- * @ident: the identity to modify
- * @attr: the attribute type to set
- * @value: the identifying value to associate with @attr
- *
- * Sets an identifying attribute @attr on @ident. Each
- * @attr type can only be set once.
- *
- * Returns: 0 on success, or -1 on error
- */
-static int
-virIdentitySetAttr(virIdentityPtr ident,
-                   unsigned int attr,
-                   const char *value)
-{
-    int ret =3D -1;
-    VIR_DEBUG("ident=3D%p attribute=3D%u value=3D%s", ident, attr, value);
-
-    if (ident->attrs[attr]) {
-        virReportError(VIR_ERR_OPERATION_DENIED, "%s",
-                       _("Identity attribute is already set"));
-        goto cleanup;
-    }
-
-    if (VIR_STRDUP(ident->attrs[attr], value) < 0)
-        goto cleanup;
-
-    ret =3D 0;
-
- cleanup:
-    return ret;
-}
-
-
-/**
- * virIdentityGetAttr:
- * @ident: the identity to query
- * @attr: the attribute to read
- * @value: filled with the attribute value
- *
- * Fills @value with a pointer to the value associated
- * with the identifying attribute @attr in @ident. If
- * @attr is not set, then it will simply be initialized
- * to NULL and considered as a successful read
- *
- * Returns 0 on success, -1 on error
- */
-static int
-virIdentityGetAttr(virIdentityPtr ident,
-                   unsigned int attr,
-                   const char **value)
-{
-    VIR_DEBUG("ident=3D%p attribute=3D%d value=3D%p", ident, attr, value);
-
-    *value =3D ident->attrs[attr];
-
-    return 0;
-}
-
-
-/**
- * virIdentityIsEqual:
- * @identA: the first identity
- * @identB: the second identity
- *
- * Compares every attribute in @identA and @identB
- * to determine if they refer to the same identity
- *
- * Returns true if they are equal, false if not equal
- */
-bool virIdentityIsEqual(virIdentityPtr identA,
-                        virIdentityPtr identB)
-{
-    bool ret =3D false;
-    size_t i;
-    VIR_DEBUG("identA=3D%p identB=3D%p", identA, identB);
-
-    for (i =3D 0; i < VIR_IDENTITY_ATTR_LAST; i++) {
-        if (STRNEQ_NULLABLE(identA->attrs[i],
-                            identB->attrs[i]))
-            goto cleanup;
-    }
-
-    ret =3D true;
- cleanup:
-    return ret;
+    virTypedParamsFree(ident->params, ident->nparams);
 }
=20
=20
 int virIdentityGetOSUserName(virIdentityPtr ident,
                              const char **username)
 {
-    return virIdentityGetAttr(ident,
-                              VIR_IDENTITY_ATTR_OS_USER_NAME,
-                              username);
+    return virTypedParamsGetString(ident->params,
+                                   ident->nparams,
+                                   VIR_CONNECT_IDENTITY_OS_USER_NAME,
+                                   username);
 }
=20
=20
 int virIdentityGetOSUserID(virIdentityPtr ident,
                            uid_t *uid)
 {
-    int val;
-    const char *userid;
+    unsigned long long val;
+    int ret;
=20
     *uid =3D -1;
-    if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_OS_USER_ID,
-                           &userid) < 0)
-        return -1;
-
-    if (!userid)
-        return -1;
=20
-    if (virStrToLong_i(userid, NULL, 10, &val) < 0)
+    ret =3D virTypedParamsGetULLong(ident->params,
+                                  ident->nparams,
+                                  VIR_CONNECT_IDENTITY_OS_USER_ID,
+                                  &val);
+    if (ret < 0)
         return -1;
=20
-    *uid =3D (uid_t)val;
+    if (ret =3D=3D 1)
+        *uid =3D (uid_t)val;
=20
     return 0;
 }
@@ -361,31 +257,32 @@ int virIdentityGetOSUserID(virIdentityPtr ident,
 int virIdentityGetOSGroupName(virIdentityPtr ident,
                               const char **groupname)
 {
-    return virIdentityGetAttr(ident,
-                              VIR_IDENTITY_ATTR_OS_GROUP_NAME,
-                              groupname);
+    *groupname =3D NULL;
+    if (virTypedParamsGetString(ident->params,
+                                ident->nparams,
+                                VIR_CONNECT_IDENTITY_OS_GROUP_NAME,
+                                groupname) < 0)
+        return -1;
+    return 0;
 }
=20
=20
 int virIdentityGetOSGroupID(virIdentityPtr ident,
                             gid_t *gid)
 {
-    int val;
-    const char *groupid;
+    int ret;
+    unsigned long long val;
=20
     *gid =3D -1;
-    if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_OS_GROUP_ID,
-                           &groupid) < 0)
+    ret =3D virTypedParamsGetULLong(ident->params,
+                                  ident->nparams,
+                                  VIR_CONNECT_IDENTITY_OS_GROUP_ID,
+                                  &val);
+    if (ret < 0)
         return -1;
=20
-    if (!groupid)
-        return -1;
-
-    if (virStrToLong_i(groupid, NULL, 10, &val) < 0)
-        return -1;
-
-    *gid =3D (gid_t)val;
+    if (ret =3D=3D 1)
+        *gid =3D (gid_t)val;
=20
     return 0;
 }
@@ -394,22 +291,19 @@ int virIdentityGetOSGroupID(virIdentityPtr ident,
 int virIdentityGetOSProcessID(virIdentityPtr ident,
                               pid_t *pid)
 {
-    unsigned long long val;
-    const char *processid;
+    int ret;
+    long long val;
=20
     *pid =3D 0;
-    if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_OS_PROCESS_ID,
-                           &processid) < 0)
-        return -1;
-
-    if (!processid)
+    ret =3D virTypedParamsGetLLong(ident->params,
+                                 ident->nparams,
+                                 VIR_CONNECT_IDENTITY_OS_PROCESS_ID,
+                                 &val);
+    if (ret < 0)
         return -1;
=20
-    if (virStrToLong_ull(processid, NULL, 10, &val) < 0)
-        return -1;
-
-    *pid =3D (pid_t)val;
+    if (ret =3D=3D 1)
+        *pid =3D (gid_t)val;
=20
     return 0;
 }
@@ -418,16 +312,11 @@ int virIdentityGetOSProcessID(virIdentityPtr ident,
 int virIdentityGetOSProcessTime(virIdentityPtr ident,
                                 unsigned long long *timestamp)
 {
-    const char *processtime;
-    if (virIdentityGetAttr(ident,
-                           VIR_IDENTITY_ATTR_OS_PROCESS_TIME,
-                           &processtime) < 0)
-        return -1;
-
-    if (!processtime)
-        return -1;
-
-    if (virStrToLong_ull(processtime, NULL, 10, timestamp) < 0)
+    *timestamp =3D 0;
+    if (virTypedParamsGetULLong(ident->params,
+                                ident->nparams,
+                                VIR_CONNECT_IDENTITY_OS_PROCESS_TIME,
+                                timestamp) < 0)
         return -1;
=20
     return 0;
@@ -437,101 +326,153 @@ int virIdentityGetOSProcessTime(virIdentityPtr iden=
t,
 int virIdentityGetSASLUserName(virIdentityPtr ident,
                                const char **username)
 {
-    return virIdentityGetAttr(ident,
-                              VIR_IDENTITY_ATTR_SASL_USER_NAME,
-                              username);
+    *username =3D NULL;
+    if (virTypedParamsGetString(ident->params,
+                                ident->nparams,
+                                VIR_CONNECT_IDENTITY_SASL_USER_NAME,
+                                username) < 0)
+        return -1;
+    return 0;
 }
=20
=20
 int virIdentityGetX509DName(virIdentityPtr ident,
                             const char **dname)
 {
-    return virIdentityGetAttr(ident,
-                              VIR_IDENTITY_ATTR_X509_DISTINGUISHED_NAME,
-                              dname);
+    *dname =3D NULL;
+    if (virTypedParamsGetString(ident->params,
+                                ident->nparams,
+                                VIR_CONNECT_IDENTITY_X509_DISTINGUISHED_NA=
ME,
+                                dname) < 0)
+        return -1;
+    return 0;
 }
=20
=20
 int virIdentityGetSELinuxContext(virIdentityPtr ident,
                                  const char **context)
 {
-    return virIdentityGetAttr(ident,
-                              VIR_IDENTITY_ATTR_SELINUX_CONTEXT,
-                              context);
+    *context =3D NULL;
+    if (virTypedParamsGetString(ident->params,
+                                ident->nparams,
+                                VIR_CONNECT_IDENTITY_SELINUX_CONTEXT,
+                                context) < 0)
+        return -1;
+    return 0;
 }
=20
=20
 int virIdentitySetOSUserName(virIdentityPtr ident,
                              const char *username)
 {
-    return virIdentitySetAttr(ident,
-                              VIR_IDENTITY_ATTR_OS_USER_NAME,
-                              username);
+    if (virTypedParamsGet(ident->params,
+                          ident->nparams,
+                          VIR_CONNECT_IDENTITY_OS_USER_NAME)) {
+        virReportError(VIR_ERR_OPERATION_DENIED, "%s",
+                       _("Identity attribute is already set"));
+        return -1;
+    }
+
+    return virTypedParamsAddString(&ident->params,
+                                   &ident->nparams,
+                                   &ident->maxparams,
+                                   VIR_CONNECT_IDENTITY_OS_USER_NAME,
+                                   username);
 }
=20
=20
 int virIdentitySetOSUserID(virIdentityPtr ident,
                            uid_t uid)
 {
-    VIR_AUTOFREE(char *) val =3D NULL;
-
-    if (virAsprintf(&val, "%d", (int)uid) < 0)
+    if (virTypedParamsGet(ident->params,
+                          ident->nparams,
+                          VIR_CONNECT_IDENTITY_OS_USER_ID)) {
+        virReportError(VIR_ERR_OPERATION_DENIED, "%s",
+                       _("Identity attribute is already set"));
         return -1;
+    }
=20
-    return virIdentitySetAttr(ident,
-                              VIR_IDENTITY_ATTR_OS_USER_ID,
-                              val);
+    return virTypedParamsAddULLong(&ident->params,
+                                   &ident->nparams,
+                                   &ident->maxparams,
+                                   VIR_CONNECT_IDENTITY_OS_USER_ID,
+                                   uid);
 }
=20
=20
 int virIdentitySetOSGroupName(virIdentityPtr ident,
                               const char *groupname)
 {
-    return virIdentitySetAttr(ident,
-                              VIR_IDENTITY_ATTR_OS_GROUP_NAME,
-                              groupname);
+    if (virTypedParamsGet(ident->params,
+                          ident->nparams,
+                          VIR_CONNECT_IDENTITY_OS_GROUP_NAME)) {
+        virReportError(VIR_ERR_OPERATION_DENIED, "%s",
+                       _("Identity attribute is already set"));
+        return -1;
+    }
+
+    return virTypedParamsAddString(&ident->params,
+                                   &ident->nparams,
+                                   &ident->maxparams,
+                                   VIR_CONNECT_IDENTITY_OS_GROUP_NAME,
+                                   groupname);
 }
=20
=20
 int virIdentitySetOSGroupID(virIdentityPtr ident,
                             gid_t gid)
 {
-    VIR_AUTOFREE(char *) val =3D NULL;
-
-    if (virAsprintf(&val, "%d", (int)gid) < 0)
+    if (virTypedParamsGet(ident->params,
+                          ident->nparams,
+                          VIR_CONNECT_IDENTITY_OS_GROUP_ID)) {
+        virReportError(VIR_ERR_OPERATION_DENIED, "%s",
+                       _("Identity attribute is already set"));
         return -1;
+    }
=20
-    return virIdentitySetAttr(ident,
-                              VIR_IDENTITY_ATTR_OS_GROUP_ID,
-                              val);
+    return virTypedParamsAddULLong(&ident->params,
+                                   &ident->nparams,
+                                   &ident->maxparams,
+                                   VIR_CONNECT_IDENTITY_OS_GROUP_ID,
+                                   gid);
 }
=20
=20
 int virIdentitySetOSProcessID(virIdentityPtr ident,
                               pid_t pid)
 {
-    VIR_AUTOFREE(char *) val =3D NULL;
-
-    if (virAsprintf(&val, "%lld", (long long) pid) < 0)
+    if (virTypedParamsGet(ident->params,
+                          ident->nparams,
+                          VIR_CONNECT_IDENTITY_OS_PROCESS_ID)) {
+        virReportError(VIR_ERR_OPERATION_DENIED, "%s",
+                       _("Identity attribute is already set"));
         return -1;
+    }
=20
-    return virIdentitySetAttr(ident,
-                              VIR_IDENTITY_ATTR_OS_PROCESS_ID,
-                              val);
+    return virTypedParamsAddLLong(&ident->params,
+                                  &ident->nparams,
+                                  &ident->maxparams,
+                                  VIR_CONNECT_IDENTITY_OS_PROCESS_ID,
+                                  pid);
 }
=20
=20
 int virIdentitySetOSProcessTime(virIdentityPtr ident,
                                 unsigned long long timestamp)
 {
-    VIR_AUTOFREE(char *) val =3D NULL;
-
-    if (virAsprintf(&val, "%llu", timestamp) < 0)
+    if (virTypedParamsGet(ident->params,
+                          ident->nparams,
+                          VIR_CONNECT_IDENTITY_OS_PROCESS_TIME)) {
+        virReportError(VIR_ERR_OPERATION_DENIED, "%s",
+                       _("Identity attribute is already set"));
         return -1;
+    }
=20
-    return virIdentitySetAttr(ident,
-                              VIR_IDENTITY_ATTR_OS_PROCESS_TIME,
-                              val);
+    return virTypedParamsAddULLong(&ident->params,
+                                   &ident->nparams,
+                                   &ident->maxparams,
+                                   VIR_CONNECT_IDENTITY_OS_PROCESS_TIME,
+                                   timestamp);
 }
=20
=20
@@ -539,25 +480,55 @@ int virIdentitySetOSProcessTime(virIdentityPtr ident,
 int virIdentitySetSASLUserName(virIdentityPtr ident,
                                const char *username)
 {
-    return virIdentitySetAttr(ident,
-                              VIR_IDENTITY_ATTR_SASL_USER_NAME,
-                              username);
+    if (virTypedParamsGet(ident->params,
+                          ident->nparams,
+                          VIR_CONNECT_IDENTITY_SASL_USER_NAME)) {
+        virReportError(VIR_ERR_OPERATION_DENIED, "%s",
+                       _("Identity attribute is already set"));
+        return -1;
+    }
+
+    return virTypedParamsAddString(&ident->params,
+                                   &ident->nparams,
+                                   &ident->maxparams,
+                                   VIR_CONNECT_IDENTITY_SASL_USER_NAME,
+                                   username);
 }
=20
=20
 int virIdentitySetX509DName(virIdentityPtr ident,
                             const char *dname)
 {
-    return virIdentitySetAttr(ident,
-                              VIR_IDENTITY_ATTR_X509_DISTINGUISHED_NAME,
-                              dname);
+    if (virTypedParamsGet(ident->params,
+                          ident->nparams,
+                          VIR_CONNECT_IDENTITY_X509_DISTINGUISHED_NAME)) {
+        virReportError(VIR_ERR_OPERATION_DENIED, "%s",
+                       _("Identity attribute is already set"));
+        return -1;
+    }
+
+    return virTypedParamsAddString(&ident->params,
+                                   &ident->nparams,
+                                   &ident->maxparams,
+                                   VIR_CONNECT_IDENTITY_X509_DISTINGUISHED=
_NAME,
+                                   dname);
 }
=20
=20
 int virIdentitySetSELinuxContext(virIdentityPtr ident,
                                  const char *context)
 {
-    return virIdentitySetAttr(ident,
-                              VIR_IDENTITY_ATTR_SELINUX_CONTEXT,
-                              context);
+    if (virTypedParamsGet(ident->params,
+                          ident->nparams,
+                          VIR_CONNECT_IDENTITY_SELINUX_CONTEXT)) {
+        virReportError(VIR_ERR_OPERATION_DENIED, "%s",
+                       _("Identity attribute is already set"));
+        return -1;
+    }
+
+    return virTypedParamsAddString(&ident->params,
+                                   &ident->nparams,
+                                   &ident->maxparams,
+                                   VIR_CONNECT_IDENTITY_SELINUX_CONTEXT,
+                                   context);
 }
diff --git a/src/util/viridentity.h b/src/util/viridentity.h
index 0925b740d9..6dc0393810 100644
--- a/src/util/viridentity.h
+++ b/src/util/viridentity.h
@@ -33,12 +33,6 @@ virIdentityPtr virIdentityGetSystem(void);
=20
 virIdentityPtr virIdentityNew(void);
=20
-
-bool virIdentityIsEqual(virIdentityPtr identA,
-                        virIdentityPtr identB)
-    ATTRIBUTE_NONNULL(1)
-    ATTRIBUTE_NONNULL(2);
-
 int virIdentityGetOSUserName(virIdentityPtr ident,
                              const char **username);
 int virIdentityGetOSUserID(virIdentityPtr ident,
diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c
index e57b68ec43..ba85c90d6c 100644
--- a/tests/viridentitytest.c
+++ b/tests/viridentitytest.c
@@ -85,63 +85,6 @@ static int testIdentityAttrs(const void *data ATTRIBUTE_=
UNUSED)
 }
=20
=20
-static int testIdentityEqual(const void *data ATTRIBUTE_UNUSED)
-{
-    int ret =3D -1;
-    virIdentityPtr identa =3D NULL;
-    virIdentityPtr identb =3D NULL;
-
-    if (!(identa =3D virIdentityNew()))
-        goto cleanup;
-    if (!(identb =3D virIdentityNew()))
-        goto cleanup;
-
-    if (!virIdentityIsEqual(identa, identb)) {
-        VIR_DEBUG("Empty identities were not equal");
-        goto cleanup;
-    }
-
-    if (virIdentitySetOSUserName(identa, "fred") < 0)
-        goto cleanup;
-
-    if (virIdentityIsEqual(identa, identb)) {
-        VIR_DEBUG("Mis-matched identities should not be equal");
-        goto cleanup;
-    }
-
-    if (virIdentitySetOSUserName(identb, "fred") < 0)
-        goto cleanup;
-
-    if (!virIdentityIsEqual(identa, identb)) {
-        VIR_DEBUG("Matched identities were not equal");
-        goto cleanup;
-    }
-
-    if (virIdentitySetOSGroupName(identa, "flintstone") < 0)
-        goto cleanup;
-    if (virIdentitySetOSGroupName(identb, "flintstone") < 0)
-        goto cleanup;
-
-    if (!virIdentityIsEqual(identa, identb)) {
-        VIR_DEBUG("Matched identities were not equal");
-        goto cleanup;
-    }
-
-    if (virIdentitySetSASLUserName(identb, "fred@FLINTSTONE.COM") < 0)
-        goto cleanup;
-
-    if (virIdentityIsEqual(identa, identb)) {
-        VIR_DEBUG("Mis-matched identities should not be equal");
-        goto cleanup;
-    }
-
-    ret =3D 0;
- cleanup:
-    virObjectUnref(identa);
-    virObjectUnref(identb);
-    return ret;
-}
-
 static int testIdentityGetSystem(const void *data)
 {
     const char *context =3D data;
@@ -166,7 +109,8 @@ static int testIdentityGetSystem(const void *data)
         goto cleanup;
=20
     if (STRNEQ_NULLABLE(val, context)) {
-        VIR_DEBUG("Unexpected SELinux context attribute");
+        VIR_DEBUG("Unexpected SELinux context attribute '%s' !=3D '%s'",
+                  val, context);
         goto cleanup;
     }
=20
@@ -204,8 +148,6 @@ mymain(void)
=20
     if (virTestRun("Identity attributes ", testIdentityAttrs, NULL) < 0)
         ret =3D -1;
-    if (virTestRun("Identity equality ", testIdentityEqual, NULL) < 0)
-        ret =3D -1;
     if (virTestRun("Setting fake SELinux context ", testSetFakeSELinuxCont=
ext, context) < 0)
         ret =3D -1;
     if (virTestRun("System identity (fake SELinux enabled) ", testIdentity=
GetSystem, context) < 0)
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420441; cv=none;
	d=zoho.com; s=zohoarc;
	b=nfbhojt0SrxECc+CQzVgNmjP/FSMra4G1r0DDg1yqKuBBZ5kStXLrAdHaDD+sv0B6oC9VGZcZPV0VsDiAQTWbY+6/tgFbTUlop0gW4TO4x06pEhuccbnoH8ilDPdrfqv/f2UAzbQ9VnaNsnVdeWSrAW9BRpBIA2FoarAwFOUH08=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420441;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=/wKSJYVg614NGif/bzzIHSxh3jkNsy/BcUsRFvvmVQg=;
	b=dRznDe3VMkabr2gZEQE3bIyQRx31kif1ApNo/gUYDMinebvIRupHfFNv8acip/CxgjEry6O+I7PsFkj0c5tOr7s+H2WEF6TD0yxRQZ1cZxqjkWv9sk8HlsD5sHu0XO5AC3WKxys7sJuz00durCIclxKOxhlMHuqY1RcDUK98h8c=
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 1564420441372280.58304629736176;
 Mon, 29 Jul 2019 10:14:01 -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 3CABA3006BB6;
	Mon, 29 Jul 2019 17:14:00 +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 19AE160BE5;
	Mon, 29 Jul 2019 17:14:00 +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 D84AD180B536;
	Mon, 29 Jul 2019 17:13:59 +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 x6THDwtB029110 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:13:58 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 5186A5C21F; Mon, 29 Jul 2019 17:13:58 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id AF97A5C1A1;
	Mon, 29 Jul 2019 17:13:49 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:29 +0100
Message-Id: <20190729171130.25484-48-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 47/48] util: allow identity to be
	imported/exported as typed parameters
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.48]);
 Mon, 29 Jul 2019 17:14:00 +0000 (UTC)

Add ability to import/export all the parameters associated with an
identity, so that they can be exposed via the public API.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/libvirt_private.syms |  2 ++
 src/util/viridentity.c   | 54 ++++++++++++++++++++++++++++++++++++++++
 src/util/viridentity.h   |  8 ++++++
 3 files changed, 64 insertions(+)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index d42a939f5d..a33b84efe0 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2143,6 +2143,7 @@ virIdentityGetOSProcessID;
 virIdentityGetOSProcessTime;
 virIdentityGetOSUserID;
 virIdentityGetOSUserName;
+virIdentityGetParameters;
 virIdentityGetSASLUserName;
 virIdentityGetSELinuxContext;
 virIdentityGetSystem;
@@ -2155,6 +2156,7 @@ virIdentitySetOSProcessID;
 virIdentitySetOSProcessTime;
 virIdentitySetOSUserID;
 virIdentitySetOSUserName;
+virIdentitySetParameters;
 virIdentitySetSASLUserName;
 virIdentitySetSELinuxContext;
 virIdentitySetX509DName;
diff --git a/src/util/viridentity.c b/src/util/viridentity.c
index 5324400650..461e41ec3d 100644
--- a/src/util/viridentity.c
+++ b/src/util/viridentity.c
@@ -36,6 +36,7 @@
 #include "virutil.h"
 #include "virstring.h"
 #include "virprocess.h"
+#include "virtypedparam.h"
=20
 #define VIR_FROM_THIS VIR_FROM_IDENTITY
=20
@@ -532,3 +533,56 @@ int virIdentitySetSELinuxContext(virIdentityPtr ident,
                                    VIR_CONNECT_IDENTITY_SELINUX_CONTEXT,
                                    context);
 }
+
+
+int virIdentitySetParameters(virIdentityPtr ident,
+                             virTypedParameterPtr params,
+                             int nparams)
+{
+    if (virTypedParamsValidate(params, nparams,
+                               VIR_CONNECT_IDENTITY_OS_USER_NAME,
+                               VIR_TYPED_PARAM_STRING,
+                               VIR_CONNECT_IDENTITY_OS_USER_ID,
+                               VIR_TYPED_PARAM_ULLONG,
+                               VIR_CONNECT_IDENTITY_OS_GROUP_NAME,
+                               VIR_TYPED_PARAM_STRING,
+                               VIR_CONNECT_IDENTITY_OS_GROUP_ID,
+                               VIR_TYPED_PARAM_ULLONG,
+                               VIR_CONNECT_IDENTITY_OS_PROCESS_ID,
+                               VIR_TYPED_PARAM_LLONG,
+                               VIR_CONNECT_IDENTITY_OS_PROCESS_TIME,
+                               VIR_TYPED_PARAM_ULLONG,
+                               VIR_CONNECT_IDENTITY_SASL_USER_NAME,
+                               VIR_TYPED_PARAM_STRING,
+                               VIR_CONNECT_IDENTITY_X509_DISTINGUISHED_NAM=
E,
+                               VIR_TYPED_PARAM_STRING,
+                               VIR_CONNECT_IDENTITY_SELINUX_CONTEXT,
+                               VIR_TYPED_PARAM_STRING,
+                               NULL) < 0)
+        return -1;
+
+    virTypedParamsFree(ident->params, ident->nparams);
+    ident->params =3D NULL;
+    ident->nparams =3D 0;
+    if (virTypedParamsCopy(&ident->params, params, nparams) < 0)
+        return -1;
+    ident->nparams =3D nparams;
+
+    return 0;
+}
+
+
+int virIdentityGetParameters(virIdentityPtr ident,
+                             virTypedParameterPtr *params,
+                             int *nparams)
+{
+    *params =3D NULL;
+    *nparams =3D 0;
+
+    if (virTypedParamsCopy(params, ident->params, ident->nparams) < 0)
+        return -1;
+
+    *nparams =3D ident->nparams;
+
+    return 0;
+}
diff --git a/src/util/viridentity.h b/src/util/viridentity.h
index 6dc0393810..edb838cf17 100644
--- a/src/util/viridentity.h
+++ b/src/util/viridentity.h
@@ -71,3 +71,11 @@ int virIdentitySetX509DName(virIdentityPtr ident,
                             const char *dname);
 int virIdentitySetSELinuxContext(virIdentityPtr ident,
                                  const char *context);
+
+int virIdentitySetParameters(virIdentityPtr ident,
+                             virTypedParameterPtr params,
+                             int nparams);
+
+int virIdentityGetParameters(virIdentityPtr ident,
+                             virTypedParameterPtr *params,
+                             int *nparams);
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Wed May  8 00:05:16 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=1564420461; cv=none;
	d=zoho.com; s=zohoarc;
	b=nDfxwYwZwuRsmLQReTTpotsmDNUiGFlvVmdIEF0VyW88dLS5ac2dXfTk4/+Zz76WpXBCPnm5j2/CfVI/kHkj5saJqYXb4Se4K2rE2MKRm6TXT7DtO6AuNKQ4C0M8CB5nByjCwl+1VEFocGupULsO7zwWnR0t3vfUwxHUOYfdhQc=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1564420461;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=fVjLf1oyt5D/OUum3wjrnqpGZrmWNQ98iwuyIR6JWvg=;
	b=JhxD6VqdAe0eMSHCVM7KUDZbVJtu8ySJwF0JXpmYV1DrCs5vSCc2uUHBC993J2FJKU/R+lI94DIBhs99LIA4VHDA3KX6s3mp0Zo7HOBX4ILKbljrwzv+nUEbUa8sQ4epdEV+vc/EMCF3V0DGtBEQWyzchOOL/m7ZTTKj7Ef7D2I=
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 1564420461378698.9697418627504;
 Mon, 29 Jul 2019 10:14:21 -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 0D0C6308FC20;
	Mon, 29 Jul 2019 17:14: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 DA7645D6B0;
	Mon, 29 Jul 2019 17:14:19 +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 9F8D11972E;
	Mon, 29 Jul 2019 17:14:19 +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 x6THEIj9029216 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 29 Jul 2019 13:14:18 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 860D25C22B; Mon, 29 Jul 2019 17:14:18 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-112-51.ams2.redhat.com
	[10.36.112.51])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 24D515C1A1;
	Mon, 29 Jul 2019 17:13:58 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 29 Jul 2019 18:11:30 +0100
Message-Id: <20190729171130.25484-49-berrange@redhat.com>
In-Reply-To: <20190729171130.25484-1-berrange@redhat.com>
References: <20190729171130.25484-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
Cc: Andrea Bolognani <abologna@redhat.com>
Subject: [libvirt] [PATCH v3 48/48] remote: pass identity across to newly
	opened daemons
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]);
 Mon, 29 Jul 2019 17:14:20 +0000 (UTC)

When opening a connection to a second driver inside the daemon, we must
ensure the identity of the current user is passed across. This allows
the second daemon to perform access control checks against the real end
users, instead of against the libvirt daemon that's proxying across the
API calls.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
Reviewed-by: Christophe de Dinechin <dinechin@redhat.com>
---
 src/libvirt_remote.syms             |   1 +
 src/remote/remote_daemon_dispatch.c | 110 +++++++++++++++++++++++++---
 src/remote/remote_driver.c          |   1 +
 src/remote/remote_protocol.x        |  18 ++++-
 src/remote_protocol-structs         |   8 ++
 src/rpc/virnetserverclient.c        |  12 +++
 src/rpc/virnetserverclient.h        |   2 +
 7 files changed, 140 insertions(+), 12 deletions(-)

diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms
index 3307d74324..0493467f46 100644
--- a/src/libvirt_remote.syms
+++ b/src/libvirt_remote.syms
@@ -178,6 +178,7 @@ virNetServerClientSetAuthLocked;
 virNetServerClientSetAuthPendingLocked;
 virNetServerClientSetCloseHook;
 virNetServerClientSetDispatcher;
+virNetServerClientSetIdentity;
 virNetServerClientSetQuietEOF;
 virNetServerClientSetReadonly;
 virNetServerClientStartKeepAlive;
diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon=
_dispatch.c
index 9ef76daa55..f828b75f3b 100644
--- a/src/remote/remote_daemon_dispatch.c
+++ b/src/remote/remote_daemon_dispatch.c
@@ -51,6 +51,7 @@
 #include "virpolkit.h"
 #include "virthreadjob.h"
 #include "configmake.h"
+#include "access/viraccessapicheck.h"
=20
 #define VIR_FROM_THIS VIR_FROM_RPC
=20
@@ -1945,10 +1946,15 @@ static void remoteClientCloseFunc(virNetServerClien=
tPtr client)
 static int
 remoteOpenConn(const char *uri,
                bool readonly,
+               bool preserveIdentity,
                virConnectPtr *conn)
 {
-    VIR_DEBUG("Getting secondary uri=3D%s readonly=3D%d conn=3D%p",
-              NULLSTR(uri), readonly, conn);
+    virTypedParameterPtr params =3D NULL;
+    int nparams =3D 0;
+
+    VIR_DEBUG("Getting secondary uri=3D%s readonly=3D%d preserveIdent=3D%d=
 conn=3D%p",
+              NULLSTR(uri), readonly, preserveIdentity, conn);
+
     if (*conn)
         return 0;
=20
@@ -1957,15 +1963,42 @@ remoteOpenConn(const char *uri,
         return -1;
     }
=20
+    if (preserveIdentity) {
+        VIR_AUTOUNREF(virIdentityPtr) ident =3D NULL;
+
+        if (!(ident =3D virIdentityGetCurrent()))
+            return -1;
+
+        if (virIdentityGetParameters(ident, &params, &nparams) < 0)
+            goto error;
+    }
+
     VIR_DEBUG("Opening driver %s", uri);
     if (readonly)
         *conn =3D virConnectOpenReadOnly(uri);
     else
         *conn =3D virConnectOpen(uri);
     if (!*conn)
-        return -1;
+        goto error;
     VIR_DEBUG("Opened driver %p", *conn);
+
+    if (preserveIdentity) {
+        if (virConnectSetIdentity(*conn, params, nparams, 0) < 0)
+            goto error;
+
+        virTypedParamsFree(params, nparams);
+        VIR_DEBUG("Forwarded current identity to secondary driver");
+    }
+
     return 0;
+
+ error:
+    virTypedParamsFree(params, nparams);
+    if (*conn) {
+        virConnectClose(*conn);
+        *conn =3D NULL;
+    }
+    return -1;
 }
=20
=20
@@ -1992,6 +2025,7 @@ remoteGetInterfaceConn(virNetServerClientPtr client)
=20
     if (remoteOpenConn(priv->interfaceURI,
                        priv->readonly,
+                       true,
                        &priv->interfaceConn) < 0)
         return NULL;
=20
@@ -2007,6 +2041,7 @@ remoteGetNetworkConn(virNetServerClientPtr client)
=20
     if (remoteOpenConn(priv->networkURI,
                        priv->readonly,
+                       true,
                        &priv->networkConn) < 0)
         return NULL;
=20
@@ -2022,6 +2057,7 @@ remoteGetNodeDevConn(virNetServerClientPtr client)
=20
     if (remoteOpenConn(priv->nodedevURI,
                        priv->readonly,
+                       true,
                        &priv->nodedevConn) < 0)
         return NULL;
=20
@@ -2037,6 +2073,7 @@ remoteGetNWFilterConn(virNetServerClientPtr client)
=20
     if (remoteOpenConn(priv->nwfilterURI,
                        priv->readonly,
+                       true,
                        &priv->nwfilterConn) < 0)
         return NULL;
=20
@@ -2052,6 +2089,7 @@ remoteGetSecretConn(virNetServerClientPtr client)
=20
     if (remoteOpenConn(priv->secretURI,
                        priv->readonly,
+                       true,
                        &priv->secretConn) < 0)
         return NULL;
=20
@@ -2067,6 +2105,7 @@ remoteGetStorageConn(virNetServerClientPtr client)
=20
     if (remoteOpenConn(priv->storageURI,
                        priv->readonly,
+                       true,
                        &priv->storageConn) < 0)
         return NULL;
=20
@@ -2235,6 +2274,7 @@ remoteDispatchConnectOpen(virNetServerPtr server ATTR=
IBUTE_UNUSED,
 #ifndef LIBVIRTD
     const char *type =3D NULL;
 #endif
+    bool preserveIdentity =3D false;
=20
     VIR_DEBUG("priv=3D%p conn=3D%p", priv, priv->conn);
     virMutexLock(&priv->lock);
@@ -2264,14 +2304,16 @@ remoteDispatchConnectOpen(virNetServerPtr server AT=
TRIBUTE_UNUSED,
     }
 #endif
=20
+#ifdef VIRTPROXYD
+    preserveIdentity =3D true;
+#endif /* VIRTPROXYD */
+
     VIR_DEBUG("Opening driver %s", name);
-    if (priv->readonly) {
-        if (!(priv->conn =3D virConnectOpenReadOnly(name)))
-            goto cleanup;
-    } else {
-        if (!(priv->conn =3D virConnectOpen(name)))
-            goto cleanup;
-    }
+    if (remoteOpenConn(name,
+                       priv->readonly,
+                       preserveIdentity,
+                       &priv->conn) < 0)
+        goto cleanup;
     VIR_DEBUG("Opened %p", priv->conn);
=20
 #ifndef LIBVIRTD
@@ -2375,6 +2417,54 @@ remoteDispatchConnectClose(virNetServerPtr server AT=
TRIBUTE_UNUSED,
 }
=20
=20
+static int
+remoteDispatchConnectSetIdentity(virNetServerPtr server ATTRIBUTE_UNUSED,
+                                 virNetServerClientPtr client,
+                                 virNetMessagePtr msg ATTRIBUTE_UNUSED,
+                                 virNetMessageErrorPtr rerr ATTRIBUTE_UNUS=
ED,
+                                 remote_connect_set_identity_args *args)
+{
+    virTypedParameterPtr params =3D NULL;
+    int nparams =3D 0;
+    int rv =3D -1;
+    virConnectPtr conn =3D remoteGetHypervisorConn(client);
+    virIdentityPtr ident =3D NULL;
+    if (!conn)
+        goto cleanup;
+
+    VIR_DEBUG("Received forwarded identity");
+    if (virTypedParamsDeserialize((virTypedParameterRemotePtr) args->param=
s.params_val,
+                                  args->params.params_len,
+                                  REMOTE_CONNECT_IDENTITY_PARAMS_MAX,
+                                  &params,
+                                  &nparams) < 0)
+        goto cleanup;
+
+    VIR_TYPED_PARAMS_DEBUG(params, nparams);
+
+    if (virConnectSetIdentityEnsureACL(conn) < 0)
+        goto cleanup;
+
+    if (!(ident =3D virIdentityNew()))
+        goto cleanup;
+
+    if (virIdentitySetParameters(ident, params, nparams) < 0)
+        goto cleanup;
+
+    virNetServerClientSetIdentity(client, ident);
+
+    rv =3D 0;
+
+ cleanup:
+    virTypedParamsFree(params, nparams);
+    virObjectUnref(ident);
+    if (rv < 0)
+        virNetMessageSaveError(rerr);
+    return rv;
+}
+
+
+
 static int
 remoteDispatchDomainGetSchedulerType(virNetServerPtr server ATTRIBUTE_UNUS=
ED,
                                      virNetServerClientPtr client,
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 889d62ba4f..e2d2dc66be 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -8510,6 +8510,7 @@ static virHypervisorDriver hypervisor_driver =3D {
     .name =3D "remote",
     .connectOpen =3D remoteConnectOpen, /* 0.3.0 */
     .connectClose =3D remoteConnectClose, /* 0.3.0 */
+    .connectSetIdentity =3D remoteConnectSetIdentity, /* 5.6.0 */
     .connectSupportsFeature =3D remoteConnectSupportsFeature, /* 0.3.0 */
     .connectGetType =3D remoteConnectGetType, /* 0.3.0 */
     .connectGetVersion =3D remoteConnectGetVersion, /* 0.3.0 */
diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index 2f91bd1921..42e61ba20f 100644
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -53,6 +53,9 @@ typedef string remote_nonnull_string<REMOTE_STRING_MAX>;
 /* A long string, which may be NULL. */
 typedef remote_nonnull_string *remote_string;
=20
+/* Upper limit on identity parameters */
+const REMOTE_CONNECT_IDENTITY_PARAMS_MAX =3D 20;
+
 /* Upper limit on lists of domains. */
 const REMOTE_DOMAIN_LIST_MAX =3D 16384;
=20
@@ -3723,6 +3726,11 @@ struct remote_domain_checkpoint_delete_args {
     unsigned int flags;
 };
=20
+struct remote_connect_set_identity_args {
+    remote_typed_param params<REMOTE_DOMAIN_BLOCK_IO_TUNE_PARAMETERS_MAX>;
+    unsigned int flags;
+};
+
 /*----- Protocol. -----*/
=20
 /* Define the program number, protocol version and procedure numbers here.=
 */
@@ -6538,7 +6546,7 @@ enum remote_procedure {
      */
     REMOTE_PROC_NETWORK_PORT_DELETE =3D 410,
=20
-   /**
+    /**
      * @generate: both
      * @acl: domain:checkpoint
      * @acl: domain:fs_freeze:VIR_DOMAIN_CHECKPOINT_CREATE_QUIESCE
@@ -6584,5 +6592,11 @@ enum remote_procedure {
      * @generate: both
      * @acl: domain:checkpoint
      */
-    REMOTE_PROC_DOMAIN_CHECKPOINT_DELETE =3D 417
+    REMOTE_PROC_DOMAIN_CHECKPOINT_DELETE =3D 417,
+
+    /**
+     * @generate: client
+     * @acl: connect:write
+     */
+    REMOTE_PROC_CONNECT_SET_IDENTITY =3D 418
 };
diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index a42b4a9671..05229f00c5 100644
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -3105,6 +3105,13 @@ struct remote_domain_checkpoint_delete_args {
         remote_nonnull_domain_checkpoint checkpoint;
         u_int                      flags;
 };
+struct remote_connect_set_identity_args {
+        struct {
+                u_int              params_len;
+                remote_typed_param * params_val;
+        } params;
+        u_int                      flags;
+};
 enum remote_procedure {
         REMOTE_PROC_CONNECT_OPEN =3D 1,
         REMOTE_PROC_CONNECT_CLOSE =3D 2,
@@ -3523,4 +3530,5 @@ enum remote_procedure {
         REMOTE_PROC_DOMAIN_CHECKPOINT_LOOKUP_BY_NAME =3D 415,
         REMOTE_PROC_DOMAIN_CHECKPOINT_GET_PARENT =3D 416,
         REMOTE_PROC_DOMAIN_CHECKPOINT_DELETE =3D 417,
+        REMOTE_PROC_CONNECT_SET_IDENTITY =3D 418,
 };
diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index 1f020a5a04..2a278171f5 100644
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -844,6 +844,18 @@ virIdentityPtr virNetServerClientGetIdentity(virNetSer=
verClientPtr client)
 }
=20
=20
+void virNetServerClientSetIdentity(virNetServerClientPtr client,
+                                   virIdentityPtr identity)
+{
+    virObjectLock(client);
+    virObjectUnref(client->identity);
+    client->identity =3D identity;
+    if (client->identity)
+        virObjectRef(client->identity);
+    virObjectUnlock(client);
+}
+
+
 int virNetServerClientGetSELinuxContext(virNetServerClientPtr client,
                                         char **context)
 {
diff --git a/src/rpc/virnetserverclient.h b/src/rpc/virnetserverclient.h
index 1b01bedbcb..1c520fef6b 100644
--- a/src/rpc/virnetserverclient.h
+++ b/src/rpc/virnetserverclient.h
@@ -123,6 +123,8 @@ int virNetServerClientGetSELinuxContext(virNetServerCli=
entPtr client,
                                         char **context);
=20
 virIdentityPtr virNetServerClientGetIdentity(virNetServerClientPtr client);
+void virNetServerClientSetIdentity(virNetServerClientPtr client,
+                                   virIdentityPtr identity);
=20
 void *virNetServerClientGetPrivateData(virNetServerClientPtr client);
=20
--=20
2.21.0

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