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

Peter Krempa 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/03dc63ab2abaad20d69843fd19fddb8dce327a68.1562225130.git.pkrempa@redhat.com
src/remote/remote_driver.h | 1 +
1 file changed, 1 insertion(+)
[libvirt] [PATCH] Revert "remote: remove unused constant for libvirtd config file"
Posted by Peter Krempa 4 years, 9 months ago
The constant is not unused and breaks the build of the remote driver.

This reverts commit 86fbce56f27e06b34d63879c9f634a58a1e0a04a.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---

Pushed under the build-breaker rule.

 src/remote/remote_driver.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/remote/remote_driver.h b/src/remote/remote_driver.h
index 132e478ef3..8c7da6b000 100644
--- a/src/remote/remote_driver.h
+++ b/src/remote/remote_driver.h
@@ -34,6 +34,7 @@ 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] Revert "remote: remove unused constant for libvirtd config file"
Posted by Daniel P. Berrangé 4 years, 9 months ago
On Thu, Jul 04, 2019 at 09:26:26AM +0200, Peter Krempa wrote:
> The constant is not unused and breaks the build of the remote driver.
> 
> This reverts commit 86fbce56f27e06b34d63879c9f634a58a1e0a04a.
> 
> Signed-off-by: Peter Krempa <pkrempa@redhat.com>
> ---
> 
> Pushed under the build-breaker rule.
> 
>  src/remote/remote_driver.h | 1 +
>  1 file changed, 1 insertion(+)

Sigh, I'm stupid. I was looking at my pending branch rather than
master.

> 
> diff --git a/src/remote/remote_driver.h b/src/remote/remote_driver.h
> index 132e478ef3..8c7da6b000 100644
> --- a/src/remote/remote_driver.h
> +++ b/src/remote/remote_driver.h
> @@ -34,6 +34,7 @@ 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

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

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