diff options
| author | Eduardo Habkost | 2015-06-18 18:49:28 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-06-19 10:40:35 +0200 |
| commit | 473a49460db0a90bfda046b8f3662b49f94098eb (patch) | |
| tree | c15634c9b003d9e2646736f83317e2d0abb73231 /hw/core | |
| parent | Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2015-06-18' into ... (diff) | |
| download | qemu-473a49460db0a90bfda046b8f3662b49f94098eb.tar.gz qemu-473a49460db0a90bfda046b8f3662b49f94098eb.tar.xz qemu-473a49460db0a90bfda046b8f3662b49f94098eb.zip | |
q35: Re-enable FDC on pc-q35-2.3 and older
commit ea96bc629cbd52be98b2967a4b4f72e91dfc3ee4 doesn't match the patch
submitted by Laszlo to qemu-devel. We reuse pc_q35_2_4_machine_options()
inside pc_q35_2_3_machine_options(), so we need to undo the no_floppy
change in pc_q35_2_3_machine_options().
(This discrepancy was due to a bad merge.)
This restores the previous behavior where all the 2.3 and older machines
had no_floppy=0.
Reported-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-id: 1434646168-3100-1-git-send-email-ehabkost@redhat.com
Cc: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
[PMM: mention that this was a merge issue, not a review issue]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/core')
0 files changed, 0 insertions, 0 deletions