| 1 | The following changes since commit 138d2931979cb7ee4a54a434a54088231f6980ff: | 1 | The following changes since commit 13356edb87506c148b163b8c7eb0695647d00c2a: |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20210308' into staging (2021-03-08 11:57:36 +0000) | 3 | Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu into staging (2023-01-24 09:45:33 +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 | https://repo.or.cz/qemu/kevin.git tags/for-upstream |
| 8 | 8 | ||
| 9 | for you to fetch changes up to ef2e38a1a1d2915b148c4a49f61626e62c46fbb6: | 9 | for you to fetch changes up to 1fb9d23f06e0eea297fd57ac62f0fa9efbce865f: |
| 10 | 10 | ||
| 11 | blockdev: Clarify error messages pertaining to 'node-name' (2021-03-08 14:56:55 +0100) | 11 | qemu-img: Change info key names for protocol nodes (2023-01-24 18:40:18 +0100) |
| 12 | |||
| 13 | v3: | ||
| 14 | - Make the compiler happier on BSD and CentOS Stream 8 | ||
| 15 | |||
| 16 | v2: | ||
| 17 | - Rebased to resolve merge conflicts in coroutine.h | ||
| 12 | 18 | ||
| 13 | ---------------------------------------------------------------- | 19 | ---------------------------------------------------------------- |
| 14 | Block layer patches: | 20 | Block layer patches |
| 15 | 21 | ||
| 16 | - qemu-storage-daemon: add --pidfile option | 22 | - qemu-img info: Show protocol-level information |
| 17 | - qemu-storage-daemon: CLI error messages include the option name now | 23 | - Move more functions to coroutines |
| 18 | - vhost-user-blk export: Misc fixes | 24 | - Make coroutine annotations ready for static analysis |
| 19 | - docs: Improvements for qemu-storage-daemon documentation | 25 | - qemu-img: Fix exit code for errors closing the image |
| 20 | - parallels: load bitmap extension | 26 | - qcow2 bitmaps: Fix theoretical corruption in error path |
| 21 | - backup-top: Don't crash on post-finalize accesses | 27 | - pflash: Only load non-zero parts of backend image to save memory |
| 22 | - Improve error messages related to node-name options | 28 | - Code cleanup and test case improvements |
| 23 | - iotests improvements | ||
| 24 | 29 | ||
| 25 | ---------------------------------------------------------------- | 30 | ---------------------------------------------------------------- |
| 26 | Alberto Garcia (1): | 31 | Alberto Faria (2): |
| 27 | iotests: Drop deprecated 'props' from object-add | 32 | coroutine: annotate coroutine_fn for libclang |
| 33 | block: Add no_coroutine_fn and coroutine_mixed_fn marker | ||
| 28 | 34 | ||
| 29 | Connor Kuehl (2): | 35 | Emanuele Giuseppe Esposito (14): |
| 30 | block: Clarify error messages pertaining to 'node-name' | 36 | block-coroutine-wrapper: support void functions |
| 31 | blockdev: Clarify error messages pertaining to 'node-name' | 37 | block: Convert bdrv_io_plug() to co_wrapper |
| 38 | block: Convert bdrv_io_unplug() to co_wrapper | ||
| 39 | block: Convert bdrv_is_inserted() to co_wrapper | ||
| 40 | block: Rename refresh_total_sectors to bdrv_refresh_total_sectors | ||
| 41 | block: Convert bdrv_refresh_total_sectors() to co_wrapper_mixed | ||
| 42 | block-backend: use bdrv_getlength instead of blk_getlength | ||
| 43 | block: use bdrv_co_refresh_total_sectors when possible | ||
| 44 | block: Convert bdrv_get_allocated_file_size() to co_wrapper | ||
| 45 | block: Convert bdrv_get_info() to co_wrapper_mixed | ||
| 46 | block: Convert bdrv_eject() to co_wrapper | ||
| 47 | block: Convert bdrv_lock_medium() to co_wrapper | ||
| 48 | block: Convert bdrv_debug_event() to co_wrapper_mixed | ||
| 49 | block: Rename bdrv_load/save_vmstate() to bdrv_co_load/save_vmstate() | ||
| 32 | 50 | ||
| 33 | Eric Blake (1): | 51 | Hanna Reitz (12): |
| 34 | iotests: Fix up python style in 300 | 52 | block: Improve empty format-specific info dump |
| 53 | block/file: Add file-specific image info | ||
| 54 | block/vmdk: Change extent info type | ||
| 55 | block: Split BlockNodeInfo off of ImageInfo | ||
| 56 | qemu-img: Use BlockNodeInfo | ||
| 57 | block/qapi: Let bdrv_query_image_info() recurse | ||
| 58 | block/qapi: Introduce BlockGraphInfo | ||
| 59 | block/qapi: Add indentation to bdrv_node_info_dump() | ||
| 60 | iotests: Filter child node information | ||
| 61 | iotests/106, 214, 308: Read only one size line | ||
| 62 | qemu-img: Let info print block graph | ||
| 63 | qemu-img: Change info key names for protocol nodes | ||
| 35 | 64 | ||
| 36 | Kevin Wolf (1): | 65 | Kevin Wolf (4): |
| 37 | docs: qsd: Explain --export nbd,name=... default | 66 | qcow2: Fix theoretical corruption in store_bitmap() error path |
| 38 | 67 | qemu-img commit: Report errors while closing the image | |
| 39 | Max Reitz (3): | 68 | qemu-img bitmap: Report errors while closing the image |
| 40 | backup: Remove nodes from job in .clean() | 69 | qemu-iotests: Test qemu-img bitmap/commit exit code on error |
| 41 | backup-top: Refuse I/O in inactive state | ||
| 42 | iotests/283: Check that finalize drops backup-top | ||
| 43 | 70 | ||
| 44 | Paolo Bonzini (2): | 71 | Paolo Bonzini (2): |
| 45 | storage-daemon: report unexpected arguments on the fly | 72 | qemu-io: do not reinvent the blk_pwrite_zeroes wheel |
| 46 | storage-daemon: include current command line option in the errors | 73 | block: remove bdrv_coroutine_enter |
| 47 | 74 | ||
| 48 | Stefan Hajnoczi (12): | 75 | Philippe Mathieu-Daudé (1): |
| 49 | qemu-storage-daemon: add --pidfile option | 76 | block/nbd: Add missing <qemu/bswap.h> include |
| 50 | docs: show how to spawn qemu-storage-daemon with fd passing | ||
| 51 | docs: replace insecure /tmp examples in qsd docs | ||
| 52 | vhost-user-blk: fix blkcfg->num_queues endianness | ||
| 53 | libqtest: add qtest_socket_server() | ||
| 54 | libqtest: add qtest_kill_qemu() | ||
| 55 | libqtest: add qtest_remove_abrt_handler() | ||
| 56 | block/export: fix blk_size double byteswap | ||
| 57 | block/export: use VIRTIO_BLK_SECTOR_BITS | ||
| 58 | block/export: fix vhost-user-blk export sector number calculation | ||
| 59 | block/export: port virtio-blk discard/write zeroes input validation | ||
| 60 | block/export: port virtio-blk read/write range check | ||
| 61 | 77 | ||
| 62 | Stefano Garzarella (1): | 78 | Thomas Huth (2): |
| 63 | blockjob: report a better error message | 79 | tests/qemu-iotests/312: Mark "quorum" as required driver |
| 80 | tests/qemu-iotests/262: Check for availability of "blkverify" first | ||
| 64 | 81 | ||
| 65 | Vladimir Sementsov-Ogievskiy (7): | 82 | Xiang Zheng (1): |
| 66 | qcow2-bitmap: make bytes_covered_by_bitmap_cluster() public | 83 | pflash: Only read non-zero parts of backend image |
| 67 | parallels.txt: fix bitmap L1 table description | ||
| 68 | block/parallels: BDRVParallelsState: add cluster_size field | ||
| 69 | parallels: support bitmap extension for read-only mode | ||
| 70 | iotests.py: add unarchive_sample_image() helper | ||
| 71 | iotests: add parallels-read-bitmap test | ||
| 72 | MAINTAINERS: update parallels block driver | ||
| 73 | 84 | ||
| 74 | docs/interop/parallels.txt | 28 +- | 85 | qapi/block-core.json | 123 +++++++- |
| 75 | docs/tools/qemu-storage-daemon.rst | 68 ++++- | 86 | include/block/block-common.h | 11 +- |
| 76 | block/parallels.h | 7 +- | 87 | include/block/block-io.h | 41 ++- |
| 77 | include/block/dirty-bitmap.h | 2 + | 88 | include/block/block_int-common.h | 26 +- |
| 78 | tests/qtest/libqos/libqtest.h | 37 +++ | 89 | include/block/block_int-io.h | 5 +- |
| 79 | block.c | 8 +- | 90 | include/block/nbd.h | 1 + |
| 80 | block/backup-top.c | 10 + | 91 | include/block/qapi.h | 14 +- |
| 81 | block/backup.c | 1 + | 92 | include/qemu/osdep.h | 44 +++ |
| 82 | block/dirty-bitmap.c | 13 + | 93 | include/sysemu/block-backend-io.h | 31 +- |
| 83 | block/export/vhost-user-blk-server.c | 150 +++++++++-- | 94 | block.c | 88 +++--- |
| 84 | block/parallels-ext.c | 300 +++++++++++++++++++++ | 95 | block/blkdebug.c | 11 +- |
| 85 | block/parallels.c | 26 +- | 96 | block/blkio.c | 15 +- |
| 86 | block/qcow2-bitmap.c | 16 +- | 97 | block/blklogwrites.c | 6 +- |
| 87 | blockdev.c | 13 +- | 98 | block/blkreplay.c | 6 +- |
| 88 | blockjob.c | 10 +- | 99 | block/blkverify.c | 6 +- |
| 89 | hw/block/vhost-user-blk.c | 7 +- | 100 | block/block-backend.c | 38 +-- |
| 90 | storage-daemon/qemu-storage-daemon.c | 56 +++- | 101 | block/commit.c | 4 +- |
| 91 | tests/qtest/libqtest.c | 82 ++++-- | 102 | block/copy-on-read.c | 18 +- |
| 92 | tests/qemu-iotests/iotests.py | 10 + | 103 | block/crypto.c | 14 +- |
| 93 | MAINTAINERS | 3 + | 104 | block/curl.c | 10 +- |
| 94 | block/meson.build | 3 +- | 105 | block/file-posix.c | 137 +++++---- |
| 95 | tests/qemu-iotests/030 | 4 +- | 106 | block/file-win32.c | 18 +- |
| 96 | tests/qemu-iotests/040 | 4 +- | 107 | block/filter-compress.c | 20 +- |
| 97 | tests/qemu-iotests/051.pc.out | 6 +- | 108 | block/gluster.c | 23 +- |
| 98 | tests/qemu-iotests/081.out | 2 +- | 109 | block/io.c | 76 ++--- |
| 99 | tests/qemu-iotests/085.out | 6 +- | 110 | block/iscsi.c | 17 +- |
| 100 | tests/qemu-iotests/087 | 8 +- | 111 | block/mirror.c | 6 +- |
| 101 | tests/qemu-iotests/087.out | 2 +- | 112 | block/monitor/block-hmp-cmds.c | 2 +- |
| 102 | tests/qemu-iotests/184 | 18 +- | 113 | block/nbd.c | 8 +- |
| 103 | tests/qemu-iotests/206.out | 2 +- | 114 | block/nfs.c | 4 +- |
| 104 | tests/qemu-iotests/210.out | 2 +- | 115 | block/null.c | 13 +- |
| 105 | tests/qemu-iotests/211.out | 2 +- | 116 | block/nvme.c | 14 +- |
| 106 | tests/qemu-iotests/212.out | 2 +- | 117 | block/preallocate.c | 16 +- |
| 107 | tests/qemu-iotests/213.out | 2 +- | 118 | block/qapi.c | 317 ++++++++++++++++----- |
| 108 | tests/qemu-iotests/218 | 2 +- | 119 | block/qcow.c | 5 +- |
| 109 | tests/qemu-iotests/223.out | 4 +- | 120 | block/qcow2-bitmap.c | 5 +- |
| 110 | tests/qemu-iotests/235 | 2 +- | 121 | block/qcow2-refcount.c | 2 +- |
| 111 | tests/qemu-iotests/237.out | 2 +- | 122 | block/qcow2.c | 17 +- |
| 112 | tests/qemu-iotests/245 | 14 +- | 123 | block/qed.c | 11 +- |
| 113 | tests/qemu-iotests/249.out | 2 +- | 124 | block/quorum.c | 8 +- |
| 114 | tests/qemu-iotests/258 | 6 +- | 125 | block/raw-format.c | 25 +- |
| 115 | tests/qemu-iotests/258.out | 4 +- | 126 | block/rbd.c | 9 +- |
| 116 | tests/qemu-iotests/283 | 53 ++++ | 127 | block/replication.c | 6 +- |
| 117 | tests/qemu-iotests/283.out | 15 ++ | 128 | block/ssh.c | 4 +- |
| 118 | tests/qemu-iotests/295 | 2 +- | 129 | block/throttle.c | 6 +- |
| 119 | tests/qemu-iotests/296 | 2 +- | 130 | block/vdi.c | 7 +- |
| 120 | tests/qemu-iotests/300 | 14 +- | 131 | block/vhdx.c | 5 +- |
| 121 | .../sample_images/parallels-with-bitmap.bz2 | Bin 0 -> 203 bytes | 132 | block/vmdk.c | 22 +- |
| 122 | .../sample_images/parallels-with-bitmap.sh | 51 ++++ | 133 | block/vpc.c | 5 +- |
| 123 | tests/qemu-iotests/tests/parallels-read-bitmap | 55 ++++ | 134 | blockdev.c | 8 +- |
| 124 | tests/qemu-iotests/tests/parallels-read-bitmap.out | 6 + | 135 | hw/block/block.c | 36 ++- |
| 125 | 51 files changed, 969 insertions(+), 175 deletions(-) | 136 | hw/scsi/scsi-disk.c | 5 + |
| 126 | create mode 100644 block/parallels-ext.c | 137 | qemu-img.c | 100 +++++-- |
| 127 | create mode 100644 tests/qemu-iotests/sample_images/parallels-with-bitmap.bz2 | 138 | qemu-io-cmds.c | 62 +--- |
| 128 | create mode 100755 tests/qemu-iotests/sample_images/parallels-with-bitmap.sh | 139 | tests/unit/test-block-iothread.c | 3 + |
| 129 | create mode 100755 tests/qemu-iotests/tests/parallels-read-bitmap | 140 | scripts/block-coroutine-wrapper.py | 20 +- |
| 130 | create mode 100644 tests/qemu-iotests/tests/parallels-read-bitmap.out | 141 | tests/qemu-iotests/iotests.py | 18 +- |
| 142 | block/meson.build | 1 + | ||
| 143 | tests/qemu-iotests/065 | 2 +- | ||
| 144 | tests/qemu-iotests/106 | 4 +- | ||
| 145 | tests/qemu-iotests/214 | 6 +- | ||
| 146 | tests/qemu-iotests/262 | 3 +- | ||
| 147 | tests/qemu-iotests/302.out | 5 + | ||
| 148 | tests/qemu-iotests/308 | 4 +- | ||
| 149 | tests/qemu-iotests/312 | 1 + | ||
| 150 | tests/qemu-iotests/common.filter | 22 +- | ||
| 151 | tests/qemu-iotests/common.rc | 22 +- | ||
| 152 | tests/qemu-iotests/tests/qemu-img-close-errors | 95 ++++++ | ||
| 153 | tests/qemu-iotests/tests/qemu-img-close-errors.out | 23 ++ | ||
| 154 | 69 files changed, 1208 insertions(+), 552 deletions(-) | ||
| 155 | create mode 100755 tests/qemu-iotests/tests/qemu-img-close-errors | ||
| 156 | create mode 100644 tests/qemu-iotests/tests/qemu-img-close-errors.out | ||
| 131 | 157 | ||
| 132 | 158 | diff view generated by jsdifflib |