[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 473a49: q35: Re-enable FDC on pc-q35-2.3 and
From: |
GitHub |
Subject: |
[Qemu-commits] [qemu/qemu] 473a49: q35: Re-enable FDC on pc-q35-2.3 and older |
Date: |
Fri, 19 Jun 2015 03:00:07 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 473a49460db0a90bfda046b8f3662b49f94098eb
https://github.com/qemu/qemu/commit/473a49460db0a90bfda046b8f3662b49f94098eb
Author: Eduardo Habkost <address@hidden>
Date: 2015-06-19 (Fri, 19 Jun 2015)
Changed paths:
M hw/i386/pc_q35.c
Log Message:
-----------
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 <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Message-id: address@hidden
Cc: Laszlo Ersek <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
[PMM: mention that this was a merge issue, not a review issue]
Signed-off-by: Peter Maydell <address@hidden>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [qemu/qemu] 473a49: q35: Re-enable FDC on pc-q35-2.3 and older,
GitHub <=