On Wed, Dec 23, 2015 at 03:45:29PM +0200, Michael S. Tsirkin wrote:
> This is the actual vs expected diff with both patches applied.
Interesting... The diff suggests that qemu running in your test
environment has no floppy drives, while in mine ...
> + Scope (\_SB.PCI0.ISA.FDC0)
> + {
> + Device (FLPA)
> + {
> + Name (_ADR, Zero) // _ADR: Address
> + Name (_FDI, Package (0x10) // _FDI: Floppy Drive Information
> + {
> + Zero,
> + 0x04,
> + 0x4F,
> + 0x12,
> + One,
[...]
> + })
> + }
> +
> + Name (_FDE, Buffer (0x14) // _FDE: Floppy Disk Enumerate
> + {
> + /* 0000 */ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /*
> ........ */
> + /* 0008 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /*
> ........ */
> + /* 0010 */ 0x02, 0x00, 0x00, 0x00 /*
> .... */
> + })
> + }
... it has one 1.44M drive with correct geometry for pc machine type,
and ...
> + Scope (\_SB.PCI0.ISA.FDC0)
> + {
> + Device (FLPA)
> + {
> + Name (_ADR, Zero) // _ADR: Address
> + Name (_FDI, Package (0x10) // _FDI: Floppy Drive Information
> + {
> + Zero,
> + 0x04,
> + 0xFFFFFFFFFFFFFFFF,
> + Zero,
> + 0xFFFFFFFFFFFFFFFF,
[...]
> + })
> + }
> +
> + Device (FLPB)
> + {
> + Name (_ADR, One) // _ADR: Address
> + Name (_FDI, Package (0x10) // _FDI: Floppy Drive Information
> + {
> + One,
> + 0x04,
> + 0xFFFFFFFFFFFFFFFF,
> + Zero,
> + 0xFFFFFFFFFFFFFFFF,
[...]
> + })
> + }
> +
> + Name (_FDE, Buffer (0x14) // _FDE: Floppy Disk Enumerate
> + {
> + /* 0000 */ 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, /*
> ........ */
> + /* 0008 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /*
> ........ */
> + /* 0010 */ 0x02, 0x00, 0x00, 0x00 /*
> .... */
> + })
> + }
... two 1.44M drives with bogus geometry for q35.
Looking into this, thanks for the diff.
Roman.
