[Qemu-commits] [qemu/qemu] 99868a: dma-helpers: explicitly pass alignment into DMA he...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 99868af3d0a75cf6a515a9aa81bf0d7bcb39eadb
      
https://github.com/qemu/qemu/commit/99868af3d0a75cf6a515a9aa81bf0d7bcb39eadb
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M dma-helpers.c
    M hw/block/nvme.c
    M hw/ide/ahci.c
    M hw/ide/core.c
    M hw/scsi/scsi-disk.c
    M include/sysemu/dma.h

  Log Message:
  -----------
  dma-helpers: explicitly pass alignment into DMA helpers

The hard-coded default alignment is BDRV_SECTOR_SIZE, however this is not
necessarily the case for all platforms. Use this as the default alignment for
all current callers.

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


  Commit: be1e343995ef81fc05d9a4e1ec263ca171d842e7
      
https://github.com/qemu/qemu/commit/be1e343995ef81fc05d9a4e1ec263ca171d842e7
  Author: Mark Cave-Ayland <address@hidden>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M hw/ide/macio.c

  Log Message:
  -----------
  macio: switch over to new byte-aligned DMA helpers

Now that the DMA helpers are byte-aligned they can be called directly from
the macio routines rather than emulating byte-aligned accesses via multiple
block-level accesses.

Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: John Snow <address@hidden>
Message-Id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 51e6e90e72fb00231f31ea30961d67506d727e81
      
https://github.com/qemu/qemu/commit/51e6e90e72fb00231f31ea30961d67506d727e81
  Author: Kevin Wolf <address@hidden>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M hw/block/fdc.c

  Log Message:
  -----------
  fdc: Add a floppy qbus

This adds a qbus to the floppy controller that should contain the floppy
drives eventually. At the moment it just exists and is empty.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: John Snow <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: 394ea2cac4e1384184947ef78679d829363ab6d2
      
https://github.com/qemu/qemu/commit/394ea2cac4e1384184947ef78679d829363ab6d2
  Author: Kevin Wolf <address@hidden>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M hw/block/fdc.c

  Log Message:
  -----------
  fdc: Add a floppy drive qdev

Floppy controllers automatically create two floppy drive devices in qdev
now. (They always created two drives, but managed them only internally.)

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: John Snow <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: a92bd191a41a432ea610d3a03add7474f21fa7d8
      
https://github.com/qemu/qemu/commit/a92bd191a41a432ea610d3a03add7474f21fa7d8
  Author: Kevin Wolf <address@hidden>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    M hw/block/fdc.c
    M vl.c

  Log Message:
  -----------
  fdc: Move qdev properties to FloppyDrive

This makes the FloppyDrive qdev object actually useful: Now that it has
all properties that don't belong to the controller, you can actually
use '-device floppy' and get a working result.

Command line semantics is consistent with CD-ROM drives: By default you
get a single empty floppy drive. You can override it with -drive and
using the same index, but if you use -drive to add a floppy to a
different index, you get both of them. However, as soon as you use any
'-device floppy', even to a different slot, the default drive is
disabled.

Using '-device floppy' without specifying the unit will choose the first
free slot on the controller.

Signed-off-by: Kevin Wolf <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: c9bf278bf20f99827da65156915f78e0ce53c68e
      
https://github.com/qemu/qemu/commit/c9bf278bf20f99827da65156915f78e0ce53c68e
  Author: Kevin Wolf <address@hidden>
  Date:   2016-10-27 (Thu, 27 Oct 2016)

  Changed paths:
    A tests/qemu-iotests/172
    A tests/qemu-iotests/172.out
    M tests/qemu-iotests/group

  Log Message:
  -----------
  qemu-iotests: Test creating floppy drives

This tests the different supported methods to create floppy drives and
how they interact.

Signed-off-by: Kevin Wolf <address@hidden>
Message-id: address@hidden
Signed-off-by: John Snow <address@hidden>


  Commit: fd209e4a773dd5a7fea79eaaffd276ebcb99e92a
      
https://github.com/qemu/qemu/commit/fd209e4a773dd5a7fea79eaaffd276ebcb99e92a
  Author: Peter Maydell <address@hidden>
  Date:   2016-10-28 (Fri, 28 Oct 2016)

  Changed paths:
    M dma-helpers.c
    M hw/block/fdc.c
    M hw/block/nvme.c
    M hw/ide/ahci.c
    M hw/ide/core.c
    M hw/ide/macio.c
    M hw/scsi/scsi-disk.c
    M include/sysemu/dma.h
    A tests/qemu-iotests/172
    A tests/qemu-iotests/172.out
    M tests/qemu-iotests/group
    M vl.c

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

# gpg: Signature made Thu 27 Oct 2016 22:15:57 BST
# gpg:                using RSA key 0x7DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <address@hidden>"
# Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
#      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E

* remotes/jnsnow/tags/ide-pull-request:
  qemu-iotests: Test creating floppy drives
  fdc: Move qdev properties to FloppyDrive
  fdc: Add a floppy drive qdev
  fdc: Add a floppy qbus
  macio: switch over to new byte-aligned DMA helpers
  dma-helpers: explicitly pass alignment into DMA helpers

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


Compare: https://github.com/qemu/qemu/compare/9879b75873ca...fd209e4a773d