summaryrefslogtreecommitdiffstats
path: root/hw/ide/core.c
diff options
context:
space:
mode:
authorPeter Maydell2016-10-28 13:06:41 +0200
committerPeter Maydell2016-10-28 13:06:41 +0200
commit9879b75873cacc88cdee490f6ab481e8ce766c69 (patch)
treec5a575eed03a36c2824d8c061132e2adb6690497 /hw/ide/core.c
parentMerge remote-tracking branch 'remotes/kraxel/tags/pull-seabios-20161027-2' in... (diff)
parentiotests: Add test for NBD's blockdev-add interface (diff)
downloadqemu-9879b75873cacc88cdee490f6ab481e8ce766c69.tar.gz
qemu-9879b75873cacc88cdee490f6ab481e8ce766c69.tar.xz
qemu-9879b75873cacc88cdee490f6ab481e8ce766c69.zip
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches # gpg: Signature made Thu 27 Oct 2016 18:15:47 BST # gpg: using RSA key 0x7F09B272C88F2FD6 # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6 * remotes/kevin/tags/for-upstream: (23 commits) iotests: Add test for NBD's blockdev-add interface iotests: Add assert_json_filename_equal() method socket_scm_helper: Accept fd directly iotests.py: Allow concurrent qemu instances iotests.py: Add qemu_nbd function qapi: Allow blockdev-add for NBD block/nbd: Use SocketAddress options block/nbd: Accept SocketAddress block/nbd: Add nbd_has_filename_options_conflict() block/nbd: Use qdict_put() block/nbd: Default port in nbd_refresh_filename() block/nbd: Reject port parameter without host block/nbd: Drop trailing "." in error messages qemu-iotests: Fix typo for NFS with IMGOPTSSYNTAX block: Remove bdrv_aio_ioctl() raw: Implement .bdrv_co_ioctl instead of .bdrv_aio_ioctl block: Introduce .bdrv_co_ioctl() driver callback block: Remove bdrv_ioctl() raw-posix: Don't use bdrv_ioctl() block: Use blk_co_ioctl() for all BB level ioctls ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/ide/core.c')
0 files changed, 0 insertions, 0 deletions