Skip to content

qcow2: External data files

Kevin Wolf qemu-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest20 patches 9 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/20qemu-iotests: Test qcow2 preallocation modestests/qemu-iotests/243 tests/qemu-iotests/243.out tests/qemu-iotests/group+90 -01 reply
2/20qcow2: Simplify preallocation codeblock/qcow2.c+1 -270 replies
3/20qcow2: Extend spec for external data filesdocs/interop/qcow2.txt+34 -47 replies
4/20qcow2: Basic definitions for external data filesblock/qcow2.c block/qcow2.h tests/qemu-iotests/031.out +2 more+44 -230 replies
5/20qcow2: Pass bs to qcow2_get_cluster_type()block/qcow2-cluster.c block/qcow2-refcount.c block/qcow2.h+26 -240 replies
6/20qcow2: Prepare qcow2_get_cluster_type() for external data fileblock/qcow2.h+9 -10 replies
7/20qcow2: Prepare count_contiguous_clusters() for external data fileblock/qcow2-cluster.c+2 -20 replies
8/20qcow2: Don't assume 0 is an invalid cluster offsetblock/qcow2-cluster.c block/qcow2.h+29 -320 replies
9/20qcow2: Return 0/-errno in qcow2_alloc_compressed_cluster_offset()block/qcow2-cluster.c block/qcow2.c block/qcow2.h +1 more+26 -300 replies
10/20qcow2: Prepare qcow2_co_block_status() for data fileblock/qcow2.c+2 -20 replies
11/20qcow2: External file I/Oblock/qcow2-bitmap.c block/qcow2-cache.c block/qcow2-cluster.c +4 more+122 -370 replies
12/20qcow2: Return error for snapshot operation with data fileblock/qcow2-snapshot.c+15 -00 replies
13/20qcow2: Support external data file in qemu-img checkblock/qcow2-refcount.c+30 -110 replies
14/20qcow2: Add basic data-file infrastructureblock/qcow2.c block/qcow2.h qapi/block-core.json+41 -40 replies
15/20qcow2: Creating images with external data fileblock/qcow2.c include/block/block_int.h qapi/block-core.json+31 -00 replies
16/20qcow2: Store data file name in the imageblock/qcow2.c block/qcow2.h qapi/block-core.json +1 more+128 -20 replies
17/20qcow2: Implement data-file-raw create optionblock/qcow2-cluster.c block/qcow2.c block/qcow2.h +3 more+109 -30 replies
18/20qemu-iotests: Preallocation with external data filetests/qemu-iotests/243 tests/qemu-iotests/243.out+54 -00 replies
19/20qemu-iotests: General tests for qcow2 with external data filetests/qemu-iotests/244 tests/qemu-iotests/244.out tests/qemu-iotests/group+326 -00 replies
20/20qemu-iotests: amend with external data filetests/qemu-iotests/061 tests/qemu-iotests/061.out+133 -10 replies

Reviews trailers per patch

1 of 20 patches has a Reviewed-by or Acked-by.

PatchEric Blake
1/20R-b
2/20
3/20
4/20
5/20
6/20
7/20
8/20
9/20
10/20
11/20
12/20
13/20
14/20
15/20
16/20
17/20
18/20
19/20
20/20

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [Qemu-devel] [PATCH 00/20] qcow2: External data files

There are use cases where raw images are given (e.g. existing physical disks), but advanced features like dirty bitmaps or backing files are wanted that require use of a proper image format like qcow2.

This series adds an incompatible feature bit to qcow2 which allows to use an external data file: Metadata is kept in the qcow2 file like usual, but guest data is written to an external file. Clusters in the data file are not reference counted, instead we use a flat layout where host cluster offset == guest cluster offset. The external data file is therefore readable as a raw image (though writing to it invalidates the associated qcow2 metadata). Features that require refcounting such as internal snapshots or compression are not supposed in such setups.

Major changes since the RFC (many more minor changes):

- Added a 'data-file-raw' flag to the spec to keep the data file a valid self-consistent raw image (write_zeroes must always be propagated)
- Added QAPI documentation
- Added some test cases
- Implemented data file support or error paths for discard, check, compressed writes, snapshots
- Fixed qcow2_co_block_status()
- Rearranged qcow2_do_open() code for data files for better error handling (e.g. no more fallback to default data file if an explicit, but invalid data-file option is given)

git-backport-diff compared to the RFC:

Key:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively

001/20:[down] 'qemu-iotests: Test qcow2 preallocation modes' 002/20:[down] 'qcow2: Simplify preallocation code'
003/20:[0027] [FC] 'qcow2: Extend spec for external data files' 004/20:[0014] [FC] 'qcow2: Basic definitions for external data files' 005/20:[----] [--] 'qcow2: Pass bs to qcow2_get_cluster_type()' 006/20:[----] [--] 'qcow2: Prepare qcow2_get_cluster_type() for external data file' 007/20:[----] [--] 'qcow2: Prepare count_contiguous_clusters() for external data file' 008/20:[----] [--] 'qcow2: Don't assume 0 is an invalid cluster offset' 009/20:[down] 'qcow2: Return 0/-errno in qcow2_alloc_compressed_cluster_offset()' 010/20:[down] 'qcow2: Prepare qcow2_co_block_status() for data file' 011/20:[0024] [FC] 'qcow2: External file I/O'
012/20:[down] 'qcow2: Return error for snapshot operation with data file' 013/20:[down] 'qcow2: Support external data file in qemu-img check' 014/20:[0035] [FC] 'qcow2: Add basic data-file infrastructure' 015/20:[0003] [FC] 'qcow2: Creating images with external data file' 016/20:[0057] [FC] 'qcow2: Store data file name in the image' 017/20:[down] 'qcow2: Implement data-file-raw create option' 018/20:[down] 'qemu-iotests: Preallocation with external data file' 019/20:[down] 'qemu-iotests: General tests for qcow2 with external data file' 020/20:[down] 'qemu-iotests: amend with external data file'

Kevin Wolf (20):
qemu-iotests: Test qcow2 preallocation modes
qcow2: Simplify preallocation code
qcow2: Extend spec for external data files
qcow2: Basic definitions for external data files
qcow2: Pass bs to qcow2_get_cluster_type()
qcow2: Prepare qcow2_get_cluster_type() for external data file
qcow2: Prepare count_contiguous_clusters() for external data file
qcow2: Don't assume 0 is an invalid cluster offset
qcow2: Return 0/-errno in qcow2_alloc_compressed_cluster_offset()
qcow2: Prepare qcow2_co_block_status() for data file
qcow2: External file I/O
qcow2: Return error for snapshot operation with data file
qcow2: Support external data file in qemu-img check
qcow2: Add basic data-file infrastructure
qcow2: Creating images with external data file
qcow2: Store data file name in the image
qcow2: Implement data-file-raw create option
qemu-iotests: Preallocation with external data file
qemu-iotests: General tests for qcow2 with external data file
qemu-iotests: amend with external data file

 qapi/block-core.json       |  26 ++-
 docs/interop/qcow2.txt     |  38 ++++-
 block/qcow2.h              |  66 ++++++--
 include/block/block_int.h  |   2 +
 block/qcow2-bitmap.c       |   7 +-
 block/qcow2-cache.c        |   6 +-
 block/qcow2-cluster.c      | 182 ++++++++++++---------
 block/qcow2-refcount.c     |  88 ++++++++---
 block/qcow2-snapshot.c     |  22 ++-
 block/qcow2.c              | 314 +++++++++++++++++++++++++++++++------
 tests/qemu-iotests/031.out |   8 +-
 tests/qemu-iotests/036.out |   4 +-
 tests/qemu-iotests/061     |  45 +++++-
 tests/qemu-iotests/061.out | 103 +++++++++++-
 tests/qemu-iotests/082.out |  54 +++++++
 tests/qemu-iotests/220.out |   2 +-
 tests/qemu-iotests/243     |  85 ++++++++++
 tests/qemu-iotests/243.out |  58 +++++++
 tests/qemu-iotests/244     | 200 +++++++++++++++++++++++
 tests/qemu-iotests/244.out | 125 +++++++++++++++
 tests/qemu-iotests/group   |   2 +
 21 files changed, 1243 insertions(+), 194 deletions(-)
 create mode 100755 tests/qemu-iotests/243
 create mode 100644 tests/qemu-iotests/243.out
 create mode 100755 tests/qemu-iotests/244
 create mode 100644 tests/qemu-iotests/244.out
Signature · 1 line
2.20.1