diff options
| author | Peter Maydell | 2015-10-17 23:14:52 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-10-17 23:14:52 +0200 |
| commit | c737c7a608f4cd2c06e6600303845c4b469822c5 (patch) | |
| tree | 062bb9ec0082a16928572cb7ff0a039d79de93bb /hw/net/vhost_net.c | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20151016'... (diff) | |
| parent | blkdebug: Don't confuse image as backing file (diff) | |
| download | qemu-c737c7a608f4cd2c06e6600303845c4b469822c5.tar.gz qemu-c737c7a608f4cd2c06e6600303845c4b469822c5.tar.xz qemu-c737c7a608f4cd2c06e6600303845c4b469822c5.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches
# gpg: Signature made Fri 16 Oct 2015 14:36:50 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream: (29 commits)
blkdebug: Don't confuse image as backing file
qcow2: Remove forward declaration of QCowAIOCB
qemu-nbd: always compile in --aio=MODE option
blockdev: always compile in -drive aio= parsing
raw-posix: warn about BDRV_O_NATIVE_AIO if libaio is unavailable
block: auto-generated node-names
util - add automated ID generation utility
blkverify: Fix BDS leak in .bdrv_open error path
block: Allow bdrv_unref_child(bs, NULL)
block: Remove bdrv_swap()
block: Add and use bdrv_replace_in_backing_chain()
blockjob: Store device name at job creation
block: Implement bdrv_append() without bdrv_swap()
block: Introduce parents list
block-backend: Add blk_set_bs()
block/io: Make bdrv_requests_pending() public
block: Split bdrv_move_feature_fields()
block: Manage backing file references in bdrv_set_backing_hd()
block: Convert bs->backing_hd to BdrvChild
block: Remove bdrv_open_image()
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/vhost_net.c')
0 files changed, 0 insertions, 0 deletions