block: Add bdrv_runtime_opts to query-command-line-options
commitc5f3014b82adc0e8f50bf5052031503d3467bea3
authorKevin Wolf <kwolf@redhat.com>
Thu, 6 Oct 2016 09:33:17 +0000 (6 11:33 +0200)
committerKevin Wolf <kwolf@redhat.com>
Fri, 7 Oct 2016 11:34:07 +0000 (7 13:34 +0200)
tree70232e332f97bfeeb43c4a3a16cd543defd4d505
parentfffb6e12233002c26c0ee9ff92fa87927cd779f2
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: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Tested-by: Michal Privoznik <mprivozn@redhat.com>
Tested-by: Gerd Hoffmann <kraxel@redhat.com>
block.c
include/sysemu/sysemu.h
util/qemu-config.c
vl.c