1 | The following changes since commit 86f4c7e05b1c44dbe1b329a51f311f10aef6ff34: | 1 | The following changes since commit e1e44a9916b4318e943aecd669e096222cb3eaeb: |
---|---|---|---|
2 | 2 | ||
3 | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180302' into staging (2018-03-02 14:37:10 +0000) | 3 | Merge remote-tracking branch 'remotes/xtensa/tags/20180316-xtensa' into staging (2018-03-17 14:15:03 +0000) |
4 | 4 | ||
5 | are available in the git repository at: | 5 | are available in the git repository at: |
6 | 6 | ||
7 | git://repo.or.cz/qemu/kevin.git tags/for-upstream | 7 | git://repo.or.cz/qemu/kevin.git tags/for-upstream |
8 | 8 | ||
9 | for you to fetch changes up to bfe1a14c180ec44c033be12b9151252ffda69292: | 9 | for you to fetch changes up to 63ca8406beac44aa59c389ed8578d0c7b3da3402: |
10 | 10 | ||
11 | block: Fix NULL dereference on empty drive error (2018-03-05 18:45:32 +0100) | 11 | iotests: Avoid realpath, for CentOS 6 (2018-03-19 12:01:39 +0100) |
12 | 12 | ||
13 | ---------------------------------------------------------------- | 13 | ---------------------------------------------------------------- |
14 | Block layer patches | 14 | Block layer patches |
15 | 15 | ||
16 | ---------------------------------------------------------------- | 16 | ---------------------------------------------------------------- |
17 | Alberto Garcia (3): | 17 | Eric Blake (1): |
18 | specs/qcow2: Fix documentation of the compressed cluster descriptor | 18 | iotests: Avoid realpath, for CentOS 6 |
19 | docs: document how to use the l2-cache-entry-size parameter | ||
20 | qcow2: Replace align_offset() with ROUND_UP() | ||
21 | 19 | ||
22 | Anton Nefedov (2): | 20 | Fam Zheng (4): |
23 | block: fix write with zero flag set and iovector provided | 21 | block: Fix flags in reopen queue |
24 | iotest 033: add misaligned write-zeroes test via truncate | 22 | iotests: Add regression test for commit base locking |
23 | vvfat: Fix inherit_options flags | ||
24 | block: Fix leak of ignore_children in error path | ||
25 | 25 | ||
26 | Eric Blake (21): | 26 | Jeff Cody (1): |
27 | block: Add .bdrv_co_block_status() callback | 27 | block: fix iotest 146 output expectations |
28 | nvme: Drop pointless .bdrv_co_get_block_status() | ||
29 | block: Switch passthrough drivers to .bdrv_co_block_status() | ||
30 | file-posix: Switch to .bdrv_co_block_status() | ||
31 | gluster: Switch to .bdrv_co_block_status() | ||
32 | iscsi: Switch cluster_sectors to byte-based | ||
33 | iscsi: Switch iscsi_allocmap_update() to byte-based | ||
34 | iscsi: Switch to .bdrv_co_block_status() | ||
35 | null: Switch to .bdrv_co_block_status() | ||
36 | parallels: Switch to .bdrv_co_block_status() | ||
37 | qcow: Switch to .bdrv_co_block_status() | ||
38 | qcow2: Switch to .bdrv_co_block_status() | ||
39 | qed: Switch to .bdrv_co_block_status() | ||
40 | raw: Switch to .bdrv_co_block_status() | ||
41 | sheepdog: Switch to .bdrv_co_block_status() | ||
42 | vdi: Avoid bitrot of debugging code | ||
43 | vdi: Switch to .bdrv_co_block_status() | ||
44 | vmdk: Switch to .bdrv_co_block_status() | ||
45 | vpc: Switch to .bdrv_co_block_status() | ||
46 | vvfat: Switch to .bdrv_co_block_status() | ||
47 | block: Drop unused .bdrv_co_get_block_status() | ||
48 | 28 | ||
49 | Kevin Wolf (3): | 29 | John Snow (21): |
50 | block: test blk_aio_flush() with blk->root == NULL | 30 | blockjobs: fix set-speed kick |
51 | Merge remote-tracking branch 'mreitz/tags/pull-block-2018-03-02' into queue-block | 31 | blockjobs: model single jobs as transactions |
52 | block: Fix NULL dereference on empty drive error | 32 | Blockjobs: documentation touchup |
33 | blockjobs: add status enum | ||
34 | blockjobs: add state transition table | ||
35 | iotests: add pause_wait | ||
36 | blockjobs: add block_job_verb permission table | ||
37 | blockjobs: add ABORTING state | ||
38 | blockjobs: add CONCLUDED state | ||
39 | blockjobs: add NULL state | ||
40 | blockjobs: add block_job_dismiss | ||
41 | blockjobs: ensure abort is called for cancelled jobs | ||
42 | blockjobs: add commit, abort, clean helpers | ||
43 | blockjobs: add block_job_txn_apply function | ||
44 | blockjobs: add prepare callback | ||
45 | blockjobs: add waiting status | ||
46 | blockjobs: add PENDING status and event | ||
47 | blockjobs: add block-job-finalize | ||
48 | blockjobs: Expose manual property | ||
49 | iotests: test manual job dismissal | ||
50 | tests/test-blockjob: test cancellations | ||
53 | 51 | ||
54 | Max Reitz (4): | 52 | Kevin Wolf (14): |
55 | qemu-img: Make resize error message more general | 53 | luks: Separate image file creation from formatting |
56 | block/ssh: Pull ssh_grow_file() from ssh_create() | 54 | luks: Create block_crypto_co_create_generic() |
57 | block/ssh: Make ssh_grow_file() blocking | 55 | luks: Support .bdrv_co_create |
58 | block/ssh: Add basic .bdrv_truncate() | 56 | luks: Turn invalid assertion into check |
57 | luks: Catch integer overflow for huge sizes | ||
58 | qemu-iotests: Test luks QMP image creation | ||
59 | parallels: Support .bdrv_co_create | ||
60 | qemu-iotests: Enable write tests for parallels | ||
61 | qcow: Support .bdrv_co_create | ||
62 | qed: Support .bdrv_co_create | ||
63 | vdi: Make comments consistent with other drivers | ||
64 | vhdx: Support .bdrv_co_create | ||
65 | vpc: Support .bdrv_co_create | ||
66 | vpc: Require aligned size in .bdrv_co_create | ||
59 | 67 | ||
60 | Stefan Hajnoczi (6): | 68 | Liang Li (1): |
61 | aio: rename aio_context_in_iothread() to in_aio_context_home_thread() | 69 | block/mirror: change the semantic of 'force' of block-job-cancel |
62 | block: extract AIO_WAIT_WHILE() from BlockDriverState | ||
63 | block: add BlockBackend->in_flight counter | ||
64 | Revert "IDE: Do not flush empty CDROM drives" | ||
65 | block: rename .bdrv_create() to .bdrv_co_create_opts() | ||
66 | qcow2: make qcow2_co_create2() a coroutine_fn | ||
67 | 70 | ||
68 | qapi/block-core.json | 6 +- | 71 | Max Reitz (3): |
69 | docs/interop/qcow2.txt | 16 ++++- | 72 | vdi: Pull option parsing from vdi_co_create |
70 | docs/qcow2-cache.txt | 46 ++++++++++++- | 73 | vdi: Move file creation to vdi_co_create_opts |
71 | block/qcow2.h | 6 -- | 74 | vdi: Implement .bdrv_co_create |
72 | include/block/aio-wait.h | 116 ++++++++++++++++++++++++++++++++ | ||
73 | include/block/aio.h | 7 +- | ||
74 | include/block/block.h | 54 ++++----------- | ||
75 | include/block/block_int.h | 61 ++++++++++------- | ||
76 | block.c | 11 ++- | ||
77 | block/blkdebug.c | 20 +++--- | ||
78 | block/block-backend.c | 65 +++++++++++++++--- | ||
79 | block/commit.c | 2 +- | ||
80 | block/crypto.c | 8 +-- | ||
81 | block/file-posix.c | 79 +++++++++++----------- | ||
82 | block/file-win32.c | 5 +- | ||
83 | block/gluster.c | 83 ++++++++++++----------- | ||
84 | block/io.c | 98 +++++++++++---------------- | ||
85 | block/iscsi.c | 164 ++++++++++++++++++++++++--------------------- | ||
86 | block/mirror.c | 2 +- | ||
87 | block/nfs.c | 5 +- | ||
88 | block/null.c | 23 ++++--- | ||
89 | block/nvme.c | 14 ---- | ||
90 | block/parallels.c | 28 +++++--- | ||
91 | block/qcow.c | 32 +++++---- | ||
92 | block/qcow2-bitmap.c | 4 +- | ||
93 | block/qcow2-cluster.c | 4 +- | ||
94 | block/qcow2-refcount.c | 4 +- | ||
95 | block/qcow2-snapshot.c | 10 +-- | ||
96 | block/qcow2.c | 60 +++++++++-------- | ||
97 | block/qed.c | 82 ++++++++--------------- | ||
98 | block/raw-format.c | 21 +++--- | ||
99 | block/rbd.c | 6 +- | ||
100 | block/sheepdog.c | 36 +++++----- | ||
101 | block/ssh.c | 66 +++++++++++++++--- | ||
102 | block/throttle.c | 2 +- | ||
103 | block/vdi.c | 50 +++++++------- | ||
104 | block/vhdx.c | 5 +- | ||
105 | block/vmdk.c | 43 +++++------- | ||
106 | block/vpc.c | 50 +++++++------- | ||
107 | block/vvfat.c | 16 ++--- | ||
108 | hw/ide/core.c | 10 +-- | ||
109 | qemu-img.c | 2 +- | ||
110 | tests/test-block-backend.c | 82 +++++++++++++++++++++++ | ||
111 | util/aio-wait.c | 40 +++++++++++ | ||
112 | tests/Makefile.include | 2 + | ||
113 | tests/qemu-iotests/033 | 29 ++++++++ | ||
114 | tests/qemu-iotests/033.out | 13 ++++ | ||
115 | util/Makefile.objs | 2 +- | ||
116 | 48 files changed, 980 insertions(+), 610 deletions(-) | ||
117 | create mode 100644 include/block/aio-wait.h | ||
118 | create mode 100644 tests/test-block-backend.c | ||
119 | create mode 100644 util/aio-wait.c | ||
120 | 75 | ||
76 | Paolo Bonzini (1): | ||
77 | iscsi: fix iSER compilation | ||
78 | |||
79 | qapi/block-core.json | 363 ++++++++++++++++++++++++++++++++++++++++-- | ||
80 | include/block/blockjob.h | 71 ++++++++- | ||
81 | include/block/blockjob_int.h | 17 +- | ||
82 | block.c | 10 +- | ||
83 | block/backup.c | 5 +- | ||
84 | block/commit.c | 2 +- | ||
85 | block/crypto.c | 150 ++++++++++++----- | ||
86 | block/iscsi.c | 2 +- | ||
87 | block/mirror.c | 12 +- | ||
88 | block/parallels.c | 199 +++++++++++++++++------ | ||
89 | block/qcow.c | 196 +++++++++++++++-------- | ||
90 | block/qed.c | 204 ++++++++++++++++-------- | ||
91 | block/stream.c | 2 +- | ||
92 | block/vdi.c | 147 +++++++++++++---- | ||
93 | block/vhdx.c | 216 +++++++++++++++++++------ | ||
94 | block/vpc.c | 241 +++++++++++++++++++++------- | ||
95 | block/vvfat.c | 2 +- | ||
96 | blockdev.c | 71 +++++++-- | ||
97 | blockjob.c | 358 +++++++++++++++++++++++++++++++++++------ | ||
98 | tests/test-bdrv-drain.c | 5 +- | ||
99 | tests/test-blockjob-txn.c | 27 ++-- | ||
100 | tests/test-blockjob.c | 233 ++++++++++++++++++++++++++- | ||
101 | block/trace-events | 7 + | ||
102 | hmp-commands.hx | 3 +- | ||
103 | tests/qemu-iotests/030 | 6 +- | ||
104 | tests/qemu-iotests/055 | 17 +- | ||
105 | tests/qemu-iotests/056 | 187 ++++++++++++++++++++++ | ||
106 | tests/qemu-iotests/056.out | 4 +- | ||
107 | tests/qemu-iotests/109.out | 24 +-- | ||
108 | tests/qemu-iotests/146.out | 2 +- | ||
109 | tests/qemu-iotests/153 | 12 ++ | ||
110 | tests/qemu-iotests/153.out | 5 + | ||
111 | tests/qemu-iotests/181 | 2 +- | ||
112 | tests/qemu-iotests/210 | 210 ++++++++++++++++++++++++ | ||
113 | tests/qemu-iotests/210.out | 136 ++++++++++++++++ | ||
114 | tests/qemu-iotests/check | 13 +- | ||
115 | tests/qemu-iotests/common.rc | 2 +- | ||
116 | tests/qemu-iotests/group | 1 + | ||
117 | tests/qemu-iotests/iotests.py | 12 +- | ||
118 | 39 files changed, 2652 insertions(+), 524 deletions(-) | ||
119 | create mode 100755 tests/qemu-iotests/210 | ||
120 | create mode 100644 tests/qemu-iotests/210.out | ||
121 | diff view generated by jsdifflib |