Commit 374c5246 authored by Markus Armbruster's avatar Markus Armbruster Committed by Kevin Wolf
Browse files

block: Fix -drive for certain non-string scalars 



The previous commit fixed -blockdev breakage due to misuse of the
qobject input visitor's keyval flavor in bdrv_file_open().  The commit
message explain why using the plain flavor would be just as wrong; it
would break -drive.  Turns out we break it in three places:
nbd_open(), sd_open() and ssh_file_open().  They are even marked
FIXME.  Example breakage:

    $ qemu-system-x86 -drive node-name=n1,driver=nbd,server.type=inet,server.host=localhost,server.port=1234,server.numeric=off
    qemu-system-x86: -drive node-name=n1,driver=nbd,server.type=inet,server.host=localhost,server.port=1234,server.numeric=off: Invalid parameter type for 'numeric', expected: boolean

Fix it the same way: replace qdict_crumple() by
qdict_crumple_for_keyval_qiv(), and switch from plain to the keyval
flavor.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent e5af0da1

block/nbd.c

+2 −10
Original line number Diff line number Diff line
@@ -273,20 +273,12 @@ static SocketAddress *nbd_config(BDRVNBDState *s, QDict *options, 
        goto done;

    }



    crumpled_addr = qdict_crumple(addr, errp);

    crumpled_addr = qdict_crumple_for_keyval_qiv(addr, errp);

    if (!crumpled_addr) {

        goto done;

    }



    /*

     * FIXME .numeric, .to, .ipv4 or .ipv6 don't work with -drive

     * server.type=inet.  .to doesn't matter, it's ignored anyway.

     * That's because when @options come from -blockdev or

     * blockdev_add, members are typed according to the QAPI schema,

     * but when they come from -drive, they're all QString.  The

     * visitor expects the former.

     */

    iv = qobject_input_visitor_new(crumpled_addr);

    iv = qobject_input_visitor_new_keyval(crumpled_addr);

    visit_type_SocketAddress(iv, NULL, &saddr, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

block/sheepdog.c

+2 −10
Original line number Diff line number Diff line
@@ -546,20 +546,12 @@ static SocketAddress *sd_server_config(QDict *options, Error **errp) 


    qdict_extract_subqdict(options, &server, "server.");



    crumpled_server = qdict_crumple(server, errp);

    crumpled_server = qdict_crumple_for_keyval_qiv(server, errp);

    if (!crumpled_server) {

        goto done;

    }



    /*

     * FIXME .numeric, .to, .ipv4 or .ipv6 don't work with -drive

     * server.type=inet.  .to doesn't matter, it's ignored anyway.

     * That's because when @options come from -blockdev or

     * blockdev_add, members are typed according to the QAPI schema,

     * but when they come from -drive, they're all QString.  The

     * visitor expects the former.

     */

    iv = qobject_input_visitor_new(crumpled_server);

    iv = qobject_input_visitor_new_keyval(crumpled_server);

    visit_type_SocketAddress(iv, NULL, &saddr, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

block/ssh.c

+2 −10
Original line number Diff line number Diff line
@@ -623,20 +623,12 @@ static BlockdevOptionsSsh *ssh_parse_options(QDict *options, Error **errp) 
    }



    /* Create the QAPI object */

    crumpled = qdict_crumple(options, errp);

    crumpled = qdict_crumple_for_keyval_qiv(options, errp);

    if (crumpled == NULL) {

        goto fail;

    }



    /*

     * FIXME .numeric, .to, .ipv4 or .ipv6 don't work with -drive.

     * .to doesn't matter, it's ignored anyway.

     * That's because when @options come from -blockdev or

     * blockdev_add, members are typed according to the QAPI schema,

     * but when they come from -drive, they're all QString.  The

     * visitor expects the former.

     */

    v = qobject_input_visitor_new(crumpled);

    v = qobject_input_visitor_new_keyval(crumpled);

    visit_type_BlockdevOptionsSsh(v, NULL, &result, &local_err);

    visit_free(v);

    qobject_unref(crumpled);