Google Git
Sign in
qemu / qemu / 07a978ef376cde544cca564ec225a8eb79ff2d54
commit07a978ef376cde544cca564ec225a8eb79ff2d54[log] [tgz]
authorMarkus Armbruster <armbru@redhat.com>Wed Apr 22 15:07:11 2020 +0200
committerMarkus Armbruster <armbru@redhat.com>Wed Apr 29 08:01:52 2020 +0200
treea9daf7bd2c400c72de3ab63775a56e22e0446683
parent0fbddcecf23dcc311b42d9faf87dc2656dadd62a [diff]
fdc: Fix fallback=auto error handling

fdctrl_realize_common() rejects fallback=auto.  Used by devices
"isa-fdc", "sysbus-fdc", "SUNW,fdtwo".  The error handling is broken:

    $ qemu-system-x86_64 -nodefaults -device isa-fdc,fallback=auto,driveA=fd0 -drive if=none,id=fd0
    **
    ERROR:/work/armbru/qemu/hw/block/fdc.c:434:pick_drive_type: assertion failed: (drv->drive != FLOPPY_DRIVE_TYPE_AUTO)
    Aborted (core dumped)

Cause: fdctrl_realize_common() neglects to bail out after setting the
error.  Fix that.

Fixes: a73275dd6fc3bfda33165bebc28e0c33c20cb0a0
Cc: John Snow <jsnow@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200422130719.28225-7-armbru@redhat.com>
1 file changed
tree: a9daf7bd2c400c72de3ab63775a56e22e0446683
  1. .github/
  2. .gitlab-ci.d/
  3. accel/
  4. audio/
  5. authz/
  6. backends/
  7. block/
  8. bsd-user/
  9. chardev/
  10. contrib/
  11. crypto/
  12. default-configs/
  13. disas/
  14. docs/
  15. dump/
  16. fpu/
  17. fsdev/
  18. gdb-xml/
  19. hw/
  20. include/
  21. io/
  22. libdecnumber/
  23. linux-headers/
  24. linux-user/
  25. migration/
  26. monitor/
  27. nbd/
  28. net/
  29. pc-bios/
  30. plugins/
  31. po/
  32. python/
  33. qapi/
  34. qga/
  35. qobject/
  36. qom/
  37. replay/
  38. roms/
  39. scripts/
  40. scsi/
  41. softmmu/
  42. storage-daemon/
  43. stubs/
  44. target/
  45. tcg/
  46. tests/
  47. tools/
  48. trace/
  49. ui/
  50. util/
  51. capstone
  52. dtc
  53. slirp
  54. .cirrus.yml
  55. .dir-locals.el
  56. .editorconfig
  57. .exrc
  58. .gdbinit
  59. .gitignore
  60. .gitlab-ci-edk2.yml
  61. .gitlab-ci-opensbi.yml
  62. .gitlab-ci.yml
  63. .gitmodules
  64. .gitpublish
  65. .mailmap
  66. .patchew.yml
  67. .readthedocs.yml
  68. .shippable.yml
  69. .travis.yml
  70. arch_init.c
  71. balloon.c
  72. block.c
  73. blockdev-nbd.c
  74. blockdev.c
  75. blockjob.c
  76. bootdevice.c
  77. Changelog
  78. CODING_STYLE.rst
  79. configure
  80. COPYING
  81. COPYING.LIB
  82. cpus-common.c
  83. cpus.c
  84. device_tree.c
  85. disas.c
  86. dma-helpers.c
  87. exec-vary.c
  88. exec.c
  89. gdbstub.c
  90. gitdm.config
  91. hmp-commands-info.hx
  92. hmp-commands.hx
  93. ioport.c
  94. iothread.c
  95. job-qmp.c
  96. job.c
  97. Kconfig.host
  98. LICENSE
  99. MAINTAINERS
  100. Makefile
  101. Makefile.objs
  102. Makefile.target
  103. memory.c
  104. memory_ldst.inc.c
  105. memory_mapping.c
  106. module-common.c
  107. os-posix.c
  108. os-win32.c
  109. qdev-monitor.c
  110. qemu-bridge-helper.c
  111. qemu-edid.c
  112. qemu-img-cmds.hx
  113. qemu-img.c
  114. qemu-io-cmds.c
  115. qemu-io.c
  116. qemu-keymap.c
  117. qemu-nbd.c
  118. qemu-options-wrapper.h
  119. qemu-options.h
  120. qemu-options.hx
  121. qemu-seccomp.c
  122. qemu-storage-daemon.c
  123. qemu.nsi
  124. qemu.sasl
  125. qtest.c
  126. README.rst
  127. replication.c
  128. replication.h
  129. rules.mak
  130. thunk.c
  131. tpm.c
  132. trace-events
  133. VERSION
  134. version.rc