1 | The following changes since commit 2ccad61746ca7de5dd3e25146062264387e43bd4: | 1 | The following changes since commit e1e44a9916b4318e943aecd669e096222cb3eaeb: |
---|---|---|---|
2 | 2 | ||
3 | Merge tag 'pull-tcg-20221109' of https://gitlab.com/rth7680/qemu into staging (2022-11-09 13:26:45 -0500) | 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 | https://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 46530d3560b6fd5de38b6f4e45ce7d7135b9add7: | 9 | for you to fetch changes up to 63ca8406beac44aa59c389ed8578d0c7b3da3402: |
10 | 10 | ||
11 | tests/stream-under-throttle: New test (2022-11-14 11:31:52 +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 | - Fix deadlock in graph modification with iothreads | 16 | ---------------------------------------------------------------- |
17 | - mirror: Fix non-converging cases for active mirror | 17 | Eric Blake (1): |
18 | - qapi: Fix BlockdevOptionsNvmeIoUring @path description | 18 | iotests: Avoid realpath, for CentOS 6 |
19 | - blkio: Set BlockDriver::has_variable_length to false | ||
20 | 19 | ||
21 | ---------------------------------------------------------------- | 20 | Fam Zheng (4): |
22 | Alberto Faria (2): | 21 | block: Fix flags in reopen queue |
23 | qapi/block-core: Fix BlockdevOptionsNvmeIoUring @path description | 22 | iotests: Add regression test for commit base locking |
24 | block/blkio: Set BlockDriver::has_variable_length to false | 23 | vvfat: Fix inherit_options flags |
24 | block: Fix leak of ignore_children in error path | ||
25 | 25 | ||
26 | Hanna Reitz (9): | 26 | Jeff Cody (1): |
27 | block/mirror: Do not wait for active writes | 27 | block: fix iotest 146 output expectations |
28 | block/mirror: Drop mirror_wait_for_any_operation() | ||
29 | block/mirror: Fix NULL s->job in active writes | ||
30 | iotests/151: Test that active mirror progresses | ||
31 | iotests/151: Test active requests on mirror start | ||
32 | block: Make bdrv_child_get_parent_aio_context I/O | ||
33 | block-backend: Update ctx immediately after root | ||
34 | block: Start/end drain on correct AioContext | ||
35 | tests/stream-under-throttle: New test | ||
36 | 28 | ||
37 | qapi/block-core.json | 2 +- | 29 | John Snow (21): |
38 | include/block/block-global-state.h | 1 - | 30 | blockjobs: fix set-speed kick |
39 | include/block/block-io.h | 2 + | 31 | blockjobs: model single jobs as transactions |
40 | include/block/block_int-common.h | 4 +- | 32 | Blockjobs: documentation touchup |
41 | block.c | 2 +- | 33 | blockjobs: add status enum |
42 | block/blkio.c | 1 - | 34 | blockjobs: add state transition table |
43 | block/block-backend.c | 9 +- | 35 | iotests: add pause_wait |
44 | block/io.c | 6 +- | 36 | blockjobs: add block_job_verb permission table |
45 | block/mirror.c | 78 ++++--- | 37 | blockjobs: add ABORTING state |
46 | blockjob.c | 3 +- | 38 | blockjobs: add CONCLUDED state |
47 | tests/qemu-iotests/151 | 227 ++++++++++++++++++++- | 39 | blockjobs: add NULL state |
48 | tests/qemu-iotests/151.out | 4 +- | 40 | blockjobs: add block_job_dismiss |
49 | tests/qemu-iotests/tests/stream-under-throttle | 121 +++++++++++ | 41 | blockjobs: ensure abort is called for cancelled jobs |
50 | tests/qemu-iotests/tests/stream-under-throttle.out | 5 + | 42 | blockjobs: add commit, abort, clean helpers |
51 | 14 files changed, 424 insertions(+), 41 deletions(-) | 43 | blockjobs: add block_job_txn_apply function |
52 | create mode 100755 tests/qemu-iotests/tests/stream-under-throttle | 44 | blockjobs: add prepare callback |
53 | create mode 100644 tests/qemu-iotests/tests/stream-under-throttle.out | 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 | ||
51 | |||
52 | Kevin Wolf (14): | ||
53 | luks: Separate image file creation from formatting | ||
54 | luks: Create block_crypto_co_create_generic() | ||
55 | luks: Support .bdrv_co_create | ||
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 | ||
67 | |||
68 | Liang Li (1): | ||
69 | block/mirror: change the semantic of 'force' of block-job-cancel | ||
70 | |||
71 | Max Reitz (3): | ||
72 | vdi: Pull option parsing from vdi_co_create | ||
73 | vdi: Move file creation to vdi_co_create_opts | ||
74 | vdi: Implement .bdrv_co_create | ||
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 |