[libvirt] [PATCH] remote: remove unused constant for libvirtd config file

Daniel P. Berrangé posted 1 patch 4 years, 9 months ago
Test syntax-check passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20190703173559.16610-1-berrange@redhat.com
src/remote/remote_driver.h | 1 -
1 file changed, 1 deletion(-)
[libvirt] [PATCH] remote: remove unused constant for libvirtd config file
Posted by Daniel P. Berrangé 4 years, 9 months ago
The LIBVIRTD_CONFIGURATION_FILE constant was introduced in

  commit b7c42619e69acd8416be88b8aa3b4161bc813f8a
  Author: Richard W.M. Jones <rjones@redhat.com>
  Date:   Mon Jun 11 11:43:41 2007 +0000

    Mon Jun 11 12:41:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>

and then never used !

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

Pushed under the trivial rule

 src/remote/remote_driver.h | 1 -
 1 file changed, 1 deletion(-)

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-sock-ro"
 #define LIBVIRTD_USER_UNIX_SOCKET "libvirt-sock"
-#define LIBVIRTD_CONFIGURATION_FILE SYSCONFDIR "/libvirt/libvirtd.conf"
 
 /* Defaults for PKI directory. */
 #define LIBVIRT_PKI_DIR SYSCONFDIR "/pki"
-- 
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH] remote: remove unused constant for libvirtd config file
Posted by Radostin Stoyanov 4 years, 9 months ago
$ grep -R LIBVIRTD_CONFIGURATION_FILE .
./docs/news-2013.html.in:      Fix LIBVIRTD_CONFIGURATION_FILE constant 
(Christophe Fergeau),<br/>
./src/remote/remote_daemon.c: LIBVIRTD_CONFIGURATION_FILE,

and make fails with:

   CC       xenconfig/libvirt_xenconfig_libxl_la-xen_sxpr.lo
remote/remote_daemon.c: In function 'daemonUsage':
remote/remote_daemon.c:917:17: error: 'LIBVIRTD_CONFIGURATION_FILE' 
undeclared (first use in this function)
   917 |                 LIBVIRTD_CONFIGURATION_FILE,
       |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~


On 03/07/2019 18:35, Daniel P. Berrangé wrote:
> The LIBVIRTD_CONFIGURATION_FILE constant was introduced in
>
>    commit b7c42619e69acd8416be88b8aa3b4161bc813f8a
>    Author: Richard W.M. Jones <rjones@redhat.com>
>    Date:   Mon Jun 11 11:43:41 2007 +0000
>
>      Mon Jun 11 12:41:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
>
> and then never used !
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>
> Pushed under the trivial rule
>
>   src/remote/remote_driver.h | 1 -
>   1 file changed, 1 deletion(-)
>
> 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-sock-ro"
>   #define LIBVIRTD_USER_UNIX_SOCKET "libvirt-sock"
> -#define LIBVIRTD_CONFIGURATION_FILE SYSCONFDIR "/libvirt/libvirtd.conf"
>   
>   /* Defaults for PKI directory. */
>   #define LIBVIRT_PKI_DIR SYSCONFDIR "/pki"

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH] remote: remove unused constant for libvirtd config file
Posted by Fabiano Fidêncio 4 years, 9 months ago
On Wed, Jul 3, 2019 at 9:27 PM Radostin Stoyanov <rstoyanov1@gmail.com> wrote:
>
> $ grep -R LIBVIRTD_CONFIGURATION_FILE .
> ./docs/news-2013.html.in:      Fix LIBVIRTD_CONFIGURATION_FILE constant
> (Christophe Fergeau),<br/>
> ./src/remote/remote_daemon.c: LIBVIRTD_CONFIGURATION_FILE,
>
> and make fails with:
>
>    CC       xenconfig/libvirt_xenconfig_libxl_la-xen_sxpr.lo
> remote/remote_daemon.c: In function 'daemonUsage':
> remote/remote_daemon.c:917:17: error: 'LIBVIRTD_CONFIGURATION_FILE'
> undeclared (first use in this function)
>    917 |                 LIBVIRTD_CONFIGURATION_FILE,
>        |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~
>

There's a patch for that in the list:
https://www.redhat.com/archives/libvir-list/2019-July/msg00136.html

[snip]

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