diff options
| author | Peter Maydell | 2016-10-10 16:19:20 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-10-10 16:19:20 +0200 |
| commit | 0f183e679d85fec74fc83f35f973cf8e56d97861 (patch) | |
| tree | 24ab65457f2b67288502b78e6f179e4ed695171b /util/qemu-config.c | |
| parent | Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into st... (diff) | |
| parent | Merge remote-tracking branch 'mreitz/tags/pull-block-2016-10-07' into queue-b... (diff) | |
| download | qemu-0f183e679d85fec74fc83f35f973cf8e56d97861.tar.gz qemu-0f183e679d85fec74fc83f35f973cf8e56d97861.tar.xz qemu-0f183e679d85fec74fc83f35f973cf8e56d97861.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches
# gpg: Signature made Mon 10 Oct 2016 12:33:14 BST
# gpg: using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
dmg: Move libbz2 code to dmg-bz2.so
module: Don't load the same module if requested multiple times
scripts: Allow block module to not define BlockDriver
block: Add qdev ID to DEVICE_TRAY_MOVED
block-backend: Remember if attached device is non-qdev
block: Add node name to BLOCK_IO_ERROR event
block: Add bdrv_runtime_opts to query-command-line-options
block: use aio_bh_schedule_oneshot
async: add aio_bh_schedule_oneshot
block: use bdrv_add_before_write_notifier
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/qemu-config.c')
| -rw-r--r-- | util/qemu-config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/qemu-config.c b/util/qemu-config.c index fb973074d3..5527100a01 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -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) |