[libvirt] [PATCH v7 06.5/11] merge with previous...

[John Ferlan]

This patch would be merged with the existing 06/11 patch for the
following changes:

   1. Use qemuBlockStorageSourceBuildJSONSocketAddress to build a single
      server address
   2. Alter the output file to remove the server index "0." values
   3. Alter the commit message appropriately as well.

NB: If it's really desired I could resend the series, but I do ask that
someone else officially ACK's patch 1 since it's so large. I believe it
has to be moderated in... Although I could take Ashish's 1-6 testing as
as "good enough".

Thanks -

John

---
 src/qemu/qemu_block.c                                            | 2 +-
 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index a1867aa8f..ca6e213b4 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -529,7 +529,7 @@ qemuBlockStorageSourceGetVxHSProps(virStorageSourcePtr src)
         return NULL;
     }
 
-    if (!(server = qemuBlockStorageSourceBuildHostsJSONSocketAddress(src, true)))
+    if (!(server = qemuBlockStorageSourceBuildJSONSocketAddress(src->hosts, true)))
         return NULL;
 
     /* VxHS disk specification example:
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args
index 86da1af47..b62ace3de 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args
@@ -21,7 +21,7 @@ server,nowait \
 -boot c \
 -usb \
 -drive file.driver=vxhs,file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,\
-file.server.0.type=tcp,file.server.0.host=192.168.0.1,file.server.0.port=9999,\
+file.server.type=tcp,file.server.host=192.168.0.1,file.server.port=9999,\
 format=raw,if=none,id=drive-virtio-disk0,cache=none \
 -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
 id=virtio-disk0
-- 
2.13.5