Commit 9dae635a authored by Kevin Wolf's avatar Kevin Wolf Committed by Jeff Cody
Browse files

gluster: Fix blockdev-add with server.N.type=unix 

The legacy command line interface gets the socket path from an option
called 'socket'. QAPI in contract uses SocketAddress, where the
corresponding option is called 'path'.

Fix the gluster block driver to accept both 'socket' and 'path', with
'path' being the preferred syntax.

https://bugzilla.redhat.com/show_bug.cgi?id=1545155



Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Message-id: 20180403110810.25624-1-kwolf@redhat.com
Signed-off-by: default avatarJeff Cody <jcody@redhat.com>
parent 604343ce

block/gluster.c

+17 −4
Original line number Diff line number Diff line
@@ -167,7 +167,12 @@ static QemuOptsList runtime_unix_opts = { 
        {

            .name = GLUSTER_OPT_SOCKET,

            .type = QEMU_OPT_STRING,

            .help = "socket file path)",

            .help = "socket file path (legacy)",

        },

        {

            .name = GLUSTER_OPT_PATH,

            .type = QEMU_OPT_STRING,

            .help = "socket file path (QAPI)",

        },

        { /* end of list */ }

    },
@@ -615,10 +620,18 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, 
                goto out;

            }



            ptr = qemu_opt_get(opts, GLUSTER_OPT_PATH);

            if (!ptr) {

                ptr = qemu_opt_get(opts, GLUSTER_OPT_SOCKET);

            } else if (qemu_opt_get(opts, GLUSTER_OPT_SOCKET)) {

                error_setg(&local_err,

                           "Conflicting parameters 'path' and 'socket'");

                error_append_hint(&local_err, GERR_INDEX_HINT, i);

                goto out;

            }

            if (!ptr) {

                error_setg(&local_err, QERR_MISSING_PARAMETER,

                           GLUSTER_OPT_SOCKET);

                           GLUSTER_OPT_PATH);

                error_append_hint(&local_err, GERR_INDEX_HINT, i);

                goto out;

            }
@@ -684,7 +697,7 @@ static int qemu_gluster_parse(BlockdevOptionsGluster *gconf, 
                             "file.server.0.host=1.2.3.4,"

                             "file.server.0.port=24007,"

                             "file.server.1.transport=unix,"

                             "file.server.1.socket=/var/run/glusterd.socket ..."

                             "file.server.1.path=/var/run/glusterd.socket ..."

                             "\n");

            return ret;

        }