summary refs log tree commit diff stats
path: root/tests/qemu-iotests/socket_scm_helper.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-10-28 14:29:50 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-10-28 14:29:50 +0100
commitfd209e4a773dd5a7fea79eaaffd276ebcb99e92a (patch)
tree1fd861d96f15c4d148aaf7e6e33920cdebfb159e /tests/qemu-iotests/socket_scm_helper.c
parent9879b75873cacc88cdee490f6ab481e8ce766c69 (diff)
parentc9bf278bf20f99827da65156915f78e0ce53c68e (diff)
downloadfocaccia-qemu-fd209e4a773dd5a7fea79eaaffd276ebcb99e92a.tar.gz
focaccia-qemu-fd209e4a773dd5a7fea79eaaffd276ebcb99e92a.zip
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) <jsnow@redhat.com>"
# 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 <peter.maydell@linaro.org>
Diffstat (limited to 'tests/qemu-iotests/socket_scm_helper.c')
0 files changed, 0 insertions, 0 deletions