|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [qemu-xen master] Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
commit c46ef897dbb75590af94b6e3dca6a9c5f9a1ea1e
Merge: 39542105bbb19c690219d2f22844d8dfbd9bba05
d8996368106fbf133a6e52561a34f6d0f5080446
Author: Peter Maydell <peter.maydell@xxxxxxxxxx>
AuthorDate: Tue Nov 1 14:27:05 2016 +0000
Commit: Peter Maydell <peter.maydell@xxxxxxxxxx>
CommitDate: Tue Nov 1 14:27:05 2016 +0000
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into
staging
# gpg: Signature made Tue 01 Nov 2016 12:47:36 GMT
# gpg: using RSA key 0xBDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@xxxxxxxxxx>"
# gpg: aka "Jeffrey Cody <jeff@xxxxxxxxxxxxx>"
# gpg: aka "Jeffrey Cody <codyprime@xxxxxxxxx>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE
3057
* remotes/cody/tags/block-pull-request:
blockjobs: fix documentation
blockjobs: split interface into public/private, Part 1
Blockjobs: Internalize user_pause logic
blockjob: centralize QMP event emissions
Replication/Blockjobs: Create replication jobs as internal
blockjobs: Allow creating internal jobs
blockjobs: hide internal jobs from management API
block/gluster: fix port type in the QAPI options list
block/gluster: improve defense over string to int conversion
block: Turn on "unmap" in active commit
block/gluster: memory usage: use one glfs instance per volume
block: add gluster ifdef guard checks for SEEK_DATA/SEEK_HOLE support
rbd: make the code more readable
qapi: add release designator to gluster logfile option
Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>
block/backup.c | 5 +-
block/commit.c | 10 +-
block/gluster.c | 124 +++++++++++++++++----
block/mirror.c | 30 +++--
block/rbd.c | 25 ++---
block/replication.c | 14 +--
block/stream.c | 9 +-
block/trace-events | 5 +-
blockdev.c | 74 +++++--------
blockjob.c | 113 +++++++++++++++----
include/block/block.h | 3 +-
include/block/block_int.h | 26 ++---
include/block/blockjob.h | 256 +++++++------------------------------------
include/block/blockjob_int.h | 239 ++++++++++++++++++++++++++++++++++++++++
qapi/block-core.json | 2 +-
qemu-img.c | 5 +-
tests/test-blockjob-txn.c | 5 +-
tests/test-blockjob.c | 4 +-
18 files changed, 568 insertions(+), 381 deletions(-)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |