qcow2: Let check -r all repair some snapshot bits
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v3 Latest16 patches 9 repliesIn review
- v216 patches 19 repliesSuperseded
- v113 patches 24 repliesSuperseded
Patches in v3 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/16 | include: Move endof() up from hw/virtio/virtio.hhw/ hw/ include/ +1 more | +14 | 0 replies | |
| 2/16 | qcow2: Use endof()block/ | +4 | 0 replies | |
| 3/16 | qcow2: Add Error ** to qcow2_read_snapshots()block/ block/ block/ | +8 | 0 replies | |
| 4/16 | qcow2: Keep unknown extra snapshot datablock/ block/ | +56 | 2 replies | |
| 5/16 | qcow2: Make qcow2_write_snapshots() publicblock/ block/ | +2 | 0 replies | |
| 6/16 | qcow2: Put qcow2_upgrade() into its own functionblock/ | +38 | 0 replies | |
| 7/16 | qcow2: Write v3-compliant snapshot list on upgradeblock/ | +30 | 4 replies | |
| 8/16 | qcow2: Separate qcow2_check_read_snapshot_table()block/ block/ block/ | +120 | 0 replies | |
| 9/16 | qcow2: Add qcow2_check_fix_snapshot_table()block/ block/ block/ | +36 | 0 replies | |
| 10/16 | qcow2: Fix broken snapshot table entriesblock/ | +56 | 0 replies | |
| 11/16 | qcow2: Keep track of the snapshot table lengthblock/ | +13 | 0 replies | |
| 12/16 | qcow2: Fix overly long snapshot tablesblock/ | +78 | 0 replies | |
| 13/16 | qcow2: Repair snapshot table with too many entriesblock/ | +14 | 1 reply | |
| 14/16 | qcow2: Fix v3 snapshot table entry compliancyblock/ | +18 | 1 reply | |
| 15/16 | iotests: Add peek_file* functionstests/ | +20 | 0 replies | |
| 16/16 | iotests: Test qcow2's snapshot table handlingtests/ tests/ tests/ | +870 | 0 replies |
Reviews trailers per patch
All 16 patches have a Reviewed-by or Acked-by.
| Patch | Eric Blake |
|---|---|
| 1/16 | R-b |
| 2/16 | R-b |
| 3/16 | R-b |
| 4/16 | R-b |
| 5/16 | R-b |
| 6/16 | R-b |
| 7/16 | R-b |
| 8/16 | R-b |
| 9/16 | R-b |
| 10/16 | R-b |
| 11/16 | R-b |
| 12/16 | R-b |
| 13/16 | R-b |
| 14/16 | R-b |
| 15/16 | R-b |
| 16/16 | R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v3 00/16] qcow2: Let check -r all repair some snapshot bits
Hi,
The v1 cover letter explained this series’s purpose:
https://lists.nongnu.org/archive/html/qemu-block/2019-07/msg01290.html
The v2 cover letter explained the v2 changes:
https://lists.nongnu.org/archive/html/qemu-block/2019-08/msg00921.html
The only changes in v3 are:
- Patches 12 and 13: Added notes to the commit messages why it’s OK to not let the user choose which snapshots to drop
(I wanted to also address Eric’s idea of letting QCowSnapshot.extra_data_size be always >= sizeof(QCowSnapshotExtraData) and thus save the MAX(sizeof(extra), sn->extra_data_size) in qcow2_write_snapshots(), but that doesn’t really work, because then we have no way of knowing later whether the image is compliant and thus needs fixing or not. He gave me an R-b anyway, so I guess it’s fine. O:-))
This series now has R-bs from Eric on all patches. I’m only posting it because I felt a bit bad about just taking the series as-is and add the commit notes to 12 and 13 while applying it.
(Also, maybe there is someone who saw me have a bit of discussion with Eric and thus assumed I would definitely send a v3 that they could then review.)
Max Reitz (16):
include: Move endof() up from hw/virtio/virtio.h
qcow2: Use endof()
qcow2: Add Error ** to qcow2_read_snapshots()
qcow2: Keep unknown extra snapshot data
qcow2: Make qcow2_write_snapshots() public
qcow2: Put qcow2_upgrade() into its own function
qcow2: Write v3-compliant snapshot list on upgrade
qcow2: Separate qcow2_check_read_snapshot_table()
qcow2: Add qcow2_check_fix_snapshot_table()
qcow2: Fix broken snapshot table entries
qcow2: Keep track of the snapshot table length
qcow2: Fix overly long snapshot tables
qcow2: Repair snapshot table with too many entries
qcow2: Fix v3 snapshot table entry compliancy
iotests: Add peek_file* functions
iotests: Test qcow2's snapshot table handling
block/qcow2.h | 15 +- include/hw/virtio/virtio.h | 7 - include/qemu/compiler.h | 7 + block/qcow2-snapshot.c | 323 +++++++++++++++++++-- block/qcow2.c | 155 +++++++++-- hw/block/virtio-blk.c | 4 +- hw/net/virtio-net.c | 10 +- tests/qemu-iotests/261 | 523 +++++++++++++++++++++++++++++++++++ tests/qemu-iotests/261.out | 346 +++++++++++++++++++++++ tests/qemu-iotests/common.rc | 20 ++ tests/qemu-iotests/group | 1 + 11 files changed, 1354 insertions(+), 57 deletions(-) create mode 100755 tests/qemu-iotests/261 create mode 100644 tests/qemu-iotests/261.out
Signature · 1 line
2.21.0