Commit 625eaca9 authored by Laurent Vivier's avatar Laurent Vivier Committed by Eric Blake
Browse files

qdict: remove useless cast 



Re-run Coccinelle script scripts/coccinelle/qobject.cocci

Signed-off-by: default avatarLaurent Vivier <lvivier@redhat.com>
Message-Id: <20180323143202.28879-5-lvivier@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Acked-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Acked-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent 710c2634

block/nvme.c

+5 −6
Original line number Diff line number Diff line
@@ -695,12 +695,11 @@ static void nvme_parse_filename(const char *filename, QDict *options, 
        unsigned long ns;

        const char *slash = strchr(tmp, '/');

        if (!slash) {

            qdict_put(options, NVME_BLOCK_OPT_DEVICE,

                      qstring_from_str(tmp));

            qdict_put_str(options, NVME_BLOCK_OPT_DEVICE, tmp);

            return;

        }

        device = g_strndup(tmp, slash - tmp);

        qdict_put(options, NVME_BLOCK_OPT_DEVICE, qstring_from_str(device));

        qdict_put_str(options, NVME_BLOCK_OPT_DEVICE, device);

        g_free(device);

        namespace = slash + 1;

        if (*namespace && qemu_strtoul(namespace, NULL, 10, &ns)) {
@@ -708,8 +707,8 @@ static void nvme_parse_filename(const char *filename, QDict *options, 
                       namespace);

            return;

        }

        qdict_put(options, NVME_BLOCK_OPT_NAMESPACE,

                  qstring_from_str(*namespace ? namespace : "1"));

        qdict_put_str(options, NVME_BLOCK_OPT_NAMESPACE,

                      *namespace ? namespace : "1");

    }

}
@@ -1082,7 +1081,7 @@ static void nvme_refresh_filename(BlockDriverState *bs, QDict *opts) 
                 bs->drv->format_name);

    }



    qdict_put(opts, "driver", qstring_from_str(bs->drv->format_name));

    qdict_put_str(opts, "driver", bs->drv->format_name);

    bs->full_open_options = opts;

}

monitor.c

+1 −1
Original line number Diff line number Diff line
@@ -4315,7 +4315,7 @@ static QObject *get_qmp_greeting(Monitor *mon) 
            /* Monitors that are not using IOThread won't support OOB */

            continue;

        }

        qlist_append(cap_list, qstring_from_str(QMPCapability_str(cap)));

        qlist_append_str(cap_list, QMPCapability_str(cap));

    }



    return qobject_from_jsonf("{'QMP': {'version': %p, 'capabilities': %p}}",