[Qemu-devel] [PATCH v17 00/23] block: Image locking series

[Fam Zheng <famz@redhat.com>]

v17: Fixes addressing comments by Kevin:
     - Rebase on top of kevin/block
     - In test case 153, don't compile test program, just try locking=on and
       catch warning message
     - Add a missing space in comment
     - Error out if locking=on is used for file-win
     - Add commit message and Cc qemu-stable for patch 17 (now 18)
     - Don't add duplicated -U in the documentation

v16: Rebase to the latest block-next branch of Kevin.
     Address Kevin's comments:
     - on/off => on/off/auto for file.locking option
     - Add file.locking to QAPI schema
     - Fall back to POSIX file lock if OFD lock not available
     - Print warning when falling back, if locking=on specified
       (This means qemu-io/qemu-img need --image-opts to enable lock)
     - Drop the BLK_PERM_MAX patch and use an alternative
     - Use the 'TEST_IMG="$TEST_IMG.base" _make_test_img ...' idiom
     - Drop reopen callback changes
     - Don't open s->lock_fd if !s->use_lock
     - Use the same open flags for the lock fd
     - Don't leak the returned string for bdrv_perm_names
     - Clear up comment on raw_apply_lock_bytes
     - Improve error message text
     - Pass "0, 0" to raw_handle_perm_lock in raw_abort_perm_update
     - Filter out test dir in reference output
     - Add locking to bdrv_host_device.

v15: Rework a number of things, especially around what and how lockings are
     done.  [Kevin]
     - Map each permission to a locked byte.
     - Make the new option --force-share-perms, and require read-only=on.
     - Update test case 153 accordingly.
     - Only add -U where necessary in iotest 030.
     - Reject -U if conflicting with image opts in qemu-img/qemu-io.

v14: Replace BDRV_ flag with the "force-shared-write" block option. [Kevin]
     Add bs->force_shared_write.
     Update test case accordingly.
     A few fixes in the locking code spotted by patchew and the new test,
     though the long line error is still there for readability.
     Replace the workaround to drive-backup with a real fix in patch 17.

v13: - Address Max's comments.
     - Add reviewed-by from Max and Eric.
     - Rebase for 2.10:
       * Use op blocker API
       * Add --unsafe-read for qemu-img and qemu-io

Fam Zheng (23):
  block: Make bdrv_perm_names public
  block: Add, parse and store "force-share" option
  block: Respect "force-share" in perm propagating
  qemu-img: Add --force-share option to subcommands
  qemu-img: Update documentation for -U
  qemu-io: Add --force-share option
  iotests: 030: Prepare for image locking
  iotests: 046: Prepare for image locking
  iotests: 055: Don't attach the target image already for drive-backup
  iotests: 085: Avoid image locking conflict
  iotests: 087: Don't attach test image twice
  iotests: 091: Quit QEMU before checking image
  iotests: 172: Use separate images for multiple devices
  tests: Use null-co:// instead of /dev/null as the dummy image
  file-posix: Add 'locking' option
  file-win32: Error out if locking=on
  tests: Disable image lock in test-replication
  block: Reuse bs as backing hd for drive-backup sync=none
  osdep: Add qemu_lock_fd and qemu_unlock_fd
  osdep: Fall back to posix lock when OFD lock is unavailable
  file-posix: Add image locking to perm operations
  qemu-iotests: Add test case 153 for image locking
  tests: Add POSIX image locking test case 182

 block.c                    |  51 ++++--
 block/file-posix.c         | 281 +++++++++++++++++++++++++++++++-
 block/file-win32.c         |   5 +
 blockdev.c                 |  15 +-
 include/block/block.h      |   3 +
 include/block/block_int.h  |   1 +
 include/qemu/osdep.h       |   3 +
 qapi/block-core.json       |   7 +
 qemu-img-cmds.hx           |  36 ++---
 qemu-img.c                 | 154 +++++++++++++-----
 qemu-io.c                  |  42 ++++-
 tests/drive_del-test.c     |   2 +-
 tests/nvme-test.c          |   2 +-
 tests/qemu-iotests/030     |  18 +--
 tests/qemu-iotests/046     |   2 +-
 tests/qemu-iotests/055     |  32 ++--
 tests/qemu-iotests/085     |  33 ++--
 tests/qemu-iotests/085.out |   3 +-
 tests/qemu-iotests/087     |   6 +-
 tests/qemu-iotests/091     |   2 +
 tests/qemu-iotests/153     | 233 +++++++++++++++++++++++++++
 tests/qemu-iotests/153.out | 390 +++++++++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/172     |  55 ++++---
 tests/qemu-iotests/172.out |  50 +++---
 tests/qemu-iotests/182     |  73 +++++++++
 tests/qemu-iotests/182.out |   8 +
 tests/qemu-iotests/group   |   2 +
 tests/test-replication.c   |   9 +-
 tests/usb-hcd-uhci-test.c  |   2 +-
 tests/usb-hcd-xhci-test.c  |   2 +-
 tests/virtio-blk-test.c    |   2 +-
 tests/virtio-scsi-test.c   |   5 +-
 util/osdep.c               |  48 ++++++
 33 files changed, 1403 insertions(+), 174 deletions(-)
 create mode 100755 tests/qemu-iotests/153
 create mode 100644 tests/qemu-iotests/153.out
 create mode 100755 tests/qemu-iotests/182
 create mode 100644 tests/qemu-iotests/182.out

-- 
2.9.3