On Mon, Feb 12, 2018 at 04:20:58PM +0100, Peter Krempa wrote:
> The documentation for the JSON/qapi type 'UnixSocketAddress' states that
> the unix socket path field is named 'path'. We used 'socket' by
> mistake. Fix both the formatter and parser and test suite.
>
> Resolves:
https://bugzilla.redhat.com/show_bug.cgi?id=1544325
>
> Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
> ---
> src/qemu/qemu_block.c | 2 +-
> src/util/virstoragefile.c | 2 +-
> tests/virstoragetest.c | 4 ++--
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
ACK with this squashed in:
--- a/tests/qemuxml2argvdata/disk-drive-network-gluster.args
+++ b/tests/qemuxml2argvdata/disk-drive-network-gluster.args
@@ -30,7 +30,7 @@ id=virtio-disk1 \
-drive file.driver=gluster,file.volume=Volume3,file.path=Image.qcow2,\
file.server.0.type=tcp,file.server.0.host=example.org,file.server.0.port=6000,\
file.server.1.type=tcp,file.server.1.host=example.org,file.server.1.port=24007,\
-file.server.2.type=unix,file.server.2.socket=/path/to/sock,file.debug=4,\
+file.server.2.type=unix,file.server.2.path=/path/to/sock,file.debug=4,\
format=qcow2,if=none,id=drive-virtio-disk2 \
-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk2,\
id=virtio-disk2
This prompted me to have another look down the qemu rabbit hole on why
we actually formatted this as 'socket' since the archeology expedition
into qapi didn't ever show usage of 'socket'.
It seems that gluster _only_ accepts 'socket' rather than 'path'
contrary to the documented type.
I'll post a V2 and complain loudly at qemu.