Re: [Qemu-devel] [PATCH v2 2/3] hw/i386/pc: reflect any FDC @ ioport 0x3f0 in the CMOS

[Laszlo Ersek]

On 06/29/15 11:56, Michael S. Tsirkin wrote:
> On Mon, Jun 29, 2015 at 11:33:42AM +0200, Markus Armbruster wrote:
>> Eduardo Habkost <address@hidden> writes:
>>
>>> On Fri, Jun 26, 2015 at 02:50:04PM -0400, John Snow wrote:
>>>> On 06/26/2015 08:25 AM, Laszlo Ersek wrote:
>>>>> On 06/26/15 11:31, Markus Armbruster wrote:
>>>>>> Laszlo Ersek <address@hidden> writes:
>>>>>>
>>>>>>> With the pc-q35-2.4 machine type, if the user creates an ISA FDC 
>>>>>>> manually:
>>>>>>>
>>>>>>>   -device isa-fdc,driveA=drive-fdc0-0-0 \
>>>>>>>   -drive file=...,if=none,id=drive-fdc0-0-0,format=raw
>>>>>>>
>>>>>>> then the board-default FDC will be skipped, and only the explicitly
>>>>>>> requested FDC will exist. qtree-wise, this is correct; however such an 
>>>>>>> FDC
>>>>>>> is currently not registered in the CMOS, because that code is only 
>>>>>>> reached
>>>>>>> for the board-default FDC.
>>>>>>>
>>>>>>> The pc_cmos_init_late() one-shot reset handler -- one-shot because the
>>>>>>> CMOS is not reprogrammed during warm reset -- should search for any ISA
>>>>>>> FDC devices, created implicitly (by board code) or explicitly, and set 
>>>>>>> the
>>>>>>> CMOS accordingly to the ISA FDC(s) with iobase=0x3f0:
>>>>>>>
>>>>>>> - if there is no such FDC, report both drives absent,
>>>>>>> - if there is exactly one such FDC, report its drives in the CMOS,
>>>>>>> - if there are more than one such FDCs, then pick one (it is not 
>>>>>>> specified
>>>>>>>   which one), and print a warning about the ambiguity.
>>>>>>>
>>>>>>> Cc: Jan Tomko <address@hidden>
>>>>>>> Cc: John Snow <address@hidden>
>>>>>>> Cc: Markus Armbruster <address@hidden>
>>>>>>> Cc: Paolo Bonzini <address@hidden>
>>>>>>> Reported-by: Jan Tomko <address@hidden>
>>>>>>> Suggested-by: Markus Armbruster <address@hidden>
>>>>>>> Signed-off-by: Laszlo Ersek <address@hidden>
>>>>>>> Reviewed-by: John Snow <address@hidden>
>>>>>>
>>>>>> Reviewed-by: Markus Armbruster <address@hidden>
>>>>>
>>>>> Thank you. Can you or John please send a PULL req for this? (Or include
>>>>> it in an upcoming PULL of yours.)
>>>>>
>>>>> I've been Cc'ing Paolo because the get-maintainer script reported him at
>>>>> the top for the patch set, but I believe he might not have time for this
>>>>> now.
>>>>>
>>>>> Thanks!
>>>>> Laszlo
>>>>>
>>>>
>>>> This is technically out-of-tree for me, because it's touching init
>>>> instead of my device.
>>>>
>>>> Best guess is Eduardo Habkost, whom I have CC'd.
>>>
>>> Michael is the PC maintainer.
>>
>> Michael, we really needs this series in 2.4, because without it floppy
>> is broken for Q35.
> 
> Will review, thanks for the reminder.

Ping. :)

This should go into 2.4, preferably.

(Tomorrow ^W in two minutes in my timezone is the rc0 / hard freeze date
(according to <http://wiki.qemu.org/Planning/2.4>), but the series is a
bugfix.)

Thanks
Laszlo