[libvirt] [PATCH 0/2] vstorage: fix configure script and tests

Apparently this was not tested prior to being pushed. Fix a configure problem and the test output file. Pushed under the trivial (1/2) and build-breaker (2/2) rules. Peter Krempa (2): configure: Fix copy-paste error in vstorage backend check tests: storage: Fix storage xml2xml test for vstorage pool m4/virt-storage-vstorage.m4 | 2 +- tests/storagepoolxml2xmlout/pool-vstorage.xml | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) -- 2.11.0

The 'fs' backend m4 code was copied, but one of the condition were not changed which resulted into: configure: Gluster: yes configure: ZFS: yes configure: Virtuozzo storage: check Make the code turn on the virtuozzo driver automatically if the tools are found. --- m4/virt-storage-vstorage.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/virt-storage-vstorage.m4 b/m4/virt-storage-vstorage.m4 index 8a926c80f..e3b3bb40f 100644 --- a/m4/virt-storage-vstorage.m4 +++ b/m4/virt-storage-vstorage.m4 @@ -49,7 +49,7 @@ AC_DEFUN([LIBVIRT_STORAGE_CHECK_VSTORAGE], [ with_storage_vstorage=no fi - if test "$with_storage_fs" = "check" ; then + if test "$with_storage_vstorage" = "check" ; then with_storage_vstorage=yes fi fi -- 2.11.0

On 27/01/17 12:45, Peter Krempa wrote:
The 'fs' backend m4 code was copied, but one of the condition were not changed which resulted into:
configure: Gluster: yes configure: ZFS: yes configure: Virtuozzo storage: check
Make the code turn on the virtuozzo driver automatically if the tools are found. --- m4/virt-storage-vstorage.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/m4/virt-storage-vstorage.m4 b/m4/virt-storage-vstorage.m4 index 8a926c80f..e3b3bb40f 100644 --- a/m4/virt-storage-vstorage.m4 +++ b/m4/virt-storage-vstorage.m4 @@ -49,7 +49,7 @@ AC_DEFUN([LIBVIRT_STORAGE_CHECK_VSTORAGE], [ with_storage_vstorage=no fi
- if test "$with_storage_fs" = "check" ; then + if test "$with_storage_vstorage" = "check" ; then with_storage_vstorage=yes fi fi
ACK -- Best regards, Olga

The input and output were the same, but the output file did not correspond to what libvirt would output. --- tests/storagepoolxml2xmlout/pool-vstorage.xml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tests/storagepoolxml2xmlout/pool-vstorage.xml b/tests/storagepoolxml2xmlout/pool-vstorage.xml index 8b2aecb64..11280198f 100644 --- a/tests/storagepoolxml2xmlout/pool-vstorage.xml +++ b/tests/storagepoolxml2xmlout/pool-vstorage.xml @@ -5,14 +5,9 @@ <allocation unit='bytes'>0</allocation> <available unit='bytes'>0</available> <source> - <name>vstorage-cluster</name> + <name>vzstorage-cluster</name> </source> <target> - <path>/mnt/vstorage-cluster</path> - <permissions> - <mode>0755</mode> - <owner>-1</owner> - <group>-1</group> - </permissions> + <path>/mnt/vstorage_cluster</path> </target> </pool> -- 2.11.0

On 27/01/17 12:45, Peter Krempa wrote:
The input and output were the same, but the output file did not correspond to what libvirt would output. --- tests/storagepoolxml2xmlout/pool-vstorage.xml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/tests/storagepoolxml2xmlout/pool-vstorage.xml b/tests/storagepoolxml2xmlout/pool-vstorage.xml index 8b2aecb64..11280198f 100644 --- a/tests/storagepoolxml2xmlout/pool-vstorage.xml +++ b/tests/storagepoolxml2xmlout/pool-vstorage.xml @@ -5,14 +5,9 @@ <allocation unit='bytes'>0</allocation> <available unit='bytes'>0</available> <source> - <name>vstorage-cluster</name> + <name>vzstorage-cluster</name> </source> <target> - <path>/mnt/vstorage-cluster</path> - <permissions> - <mode>0755</mode> - <owner>-1</owner> - <group>-1</group> - </permissions> + <path>/mnt/vstorage_cluster</path> </target> </pool>
ACK -- Best regards, Olga
participants (2)
-
Olga Krishtal
-
Peter Krempa