On 01/21/2011 02:23 PM, Cole Robinson wrote:
>> Here's the diff:
>>
>> diff --git a/daemon/test_libvirtd.aug b/daemon/test_libvirtd.aug
>> index 5f8b644..31fa643 100644
>> --- a/daemon/test_libvirtd.aug
>> +++ b/daemon/test_libvirtd.aug
>> @@ -271,6 +271,9 @@ log_filters=\"a\"
>>
>> # Auditing:
>> audit_level = 2
>> +
>> +# VNC socket
>> +vnc_auto_unix_socket = 1
>> "
Problem. This diff is to the libvirtd.conf file,
>> +++ b/src/qemu/qemu.conf
>> @@ -16,7 +16,8 @@
>> # host machine, though most VNC clients do not support it.
>> #
>> # This will only be enabled for VNC configurations that do not have
>> -# a hardcoded 'listen' or 'socket' value.
>> +# a hardcoded 'listen' or 'socket' value. This setting takes preference
>> +# over vnc_listen.
>> #
>> # vnc_auto_unix_socket = 1
but the option belongs to the qemu.conf file.
I noticed this because a 'make check' run was noisy; but it still
succeeded, so something's wrong with our make rule:
> make[3]: Entering directory `/home/remote/eblake/libvirt/daemon'
> test -x '/usr/bin/augparse' \
> && '/usr/bin/augparse' -I . ./test_libvirtd.aug || :
> ./test_libvirtd.aug:279.3-557.40:exception thrown in test
> ./test_libvirtd.aug:279.8-.29:exception: Iterated lens matched less than it should
> Lens: ./libvirtd.aug:81.13-.43:
> Error encountered at 275:0 (8070 characters into string)
> <dit_level = 2\n\n# VNC socket\n|=|vnc_auto_unix_socket = 1\n>
>
> Tree generated so far:
> /#comment[1] = "Master libvirt daemon configuration file"
...
> /#comment[188] = "VNC socket"
>
>
> Syntax error in lens definition
> Failed to load ./test_libvirtd.aug
> make[3]: Leaving directory `/home/remote/eblake/libvirt/daemon'
I believe we need a followup patch which moves the augeas portions into
the correct src/qemu/{test_,}libvirtd_qemu.aug.
Meanwhile, it would be nice to have 'make check' fail on errors like this.
--
Eric Blake eblake@xxxxxxxxxx +1-801-349-2682
Libvirt virtualization library http://libvirt.org
Attachment:
signature.asc
Description: OpenPGP digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list