diff options
| author | Anthony Liguori <aliguori@amazon.com> | 2013-11-19 12:59:09 -0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2013-11-19 12:59:09 -0800 |
| commit | 7af31519e220efc0572cacec5ac65dc54e73985d (patch) | |
| tree | e078f066da8645430cf5ed0c9f0c07e823b10c30 /vl.c | |
| parent | 88a47b9de2c01121e153b1feb24cdb2e033b2f04 (diff) | |
| parent | 06d22aa36706a3d6051b74c8a183ab554a0cb808 (diff) | |
| download | qemu-7af31519e220efc0572cacec5ac65dc54e73985d.tar.gz | |
Merge remote-tracking branch 'kwolf/tags/for-anthony' into staging
Block fixes for 1.7.0
# gpg: Signature made Fri 15 Nov 2013 09:51:25 AM PST using RSA key ID C88F2FD6
# gpg: Can't check signature: public key not found
# By Max Reitz (3) and others
# Via Kevin Wolf
* kwolf/tags/for-anthony:
block: Fail if requested driver is not available
MAINTAINERS: add block driver sub-maintainers
qemu-img: Fix overwriting 'ret' before using
qemu-iotests: Test qcow2 count_contiguous_clusters()
qcow2: fix possible corruption when reading multiple clusters
qmp: access the local QemuOptsLists for drive option
MAINTAINERS: add block tree repo URLs
qemu-iotests: Extend 041 for unbacked mirroring
block/drive-mirror: Check for NULL backing_hd
qapi-schema: Update description for NewImageMode
block: Print its file name if backing file opening failed
Message-id: 1384537999-5972-1-git-send-email-kwolf@redhat.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -2867,6 +2867,9 @@ int main(int argc, char **argv, char **envp) module_call_init(MODULE_INIT_QOM); qemu_add_opts(&qemu_drive_opts); + 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_opts(&qemu_chardev_opts); qemu_add_opts(&qemu_device_opts); qemu_add_opts(&qemu_netdev_opts); |