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 (21):
block: Make bdrv_perm_names public
block: Define BLK_PERM_MAX
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
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
file-posix: Add image locking to perm operations
qemu-iotests: Add test case 153 for image locking
block.c | 51 ++++--
block/file-posix.c | 272 ++++++++++++++++++++++++++++++-
blockdev.c | 15 +-
include/block/block.h | 5 +
include/block/block_int.h | 1 +
include/qemu/osdep.h | 3 +
qapi/block-core.json | 3 +
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 | 34 ++--
tests/qemu-iotests/085.out | 3 +-
tests/qemu-iotests/087 | 6 +-
tests/qemu-iotests/091 | 2 +
tests/qemu-iotests/153 | 220 +++++++++++++++++++++++++
tests/qemu-iotests/153.out | 390 +++++++++++++++++++++++++++++++++++++++++++++
tests/qemu-iotests/172 | 55 ++++---
tests/qemu-iotests/172.out | 50 +++---
tests/qemu-iotests/group | 1 +
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 ++++++
30 files changed, 1291 insertions(+), 176 deletions(-)
create mode 100755 tests/qemu-iotests/153
create mode 100644 tests/qemu-iotests/153.out
--
2.9.3
