[Qemu-commits] [qemu/qemu] fd9bdb: fdc: fix detection under Linux

qemu-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] fd9bdb: fdc: fix detection under Linux

From:	GitHub
Subject:	[Qemu-commits] [qemu/qemu] fd9bdb: fdc: fix detection under Linux
Date:	Thu, 04 Feb 2016 06:30:03 -0800
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: fd9bdbd3459e5b9d51534f0747049bc5b6145e07
      
https://github.com/qemu/qemu/commit/fd9bdbd3459e5b9d51534f0747049bc5b6145e07
  Author: John Snow <address@hidden>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M hw/block/fdc.c

  Log Message:
  -----------
  fdc: fix detection under Linux

Accidentally, I removed a "feature" where empty drives had geometry
values applied to them, which allows seek on empty drives to work
"by accident," as QEMU actually tries to disallow that.

Seeks on empty drives should work, though, but the easiest thing is to
restore the misfeature where empty drives have non-zero geometries
applied.

Document the hack accordingly.

[Maintainer edit]

This fix corrects a regression introduced in d5d47efc, where
pick_geometry was modified such that it would not operate on empty
drives, and as a result if there is no diskette inserted, QEMU
no longer populates it with geometry bounds. As a result, seek fails
when QEMU denies to move the current track, but reports success anyway.
This can confuse the guest, leading to kernel panics in the guest.


Signed-off-by: John Snow <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden


  Commit: 449ae7eca922c7bb65730cab60f6c8a23cc47cef
      
https://github.com/qemu/qemu/commit/449ae7eca922c7bb65730cab60f6c8a23cc47cef
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M hw/dma/i82374.c

  Log Message:
  -----------
  i82374: device only existed as ISA device, so simplify device

Merge ISAi82374State fields into parent structure I82374State.

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 57146941924a4189b14cbc1c87478b2ffef31943
      
https://github.com/qemu/qemu/commit/57146941924a4189b14cbc1c87478b2ffef31943
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M hw/dma/i82374.c
    M hw/dma/i8257.c
    M hw/i386/pc.c
    M hw/mips/mips_fulong2e.c
    M hw/mips/mips_jazz.c
    M hw/mips/mips_malta.c
    M hw/sparc/sun4m.c
    M hw/sparc64/sun4u.c
    M include/hw/isa/isa.h

  Log Message:
  -----------
  i8257: pass ISA bus to DMA_init() function

i8257 DMA controller exists on one ISA bus, so let's specify it at 
initialization.

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 6a128b133014be70413b702eecc8ba85a79c2144
      
https://github.com/qemu/qemu/commit/6a128b133014be70413b702eecc8ba85a79c2144
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M hw/dma/i8257.c

  Log Message:
  -----------
  i8257: rename struct dma_cont to I8257State

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 0eee6d6262435685a7a225b19e3580dfc0ab07f9
      
https://github.com/qemu/qemu/commit/0eee6d6262435685a7a225b19e3580dfc0ab07f9
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M hw/dma/i8257.c

  Log Message:
  -----------
  i8257: rename struct dma_regs to I8257Regs

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 74c47de010d6ffb1980ef67b5e381ba8324e19e4
      
https://github.com/qemu/qemu/commit/74c47de010d6ffb1980ef67b5e381ba8324e19e4
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M hw/dma/i8257.c

  Log Message:
  -----------
  i8257: rename functions to start with i8257_ prefix

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: b9ebd28c629717386b02a8cc9c175f488f604d11
      
https://github.com/qemu/qemu/commit/b9ebd28c629717386b02a8cc9c175f488f604d11
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M hw/dma/i8257.c

  Log Message:
  -----------
  i8257: make the DMA running method per controller

This removes some static/global variables, and we're now running only the
required controller (master or slave)

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 8d3c4c81f36f966d53923db23021487d903eee9c
      
https://github.com/qemu/qemu/commit/8d3c4c81f36f966d53923db23021487d903eee9c
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M hw/dma/i8257.c

  Log Message:
  -----------
  i8257: add missing const

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 340e19ebf2103317206b6910cd065bdbdea0d2e0
      
https://github.com/qemu/qemu/commit/340e19ebf2103317206b6910cd065bdbdea0d2e0
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M hw/dma/i8257.c

  Log Message:
  -----------
  i8257: QOM'ify

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: f5f19ee2e448a8442f1974ca1a0b8864486ed25b
      
https://github.com/qemu/qemu/commit/f5f19ee2e448a8442f1974ca1a0b8864486ed25b
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M hw/dma/i8257.c
    A include/hw/isa/i8257.h

  Log Message:
  -----------
  i8257: move state definition to new independent header

We will now be able to embed the i8257 interrupt controller in another object.

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 5484f30b2c48ba526f922e6b10e7ab3566c0b8a0
      
https://github.com/qemu/qemu/commit/5484f30b2c48ba526f922e6b10e7ab3566c0b8a0
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M hw/isa/isa-bus.c
    M include/hw/isa/isa.h
    M include/qemu/typedefs.h

  Log Message:
  -----------
  isa: add an ISA DMA interface, and store it within the ISA bus

This will permit to deprecate global DMA_*() functions.

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 16ffe3636006b6805e403860c54bf9c2071c6e3d
      
https://github.com/qemu/qemu/commit/16ffe3636006b6805e403860c54bf9c2071c6e3d
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M hw/dma/i8257.c

  Log Message:
  -----------
  i8257: implement the IsaDma interface

Rewrite the global DMA_*() functions to use the IsaDma interface.
Note that these functions will be deleted in a few commits.

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 020e29869924ede58ef6d8723cad4df9af307af6
      
https://github.com/qemu/qemu/commit/020e29869924ede58ef6d8723cad4df9af307af6
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M hw/mips/mips_jazz.c

  Log Message:
  -----------
  magnum: disable floppy DMA for now

Floppy uses the DMA controller in rc4030 chipset, and not the i8259 from the 
ISA bus.
It's better to disable DMA than to call the wrong DMA controller.

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: dd446051b797f72d6293c26bde2db16fddc42d0b
      
https://github.com/qemu/qemu/commit/dd446051b797f72d6293c26bde2db16fddc42d0b
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M hw/block/fdc.c

  Log Message:
  -----------
  sparc: disable floppy DMA

All functions relative to DMA (DMA_*() functions) are stubs on sparc platform.
Disable the DMA in the floppy controller, instead of calling these stubs.

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: c3ae40e12cd7a41d2620ca2b771f6e167c0632d6
      
https://github.com/qemu/qemu/commit/c3ae40e12cd7a41d2620ca2b771f6e167c0632d6
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M hw/sparc64/sun4u.c

  Log Message:
  -----------
  sparc64: disable floppy DMA

All functions relative to DMA (DMA_*() functions) are stubs on sparc64 platform.
Disable the DMA of the floppy controller, instead of calling these stubs.

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: c8a35f1cf0f25653be588603c012070d4bdb756a
      
https://github.com/qemu/qemu/commit/c8a35f1cf0f25653be588603c012070d4bdb756a
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M hw/block/fdc.c

  Log Message:
  -----------
  fdc: use IsaDma interface instead of global DMA_* functions

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 2d0110913356b34229d7232e8e1ce93ad9b3da67
      
https://github.com/qemu/qemu/commit/2d0110913356b34229d7232e8e1ce93ad9b3da67
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M hw/audio/cs4231a.c

  Log Message:
  -----------
  cs4231a: use IsaDma interface instead of global DMA_* functions

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 467be5f2f0176592288460787ca28704f6493db5
      
https://github.com/qemu/qemu/commit/467be5f2f0176592288460787ca28704f6493db5
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M hw/audio/gus.c

  Log Message:
  -----------
  gus: use IsaDma interface instead of global DMA_* functions

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: f203c16ea28cfbe53f4b5523117539468d29a67a
      
https://github.com/qemu/qemu/commit/f203c16ea28cfbe53f4b5523117539468d29a67a
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M hw/audio/sb16.c

  Log Message:
  -----------
  sb16: use IsaDma interface instead of global DMA_* functions

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: ba0a71022ca704eadcad4bffa92678d7c723729d
      
https://github.com/qemu/qemu/commit/ba0a71022ca704eadcad4bffa92678d7c723729d
  Author: Hervé Poussineau <address@hidden>
  Date:   2016-02-03 (Wed, 03 Feb 2016)

  Changed paths:
    M hw/dma/i8257.c
    M hw/sparc/sun4m.c
    M hw/sparc64/sun4u.c
    M include/hw/isa/isa.h

  Log Message:
  -----------
  dma: remove now useless DMA_* functions

Keep only DMA_init function as a wrapper around DMA controllers creation.

Signed-off-by: Hervé Poussineau <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: ae533a46a10a931ba45f4650ef2439ca87098bd5
      
https://github.com/qemu/qemu/commit/ae533a46a10a931ba45f4650ef2439ca87098bd5
  Author: Peter Maydell <address@hidden>
  Date:   2016-02-04 (Thu, 04 Feb 2016)

  Changed paths:
    M hw/audio/cs4231a.c
    M hw/audio/gus.c
    M hw/audio/sb16.c
    M hw/block/fdc.c
    M hw/dma/i82374.c
    M hw/dma/i8257.c
    M hw/i386/pc.c
    M hw/isa/isa-bus.c
    M hw/mips/mips_fulong2e.c
    M hw/mips/mips_jazz.c
    M hw/mips/mips_malta.c
    M hw/sparc/sun4m.c
    M hw/sparc64/sun4u.c
    A include/hw/isa/i8257.h
    M include/hw/isa/isa.h
    M include/qemu/typedefs.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into 
staging

# gpg: Signature made Wed 03 Feb 2016 20:29:54 GMT using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <address@hidden>"

* remotes/jnsnow/tags/ide-pull-request:
  dma: remove now useless DMA_* functions
  sb16: use IsaDma interface instead of global DMA_* functions
  gus: use IsaDma interface instead of global DMA_* functions
  cs4231a: use IsaDma interface instead of global DMA_* functions
  fdc: use IsaDma interface instead of global DMA_* functions
  sparc64: disable floppy DMA
  sparc: disable floppy DMA
  magnum: disable floppy DMA for now
  i8257: implement the IsaDma interface
  isa: add an ISA DMA interface, and store it within the ISA bus
  i8257: move state definition to new independent header
  i8257: QOM'ify
  i8257: add missing const
  i8257: make the DMA running method per controller
  i8257: rename functions to start with i8257_ prefix
  i8257: rename struct dma_regs to I8257Regs
  i8257: rename struct dma_cont to I8257State
  i8257: pass ISA bus to DMA_init() function
  i82374: device only existed as ISA device, so simplify device
  fdc: fix detection under Linux

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/071aacc9c9e1...ae533a46a10a
[Prev in Thread]
Current Thread
[Next in Thread]
[Qemu-commits] [qemu/qemu] fd9bdb: fdc: fix detection under Linux, GitHub <=
Prev by Date: [Qemu-commits] [qemu/qemu] a43e68: virt-acpi-build: add always-on property for timer
Next by Date: [Qemu-commits] [qemu/qemu] f853ac: net/slirp: Tell the users when they are using depr...
Previous by thread: [Qemu-commits] [qemu/qemu] a43e68: virt-acpi-build: add always-on property for timer
Next by thread: [Qemu-commits] [qemu/qemu] f853ac: net/slirp: Tell the users when they are using depr...
Index(es):
- Date
- Thread