Commit ff356ee4 authored by Alberto Garcia's avatar Alberto Garcia Committed by Max Reitz
Browse files

blockdev: Fix regression with the default naming of throttling groups 



When I/O limits are set for a block device, the name of the throttling
group is taken from the BlockBackend if the user doesn't specify one.

Commit efaa7c4e moved the naming of the BlockBackend in
blockdev_init() to the end of the function, after I/O limits are set.
The consequence is that the throttling group gets an empty name.

Signed-off-by: default avatarAlberto Garcia <berto@igalia.com>
Reported-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Cc: Max Reitz <mreitz@redhat.com>
Cc: qemu-stable@nongnu.org
Message-id: af5cd58bd2c4b9f6c57f260d9cfe586b9fb7d34d.1467986342.git.berto@igalia.com
[mreitz: Use existing "id" variable instead of new "blk_id"]
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 524089bc

blockdev.c

+4 −2
Original line number Diff line number Diff line
@@ -512,6 +512,8 @@ static BlockBackend *blockdev_init(const char *file, QDict *bs_opts, 


    writethrough = !qemu_opt_get_bool(opts, BDRV_OPT_CACHE_WB, true);



    id = qemu_opts_id(opts);



    qdict_extract_subqdict(bs_opts, &interval_dict, "stats-intervals.");

    qdict_array_split(interval_dict, &interval_list);
@@ -616,7 +618,7 @@ static BlockBackend *blockdev_init(const char *file, QDict *bs_opts, 
    /* disk I/O throttling */

    if (throttle_enabled(&cfg)) {

        if (!throttling_group) {

            throttling_group = blk_name(blk);

            throttling_group = id;

        }

        blk_io_limits_enable(blk, throttling_group);

        blk_set_io_limits(blk, &cfg);
@@ -625,7 +627,7 @@ static BlockBackend *blockdev_init(const char *file, QDict *bs_opts, 
    blk_set_enable_write_cache(blk, !writethrough);

    blk_set_on_error(blk, on_read_error, on_write_error);



    if (!monitor_add_blk(blk, qemu_opts_id(opts), errp)) {

    if (!monitor_add_blk(blk, id, errp)) {

        blk_unref(blk);

        blk = NULL;

        goto err_no_bs_opts;