[v4,0/4] luks: add qemu-img measure support

Message

Stefan Hajnoczi Feb. 21, 2020, 11:25 a.m. UTC

v4:
 * This revision is what German speakers call "das Tüpfelchen auf dem I".  "The
   icing on the cake" is the English equivalent.  Since I like cake and don't
   want it to be half-baked, and because I like my metaphors shaken, not
   stirred, I went ahead with the extra revision so I could write this message.
 * Use g_autoptr(QCryptoBlock) to make the code more concise [Max]
 * Use local_err consistently [Max]
 * Folded in Max's Reviewed-by tags
v3:
 * Move payload offset calculation function to crypto/block.c [Max]
 * Zero/unallocated blocks always require disk space on encrypted files [Max]
 * Update qemu-iotests 178 output when changing qemu-img measure command-line
   options

v2:
 * Fix uint64_t <-> size_t type mismatch in block_crypto_measure() so that
   32-bit builds pass

This patch series adds qemu-img measure support to the "luks" block driver.  We
just need to take into account the LUKS header when sizing the image.

Stefan Hajnoczi (4):
  luks: extract qcrypto_block_calculate_payload_offset()
  luks: implement .bdrv_measure()
  qemu-img: allow qemu-img measure --object without a filename
  iotests: add 282 luks qemu-img measure test

 block/crypto.c                   | 62 +++++++++++++++++++++
 block/qcow2.c                    | 74 +++++++------------------
 crypto/block.c                   | 36 +++++++++++++
 include/crypto/block.h           | 22 ++++++++
 qemu-img.c                       |  6 +--
 tests/qemu-iotests/178           |  2 +-
 tests/qemu-iotests/178.out.qcow2 |  8 +--
 tests/qemu-iotests/178.out.raw   |  8 +--
 tests/qemu-iotests/282           | 93 ++++++++++++++++++++++++++++++++
 tests/qemu-iotests/282.out       | 30 +++++++++++
 tests/qemu-iotests/group         |  1 +
 11 files changed, 274 insertions(+), 68 deletions(-)
 create mode 100755 tests/qemu-iotests/282
 create mode 100644 tests/qemu-iotests/282.out

Comments

Max Reitz Feb. 25, 2020, 4:36 p.m. UTC | #1

On 21.02.20 12:25, Stefan Hajnoczi wrote:
> v4:
>  * This revision is what German speakers call "das Tüpfelchen auf dem I".  "The
>    icing on the cake" is the English equivalent.  Since I like cake and don't
>    want it to be half-baked, and because I like my metaphors shaken, not
>    stirred, I went ahead with the extra revision so I could write this message.

:)

>  * Use g_autoptr(QCryptoBlock) to make the code more concise [Max]
>  * Use local_err consistently [Max]
>  * Folded in Max's Reviewed-by tags
> v3:
>  * Move payload offset calculation function to crypto/block.c [Max]
>  * Zero/unallocated blocks always require disk space on encrypted files [Max]
>  * Update qemu-iotests 178 output when changing qemu-img measure command-line
>    options
> 
> v2:
>  * Fix uint64_t <-> size_t type mismatch in block_crypto_measure() so that
>    32-bit builds pass
> 
> This patch series adds qemu-img measure support to the "luks" block driver.  We
> just need to take into account the LUKS header when sizing the image.

Thanks, applied to my block branch:

https://git.xanclic.moe/XanClic/qemu/commits/branch/block

Max