| Message ID | 20190604161430.32105-1-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Tue, 4 Jun 2019 at 17:14, Kevin Wolf <kwolf@redhat.com> wrote: > > The following changes since commit e2a58ff493a2e00db3e963c1839c5374500110f2: > > Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2019-06-03 18:26:21 +0100) > > are available in the Git repository at: > > git://repo.or.cz/qemu/kevin.git tags/for-upstream > > for you to fetch changes up to 11ba81c3cde0bc070cced6e8ef2835fab4fe90c8: > > iotests: Fix duplicated diff output on failure (2019-06-04 16:55:58 +0200) > > ---------------------------------------------------------------- > Block layer patches: > > - block: AioContext management, part 2 > - Avoid recursive block_status call (i.e. lseek() calls) if possible > - linux-aio: Drop unused BlockAIOCB submission method > - nvme: add Get/Set Feature Timestamp support > - Fix crash on commit job start with active I/O on base node > - Fix crash in bdrv_drained_end > - Fix integer overflow in qcow2 discard > > ---------------------------------------------------------------- Applied, thanks. Please update the changelog at https://wiki.qemu.org/ChangeLog/4.1 for any user-visible changes. -- PMM
The following changes since commit e2a58ff493a2e00db3e963c1839c5374500110f2: Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2019-06-03 18:26:21 +0100) are available in the Git repository at: git://repo.or.cz/qemu/kevin.git tags/for-upstream for you to fetch changes up to 11ba81c3cde0bc070cced6e8ef2835fab4fe90c8: iotests: Fix duplicated diff output on failure (2019-06-04 16:55:58 +0200) ---------------------------------------------------------------- Block layer patches: - block: AioContext management, part 2 - Avoid recursive block_status call (i.e. lseek() calls) if possible - linux-aio: Drop unused BlockAIOCB submission method - nvme: add Get/Set Feature Timestamp support - Fix crash on commit job start with active I/O on base node - Fix crash in bdrv_drained_end - Fix integer overflow in qcow2 discard ---------------------------------------------------------------- John Snow (1): blockdev: fix missed target unref for drive-backup Julia Suvorova (1): block/linux-aio: Drop unused BlockAIOCB submission method Kenneth Heitke (1): nvme: add Get/Set Feature Timestamp support Kevin Wolf (19): block: Drain source node in bdrv_replace_node() iotests: Test commit job start with concurrent I/O test-block-iothread: Check filter node in test_propagate_mirror nbd-server: Call blk_set_allow_aio_context_change() block: Add Error to blk_set_aio_context() block: Add BlockBackend.ctx block: Add qdev_prop_drive_iothread property type scsi-disk: Use qdev_prop_drive_iothread block: Adjust AioContexts when attaching nodes test-block-iothread: Test adding parent to iothread node test-block-iothread: BlockBackend AioContext across root node change block: Move node without parents to main AioContext blockdev: Use bdrv_try_set_aio_context() for monitor commands block: Remove wrong bdrv_set_aio_context() calls virtio-scsi-test: Test attaching new overlay with iothreads iotests: Attach new devices to node in non-default iothread test-bdrv-drain: Use bdrv_try_set_aio_context() block: Remove bdrv_set_aio_context() iotests: Fix duplicated diff output on failure Max Reitz (2): block/io: Delay decrementing the quiesce_counter iotests: Test cancelling a job and closing the VM Vladimir Sementsov-Ogievskiy (5): tests/perf: Test lseek influence on qcow2 block-status block: avoid recursive block_status call if possible block/qcow2-refcount: add trace-point to qcow2_process_discards block/io: bdrv_pdiscard: support int64_t bytes parameter iotests: test big qcow2 shrink docs/devel/multiple-iothreads.txt | 4 +- block/qcow2.h | 4 + hw/block/nvme.h | 2 + include/block/block.h | 21 ++--- include/block/block_int.h | 1 + include/block/nvme.h | 2 + include/block/raw-aio.h | 3 - include/hw/block/block.h | 7 +- include/hw/qdev-properties.h | 3 + include/hw/scsi/scsi.h | 1 + include/sysemu/block-backend.h | 5 +- tests/libqtest.h | 11 +++ block.c | 79 ++++++++++++----- block/backup.c | 3 +- block/block-backend.c | 47 ++++++---- block/commit.c | 13 +-- block/crypto.c | 3 +- block/io.c | 28 +++--- block/linux-aio.c | 72 +++------------ block/mirror.c | 4 +- block/parallels.c | 3 +- block/qcow.c | 3 +- block/qcow2-refcount.c | 39 ++++++++- block/qcow2.c | 17 +++- block/qed.c | 3 +- block/sheepdog.c | 3 +- block/vdi.c | 3 +- block/vhdx.c | 3 +- block/vmdk.c | 3 +- block/vpc.c | 3 +- blockdev.c | 61 +++++++------ blockjob.c | 12 ++- hmp.c | 3 +- hw/block/dataplane/virtio-blk.c | 12 ++- hw/block/dataplane/xen-block.c | 6 +- hw/block/fdc.c | 2 +- hw/block/nvme.c | 106 +++++++++++++++++++++- hw/block/xen-block.c | 2 +- hw/core/qdev-properties-system.c | 41 ++++++++- hw/ide/qdev.c | 2 +- hw/scsi/scsi-disk.c | 24 +++-- hw/scsi/virtio-scsi.c | 25 +++--- migration/block.c | 3 +- nbd/server.c | 6 +- qemu-img.c | 6 +- tests/libqtest.c | 19 ++++ tests/test-bdrv-drain.c | 50 ++++++----- tests/test-bdrv-graph-mod.c | 5 +- tests/test-block-backend.c | 6 +- tests/test-block-iothread.c | 104 ++++++++++++++++++---- tests/test-blockjob.c | 2 +- tests/test-throttle.c | 6 +- tests/virtio-scsi-test.c | 63 ++++++++++++++ block/trace-events | 3 + hw/block/trace-events | 2 + tests/perf/block/qcow2/convert-blockstatus | 71 +++++++++++++++ tests/qemu-iotests/051 | 24 +++++ tests/qemu-iotests/051.out | 3 + tests/qemu-iotests/051.pc.out | 27 ++++++ tests/qemu-iotests/102 | 2 +- tests/qemu-iotests/102.out | 3 +- tests/qemu-iotests/141.out | 2 +- tests/qemu-iotests/144.out | 2 +- tests/qemu-iotests/240 | 21 +++++ tests/qemu-iotests/240.out | 15 +++- tests/qemu-iotests/250 | 78 +++++++++++++++++ tests/qemu-iotests/250.out | 16 ++++ tests/qemu-iotests/255 | 135 +++++++++++++++++++++++++++++ tests/qemu-iotests/255.out | 40 +++++++++ tests/qemu-iotests/check | 1 - tests/qemu-iotests/group | 2 + tests/qemu-iotests/iotests.py | 10 ++- 72 files changed, 1144 insertions(+), 272 deletions(-) create mode 100755 tests/perf/block/qcow2/convert-blockstatus create mode 100755 tests/qemu-iotests/250 create mode 100644 tests/qemu-iotests/250.out create mode 100755 tests/qemu-iotests/255 create mode 100644 tests/qemu-iotests/255.out