diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-02-25 10:50:11 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-02-25 10:50:11 +0000 |
| commit | e7a1d6c52a3ac6e76e5653c830b2545e0a4043d3 (patch) | |
| tree | c79235495674ca3dceded77db7224e54419f6f61 /block/Makefile.objs | |
| parent | c58e291591dbc1c846fa152d4792554803405ebb (diff) | |
| parent | 6141f3bd6904df7cf9519c6444a14a608b9874c4 (diff) | |
| download | qemu-e7a1d6c52a3ac6e76e5653c830b2545e0a4043d3.tar.gz qemu-e7a1d6c52a3ac6e76e5653c830b2545e0a4043d3.tar.bz2 qemu-e7a1d6c52a3ac6e76e5653c830b2545e0a4043d3.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block patches
# gpg: Signature made Fri 21 Feb 2014 21:42:24 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream: (54 commits)
iotests: Mixed quorum child device specifications
quorum: Simplify quorum_open()
quorum: Add unit test.
quorum: Add quorum_open() and quorum_close().
quorum: Implement recursive .bdrv_recurse_is_first_non_filter in quorum.
quorum: Add quorum_co_flush().
quorum: Add quorum_invalidate_cache().
quorum: Add quorum_getlength().
quorum: Add quorum mechanism.
quorum: Add quorum_aio_readv.
blkverify: Extract qemu_iovec_clone() and qemu_iovec_compare() from blkverify.
quorum: Add quorum_aio_writev and its dependencies.
quorum: Create BDRVQuorumState and BlkDriver and do init.
quorum: Create quorum.c, add QuorumChildRequest and QuorumAIOCB.
check-qdict: Test termination of qdict_array_split()
check-qdict: Adjust test for qdict_array_split()
qdict: Extract non-QDicts in qdict_array_split()
qemu-config: Sections must consist of keys
qemu-iotests: Check qemu-img command line parsing
qemu-img: Allow -o help with incomplete argument list
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/Makefile.objs')
| -rw-r--r-- | block/Makefile.objs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/Makefile.objs b/block/Makefile.objs index 673aa7c8c9..fd88c03ece 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -3,6 +3,7 @@ block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o qcow2-c block-obj-y += qed.o qed-gencb.o qed-l2-cache.o qed-table.o qed-cluster.o block-obj-y += qed-check.o block-obj-$(CONFIG_VHDX) += vhdx.o vhdx-endian.o vhdx-log.o +block-obj-$(CONFIG_QUORUM) += quorum.o block-obj-y += parallels.o blkdebug.o blkverify.o block-obj-y += snapshot.o qapi.o block-obj-$(CONFIG_WIN32) += raw-win32.o win32-aio.o |