Re: [libvirt] [PATCH] Don't exist if the libvirtd config does not exist

2011-07-08 Thread Eric Blake 
On 07/08/2011 10:07 AM, Eric Blake wrote:
> On 07/08/2011 08:28 AM, Daniel P. Berrange wrote:
>> From: "Daniel P. Berrange" 
>>
>> It is common for the $HOME/.libvirt/libvirtd.conf file to not
>> exist. Treat this situation as non-fatal since we can carry
>> on with our default settings just fine.
>>

>>  
>> +if (access(filename, R_OK) == -1 &&
>> +errno == ENOENT)
>> +return 0;
>> +
> 
> This patch breaks 'make check' - tests/libvirtd-fail is now reporting
> failure.

That test is checking that an explicit libvirtd --config=no-such-conf
reports failure.

I think the solution to this is to also pass around a bool stating
whether the conf file name was generated by default (ENOENT is okay) or
explicitly passed in (ENOENT must fail).

-- 
Eric Blake   ebl...@redhat.com+1-801-349-2682
Libvirt virtualization library http://libvirt.org



signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] Don't exist if the libvirtd config does not exist

2011-07-08 Thread Eric Blake 
On 07/08/2011 08:28 AM, Daniel P. Berrange wrote:
> From: "Daniel P. Berrange" 
> 
> It is common for the $HOME/.libvirt/libvirtd.conf file to not
> exist. Treat this situation as non-fatal since we can carry
> on with our default settings just fine.
> 
> * daemon/libvirtd.c: Treat ENOENT as non-fatal when loading
>   config
> ---
>  daemon/libvirtd.c |4 
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
> index 06d2077..fe0fa27 100644
> --- a/daemon/libvirtd.c
> +++ b/daemon/libvirtd.c
> @@ -1028,6 +1028,10 @@ daemonConfigLoad(struct daemonConfig *data,
>  {
>  virConfPtr conf;
>  
> +if (access(filename, R_OK) == -1 &&
> +errno == ENOENT)
> +return 0;
> +

This patch breaks 'make check' - tests/libvirtd-fail is now reporting
failure.

-- 
Eric Blake   ebl...@redhat.com+1-801-349-2682
Libvirt virtualization library http://libvirt.org



signature.asc
Description: OpenPGP digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] Don't exist if the libvirtd config does not exist

2011-07-08 Thread Matthias Bolte 
2011/7/8 Daniel P. Berrange :
> From: "Daniel P. Berrange" 
>
> It is common for the $HOME/.libvirt/libvirtd.conf file to not
> exist. Treat this situation as non-fatal since we can carry
> on with our default settings just fine.
>
> * daemon/libvirtd.c: Treat ENOENT as non-fatal when loading
>  config
> ---
>  daemon/libvirtd.c |    4 
>  1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
> index 06d2077..fe0fa27 100644
> --- a/daemon/libvirtd.c
> +++ b/daemon/libvirtd.c
> @@ -1028,6 +1028,10 @@ daemonConfigLoad(struct daemonConfig *data,
>  {
>     virConfPtr conf;
>
> +    if (access(filename, R_OK) == -1 &&
> +        errno == ENOENT)
> +        return 0;
> +
>     conf = virConfReadFile (filename, 0);
>     if (!conf)
>         return -1;

s/Don't exist/Don't exit/ typo in subject.

ACK, qemu:///session is working again.

-- 
Matthias Bolte
http://photron.blogspot.com

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

[libvirt] [PATCH] Don't exist if the libvirtd config does not exist

2011-07-08 Thread Daniel P. Berrange 
From: "Daniel P. Berrange" 

It is common for the $HOME/.libvirt/libvirtd.conf file to not
exist. Treat this situation as non-fatal since we can carry
on with our default settings just fine.

* daemon/libvirtd.c: Treat ENOENT as non-fatal when loading
  config
---
 daemon/libvirtd.c |4 
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 06d2077..fe0fa27 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -1028,6 +1028,10 @@ daemonConfigLoad(struct daemonConfig *data,
 {
 virConfPtr conf;
 
+if (access(filename, R_OK) == -1 &&
+errno == ENOENT)
+return 0;
+
 conf = virConfReadFile (filename, 0);
 if (!conf)
 return -1;
-- 
1.7.6

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