]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commit
block: Always pass driver name through options QDict
authorKevin Wolf <kwolf@redhat.com>
Tue, 27 May 2014 08:50:29 +0000 (10:50 +0200)
committerKevin Wolf <kwolf@redhat.com>
Thu, 26 Jun 2014 11:51:01 +0000 (13:51 +0200)
commit17b005f1d422d4581f8ce95b75d603deb081f4f3
treef9dd3865a5ba53dbe08fe7c68608651c19e8cde3
parent5e5c4f63f4a7f48f571ea5671bf8452fe9655cdd
block: Always pass driver name through options QDict

The "driver" entry in the options QDict is now only missing if we're
opening an image with format probing.

We also catch cases now where both the drv argument and a "driver"
option is specified, e.g. by specifying -drive format=qcow2,driver=raw

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
block.c
tests/qemu-iotests/051
tests/qemu-iotests/051.out