Google Git
Sign in
qemu-android / qemu-android / 17b005f1d422d4581f8ce95b75d603deb081f4f3
commit17b005f1d422d4581f8ce95b75d603deb081f4f3[log] [tgz]
authorKevin Wolf <kwolf@redhat.com>Tue May 27 10:50:29 2014 +0200
committerKevin Wolf <kwolf@redhat.com>Thu Jun 26 13:51:01 2014 +0200
treef9dd3865a5ba53dbe08fe7c68608651c19e8cde3
parent5e5c4f63f4a7f48f571ea5671bf8452fe9655cdd [diff]
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>
3 files changed
tree: f9dd3865a5ba53dbe08fe7c68608651c19e8cde3
  1. audio/
  2. backends/
  3. block/
  4. bsd-user/
  5. default-configs/
  6. disas/
  7. docs/
  8. fpu/
  9. fsdev/
  10. gdb-xml/
  11. hw/
  12. include/
  13. libcacard/
  14. libdecnumber/
  15. linux-headers/
  16. linux-user/
  17. net/
  18. pc-bios/
  19. po/
  20. qapi/
  21. qga/
  22. qobject/
  23. qom/
  24. roms/
  25. scripts/
  26. slirp/
  27. stubs/
  28. sysconfigs/
  29. target-alpha/
  30. target-arm/
  31. target-cris/
  32. target-i386/
  33. target-lm32/
  34. target-m68k/
  35. target-microblaze/
  36. target-mips/
  37. target-moxie/
  38. target-openrisc/
  39. target-ppc/
  40. target-s390x/
  41. target-sh4/
  42. target-sparc/
  43. target-unicore32/
  44. target-xtensa/
  45. tcg/
  46. tests/
  47. trace/
  48. ui/
  49. util/
  50. dtc
  51. pixman
  52. .exrc
  53. .gitignore
  54. .gitmodules
  55. .mailmap
  56. .travis.yml
  57. aio-posix.c
  58. aio-win32.c
  59. arch_init.c
  60. async.c
  61. balloon.c
  62. block-migration.c
  63. block.c
  64. blockdev-nbd.c
  65. blockdev.c
  66. blockjob.c
  67. bt-host.c
  68. bt-vhci.c
  69. Changelog
  70. CODING_STYLE
  71. configure
  72. COPYING
  73. COPYING.LIB
  74. coroutine-gthread.c
  75. coroutine-sigaltstack.c
  76. coroutine-ucontext.c
  77. coroutine-win32.c
  78. cpu-exec.c
  79. cpus.c
  80. cputlb.c
  81. device-hotplug.c
  82. device_tree.c
  83. disas.c
  84. dma-helpers.c
  85. dump.c
  86. exec.c
  87. gdbstub.c
  88. HACKING
  89. hmp-commands.hx
  90. hmp.c
  91. hmp.h
  92. iohandler.c
  93. ioport.c
  94. iothread.c
  95. kvm-all.c
  96. kvm-stub.c
  97. LICENSE
  98. main-loop.c
  99. MAINTAINERS
  100. Makefile
  101. Makefile.objs
  102. Makefile.target
  103. memory.c
  104. memory_mapping.c
  105. migration-exec.c
  106. migration-fd.c
  107. migration-rdma.c
  108. migration-tcp.c
  109. migration-unix.c
  110. migration.c
  111. module-common.c
  112. monitor.c
  113. nbd.c
  114. numa.c
  115. os-posix.c
  116. os-win32.c
  117. page_cache.c
  118. qapi-event.json
  119. qapi-schema.json
  120. qdev-monitor.c
  121. qdict-test-data.txt
  122. qemu-bridge-helper.c
  123. qemu-char.c
  124. qemu-coroutine-io.c
  125. qemu-coroutine-lock.c
  126. qemu-coroutine-sleep.c
  127. qemu-coroutine.c
  128. qemu-doc.texi
  129. qemu-file.c
  130. qemu-img-cmds.hx
  131. qemu-img.c
  132. qemu-img.texi
  133. qemu-io-cmds.c
  134. qemu-io.c
  135. qemu-log.c
  136. qemu-nbd.c
  137. qemu-nbd.texi
  138. qemu-options-wrapper.h
  139. qemu-options.h
  140. qemu-options.hx
  141. qemu-seccomp.c
  142. qemu-tech.texi
  143. qemu-timer.c
  144. qemu.nsi
  145. qemu.sasl
  146. qmp-commands.hx
  147. qmp.c
  148. qtest.c
  149. README
  150. rules.mak
  151. savevm.c
  152. softmmu_template.h
  153. spice-qemu-char.c
  154. tcg-runtime.c
  155. tci.c
  156. thread-pool.c
  157. thunk.c
  158. tpm.c
  159. trace-events
  160. translate-all.c
  161. translate-all.h
  162. user-exec.c
  163. VERSION
  164. version.rc
  165. vl.c
  166. vmstate.c
  167. xbzrle.c
  168. xen-common-stub.c
  169. xen-common.c
  170. xen-hvm-stub.c
  171. xen-hvm.c
  172. xen-mapcache.c