Commit c5f3014b authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block: Add bdrv_runtime_opts to query-command-line-options 



Recently we moved a few options from QemuOptsLists in blockdev.c to
bdrv_runtime_opts in block.c in order to make them accissble using
blockdev-add. However, this has the side effect that these options are
missing from query-command-line-options now, and libvirt consequently
disables the corresponding feature.

This problem was reported as a regression for the 'discard' option,
introduced in commit 818584a4. However, it is more general than that.

Fix it by adding bdrv_runtime_opts to the list of QemuOptsLists that are
returned in query-command-line-options. For the future, libvirt is
advised to use QMP schema introspection for block device options.

Reported-by: default avatarMichal Privoznik <mprivozn@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Tested-by: default avatarMichal Privoznik <mprivozn@redhat.com>
Tested-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent fffb6e12

block.c

+1 −1
Original line number Diff line number Diff line
@@ -926,7 +926,7 @@ out: 
    g_free(gen_node_name);

}



static QemuOptsList bdrv_runtime_opts = {

QemuOptsList bdrv_runtime_opts = {

    .name = "bdrv_common",

    .head = QTAILQ_HEAD_INITIALIZER(bdrv_runtime_opts.head),

    .desc = {

include/sysemu/sysemu.h

+1 −0
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ bool defaults_enabled(void); 
extern QemuOptsList qemu_legacy_drive_opts;

extern QemuOptsList qemu_common_drive_opts;

extern QemuOptsList qemu_drive_opts;

extern QemuOptsList bdrv_runtime_opts;

extern QemuOptsList qemu_chardev_opts;

extern QemuOptsList qemu_device_opts;

extern QemuOptsList qemu_netdev_opts;

util/qemu-config.c

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#include "qmp-commands.h"



static QemuOptsList *vm_config_groups[48];

static QemuOptsList *drive_config_groups[4];

static QemuOptsList *drive_config_groups[5];



static QemuOptsList *find_list(QemuOptsList **lists, const char *group,

                               Error **errp)

vl.c

+1 −0
Original line number Diff line number Diff line
@@ -3035,6 +3035,7 @@ int main(int argc, char **argv, char **envp) 
    qemu_add_drive_opts(&qemu_legacy_drive_opts);

    qemu_add_drive_opts(&qemu_common_drive_opts);

    qemu_add_drive_opts(&qemu_drive_opts);

    qemu_add_drive_opts(&bdrv_runtime_opts);

    qemu_add_opts(&qemu_chardev_opts);

    qemu_add_opts(&qemu_device_opts);

    qemu_add_opts(&qemu_netdev_opts);