[PULL 00/31] Block patches

Test FreeBSD passed
Test docker-quick@centos7 passed
Test checkpatch failed
Test docker-mingw@fedora passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200706100432.2301919-1-mreitz@redhat.com
Maintainers: Max Reitz <mreitz@redhat.com>, Peter Lieven <pl@kamp.de>, Jeff Cody <codyprime@gmail.com>, Fam Zheng <fam@euphon.net>, Stefan Hajnoczi <stefanha@redhat.com>, Kevin Wolf <kwolf@redhat.com>, Ronnie Sahlberg <ronniesahlberg@gmail.com>, Stefan Weil <sw@weilnetz.de>, Paolo Bonzini <pbonzini@redhat.com>
There is a newer version of this series
docs/tools/qemu-img.rst          |   5 +-
qapi/block-core.json             |  68 +++++
qapi/crypto.json                 |  73 +++++-
qapi/job.json                    |   4 +-
block/crypto.h                   |  37 +++
block/qed.h                      |   1 -
crypto/blockpriv.h               |   8 +
include/block/block.h            |   7 +-
include/block/block_int.h        |  36 ++-
include/crypto/block.h           |  22 ++
block.c                          |  19 +-
block/amend.c                    | 113 +++++++++
block/block-copy.c               |   4 +-
block/crypto.c                   | 207 +++++++++++++--
block/file-posix.c               |   3 -
block/io.c                       |   8 +-
block/iscsi.c                    |   1 -
block/qcow2.c                    | 350 +++++++++++++++-----------
block/qed.c                      |  65 +----
block/vdi.c                      |   3 +-
block/vhdx.c                     |   3 -
block/vpc.c                      |   3 +-
crypto/block-luks.c              | 416 ++++++++++++++++++++++++++++++-
crypto/block.c                   |  29 +++
qemu-img.c                       |  48 ++--
block/Makefile.objs              |   2 +-
qemu-img-cmds.hx                 |   4 +-
tests/qemu-iotests/049.out       | 102 ++++----
tests/qemu-iotests/061.out       |  12 +-
tests/qemu-iotests/082.out       | 185 ++++----------
tests/qemu-iotests/085.out       |  38 +--
tests/qemu-iotests/087           |   1 +
tests/qemu-iotests/087.out       |   6 +-
tests/qemu-iotests/112.out       |   2 +-
tests/qemu-iotests/125           |  24 ++
tests/qemu-iotests/125.out       |   9 +
tests/qemu-iotests/134.out       |   2 +-
tests/qemu-iotests/141           |   2 +-
tests/qemu-iotests/144.out       |   4 +-
tests/qemu-iotests/146           |  60 +++--
tests/qemu-iotests/146.out       | 405 ++++++++++++++++++++++++++++--
tests/qemu-iotests/153           |   9 +-
tests/qemu-iotests/158.out       |   4 +-
tests/qemu-iotests/178           |   1 +
tests/qemu-iotests/182.out       |   2 +-
tests/qemu-iotests/185.out       |   8 +-
tests/qemu-iotests/188           |   1 +
tests/qemu-iotests/188.out       |   2 +-
tests/qemu-iotests/189           |   1 +
tests/qemu-iotests/189.out       |   4 +-
tests/qemu-iotests/198           |   1 +
tests/qemu-iotests/198.out       |   4 +-
tests/qemu-iotests/206           |   1 +
tests/qemu-iotests/255.out       |   8 +-
tests/qemu-iotests/263           |   1 +
tests/qemu-iotests/263.out       |   4 +-
tests/qemu-iotests/274.out       |  46 ++--
tests/qemu-iotests/280.out       |   2 +-
tests/qemu-iotests/284           |   1 +
tests/qemu-iotests/284.out       |   6 +-
tests/qemu-iotests/293           | 208 ++++++++++++++++
tests/qemu-iotests/293.out       |  99 ++++++++
tests/qemu-iotests/294           |  90 +++++++
tests/qemu-iotests/294.out       |  30 +++
tests/qemu-iotests/295           | 280 +++++++++++++++++++++
tests/qemu-iotests/295.out       |  40 +++
tests/qemu-iotests/296           | 234 +++++++++++++++++
tests/qemu-iotests/296.out       |  33 +++
tests/qemu-iotests/common.filter | 106 ++++++--
tests/qemu-iotests/common.rc     |  30 +++
tests/qemu-iotests/group         |   4 +
tests/qemu-iotests/iotests.py    |  84 +++++--
72 files changed, 3103 insertions(+), 632 deletions(-)
create mode 100644 block/amend.c
create mode 100755 tests/qemu-iotests/293
create mode 100644 tests/qemu-iotests/293.out
create mode 100755 tests/qemu-iotests/294
create mode 100644 tests/qemu-iotests/294.out
create mode 100755 tests/qemu-iotests/295
create mode 100644 tests/qemu-iotests/295.out
create mode 100755 tests/qemu-iotests/296
create mode 100644 tests/qemu-iotests/296.out
[PULL 00/31] Block patches
Posted by Max Reitz 3 years, 9 months ago
The following changes since commit eb6490f544388dd24c0d054a96dd304bc7284450:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200703' into staging (2020-07-04 16:08:41 +0100)

are available in the Git repository at:

  https://github.com/XanClic/qemu.git tags/pull-block-2020-07-06

for you to fetch changes up to 365fed5111b06d31c1632af63c7528dfe49d62a2:

  qed: Simplify backing reads (2020-07-06 10:34:14 +0200)

----------------------------------------------------------------
Block patches for 5.1:
- LUKS keyslot amendment
  (+ patches to make the iotests pass on non-Linux systems, and to keep
     the tests passing for qcow v1, and to skip LUKS tests (including
     qcow2 LUKS) when the built qemu does not support it)
- Refactoring in the block layer: Drop the basically unnecessary
  unallocated_blocks_are_zero field from BlockDriverInfo
- Fix qcow2 preallocation when the image size is not a multiple of the
  cluster size
- Fix in block-copy code

----------------------------------------------------------------
Alberto Garcia (1):
  qcow2: Fix preallocation on images with unaligned sizes

Eric Blake (1):
  qed: Simplify backing reads

Max Reitz (5):
  iotests: Make _filter_img_create more active
  iotests/common.rc: Add _require_working_luks
  iotests.py: Add qemu_img_pipe_and_status()
  iotests.py: Add (verify|has)_working_luks()
  iotests: Check whether luks works

Maxim Levitsky (14):
  iotests: filter few more luks specific create options
  qcrypto/core: add generic infrastructure for crypto options amendment
  qcrypto/luks: implement encryption key management
  block/amend: add 'force' option
  block/amend: separate amend and create options for qemu-img
  block/amend: refactor qcow2 amend options
  block/crypto: rename two functions
  block/crypto: implement the encryption key management
  block/qcow2: extend qemu-img amend interface with crypto options
  iotests: qemu-img tests for luks key management
  block/core: add generic infrastructure for x-blockdev-amend qmp
    command
  block/crypto: implement blockdev-amend
  block/qcow2: implement blockdev-amend
  iotests: add tests for blockdev-amend

Vladimir Sementsov-Ogievskiy (10):
  block/block-copy: block_copy_dirty_clusters: fix failure check
  qemu-img: convert: don't use unallocated_blocks_are_zero
  block: inline bdrv_unallocated_blocks_are_zero()
  block/vdi: return ZERO block-status when appropriate
  block/vpc: return ZERO block-status when appropriate
  block/crypto: drop unallocated_blocks_are_zero
  block/iscsi: drop unallocated_blocks_are_zero
  block/file-posix: drop unallocated_blocks_are_zero
  block/vhdx: drop unallocated_blocks_are_zero
  block: drop unallocated_blocks_are_zero

 docs/tools/qemu-img.rst          |   5 +-
 qapi/block-core.json             |  68 +++++
 qapi/crypto.json                 |  73 +++++-
 qapi/job.json                    |   4 +-
 block/crypto.h                   |  37 +++
 block/qed.h                      |   1 -
 crypto/blockpriv.h               |   8 +
 include/block/block.h            |   7 +-
 include/block/block_int.h        |  36 ++-
 include/crypto/block.h           |  22 ++
 block.c                          |  19 +-
 block/amend.c                    | 113 +++++++++
 block/block-copy.c               |   4 +-
 block/crypto.c                   | 207 +++++++++++++--
 block/file-posix.c               |   3 -
 block/io.c                       |   8 +-
 block/iscsi.c                    |   1 -
 block/qcow2.c                    | 350 +++++++++++++++-----------
 block/qed.c                      |  65 +----
 block/vdi.c                      |   3 +-
 block/vhdx.c                     |   3 -
 block/vpc.c                      |   3 +-
 crypto/block-luks.c              | 416 ++++++++++++++++++++++++++++++-
 crypto/block.c                   |  29 +++
 qemu-img.c                       |  48 ++--
 block/Makefile.objs              |   2 +-
 qemu-img-cmds.hx                 |   4 +-
 tests/qemu-iotests/049.out       | 102 ++++----
 tests/qemu-iotests/061.out       |  12 +-
 tests/qemu-iotests/082.out       | 185 ++++----------
 tests/qemu-iotests/085.out       |  38 +--
 tests/qemu-iotests/087           |   1 +
 tests/qemu-iotests/087.out       |   6 +-
 tests/qemu-iotests/112.out       |   2 +-
 tests/qemu-iotests/125           |  24 ++
 tests/qemu-iotests/125.out       |   9 +
 tests/qemu-iotests/134.out       |   2 +-
 tests/qemu-iotests/141           |   2 +-
 tests/qemu-iotests/144.out       |   4 +-
 tests/qemu-iotests/146           |  60 +++--
 tests/qemu-iotests/146.out       | 405 ++++++++++++++++++++++++++++--
 tests/qemu-iotests/153           |   9 +-
 tests/qemu-iotests/158.out       |   4 +-
 tests/qemu-iotests/178           |   1 +
 tests/qemu-iotests/182.out       |   2 +-
 tests/qemu-iotests/185.out       |   8 +-
 tests/qemu-iotests/188           |   1 +
 tests/qemu-iotests/188.out       |   2 +-
 tests/qemu-iotests/189           |   1 +
 tests/qemu-iotests/189.out       |   4 +-
 tests/qemu-iotests/198           |   1 +
 tests/qemu-iotests/198.out       |   4 +-
 tests/qemu-iotests/206           |   1 +
 tests/qemu-iotests/255.out       |   8 +-
 tests/qemu-iotests/263           |   1 +
 tests/qemu-iotests/263.out       |   4 +-
 tests/qemu-iotests/274.out       |  46 ++--
 tests/qemu-iotests/280.out       |   2 +-
 tests/qemu-iotests/284           |   1 +
 tests/qemu-iotests/284.out       |   6 +-
 tests/qemu-iotests/293           | 208 ++++++++++++++++
 tests/qemu-iotests/293.out       |  99 ++++++++
 tests/qemu-iotests/294           |  90 +++++++
 tests/qemu-iotests/294.out       |  30 +++
 tests/qemu-iotests/295           | 280 +++++++++++++++++++++
 tests/qemu-iotests/295.out       |  40 +++
 tests/qemu-iotests/296           | 234 +++++++++++++++++
 tests/qemu-iotests/296.out       |  33 +++
 tests/qemu-iotests/common.filter | 106 ++++++--
 tests/qemu-iotests/common.rc     |  30 +++
 tests/qemu-iotests/group         |   4 +
 tests/qemu-iotests/iotests.py    |  84 +++++--
 72 files changed, 3103 insertions(+), 632 deletions(-)
 create mode 100644 block/amend.c
 create mode 100755 tests/qemu-iotests/293
 create mode 100644 tests/qemu-iotests/293.out
 create mode 100755 tests/qemu-iotests/294
 create mode 100644 tests/qemu-iotests/294.out
 create mode 100755 tests/qemu-iotests/295
 create mode 100644 tests/qemu-iotests/295.out
 create mode 100755 tests/qemu-iotests/296
 create mode 100644 tests/qemu-iotests/296.out

-- 
2.26.2


Re: [PULL 00/31] Block patches
Posted by no-reply@patchew.org 3 years, 9 months ago
Patchew URL: https://patchew.org/QEMU/20200706100432.2301919-1-mreitz@redhat.com/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Subject: [PULL 00/31] Block patches
Type: series
Message-id: 20200706100432.2301919-1-mreitz@redhat.com

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

From https://github.com/patchew-project/qemu
 * [new tag]         patchew/20200706100432.2301919-1-mreitz@redhat.com -> patchew/20200706100432.2301919-1-mreitz@redhat.com
Switched to a new branch 'test'
61a6805 qed: Simplify backing reads
8160191 block: drop unallocated_blocks_are_zero
d59b973 block/vhdx: drop unallocated_blocks_are_zero
fc425f8 block/file-posix: drop unallocated_blocks_are_zero
ee4e5f6 block/iscsi: drop unallocated_blocks_are_zero
9aacd22 block/crypto: drop unallocated_blocks_are_zero
4d6c6ad block/vpc: return ZERO block-status when appropriate
42d9c04 block/vdi: return ZERO block-status when appropriate
f73a13e block: inline bdrv_unallocated_blocks_are_zero()
d5d6d75 qemu-img: convert: don't use unallocated_blocks_are_zero
ecc887e iotests: add tests for blockdev-amend
ee66938 block/qcow2: implement blockdev-amend
9254299 block/crypto: implement blockdev-amend
f905f40 block/core: add generic infrastructure for x-blockdev-amend qmp command
5737d94 iotests: qemu-img tests for luks key management
1981eea block/qcow2: extend qemu-img amend interface with crypto options
75ebd25 block/crypto: implement the encryption key management
381affe block/crypto: rename two functions
37d5645 block/amend: refactor qcow2 amend options
2057114 block/amend: separate amend and create options for qemu-img
01ead3a block/amend: add 'force' option
23c67be qcrypto/luks: implement encryption key management
255ed50 qcrypto/core: add generic infrastructure for crypto options amendment
2267d63 iotests: Check whether luks works
a28c683 iotests.py: Add (verify|has)_working_luks()
e4821d5 iotests.py: Add qemu_img_pipe_and_status()
e9500aa iotests/common.rc: Add _require_working_luks
b3b46b5 iotests: filter few more luks specific create options
f872aeb iotests: Make _filter_img_create more active
d327a4c qcow2: Fix preallocation on images with unaligned sizes
9e289b8 block/block-copy: block_copy_dirty_clusters: fix failure check

=== OUTPUT BEGIN ===
1/31 Checking commit 9e289b8e0d77 (block/block-copy: block_copy_dirty_clusters: fix failure check)
2/31 Checking commit d327a4c43167 (qcow2: Fix preallocation on images with unaligned sizes)
3/31 Checking commit f872aebcf148 (iotests: Make _filter_img_create more active)
4/31 Checking commit b3b46b52bfec (iotests: filter few more luks specific create options)
5/31 Checking commit e9500aa71b58 (iotests/common.rc: Add _require_working_luks)
6/31 Checking commit e4821d5b92da (iotests.py: Add qemu_img_pipe_and_status())
7/31 Checking commit a28c683849bf (iotests.py: Add (verify|has)_working_luks())
8/31 Checking commit 2267d63fda82 (iotests: Check whether luks works)
9/31 Checking commit 255ed5095c89 (qcrypto/core: add generic infrastructure for crypto options amendment)
10/31 Checking commit 23c67bedd6e4 (qcrypto/luks: implement encryption key management)
11/31 Checking commit 01ead3a1b6b0 (block/amend: add 'force' option)
12/31 Checking commit 2057114b7a98 (block/amend: separate amend and create options for qemu-img)
ERROR: Macros with multiple statements should be enclosed in a do - while loop
#34: FILE: block/qcow2.c:5663:
+#define QCOW_COMMON_OPTIONS                                         \
+    {                                                               \
+        .name = BLOCK_OPT_SIZE,                                     \
+        .type = QEMU_OPT_SIZE,                                      \
+        .help = "Virtual disk size"                                 \
+    },                                                              \
+    {                                                               \
+        .name = BLOCK_OPT_COMPAT_LEVEL,                             \
+        .type = QEMU_OPT_STRING,                                    \
+        .help = "Compatibility level (v2 [0.10] or v3 [1.1])"       \
+    },                                                              \
+    {                                                               \
+        .name = BLOCK_OPT_BACKING_FILE,                             \
+        .type = QEMU_OPT_STRING,                                    \
+        .help = "File name of a base image"                         \
+    },                                                              \
+    {                                                               \
+        .name = BLOCK_OPT_BACKING_FMT,                              \
+        .type = QEMU_OPT_STRING,                                    \
+        .help = "Image format of the base image"                    \
+    },                                                              \
+    {                                                               \
+        .name = BLOCK_OPT_DATA_FILE,                                \
+        .type = QEMU_OPT_STRING,                                    \
+        .help = "File name of an external data file"                \
+    },                                                              \
+    {                                                               \
+        .name = BLOCK_OPT_DATA_FILE_RAW,                            \
+        .type = QEMU_OPT_BOOL,                                      \
+        .help = "The external data file must stay valid "           \
+                "as a raw image"                                    \
+    },                                                              \
+    {                                                               \
+        .name = BLOCK_OPT_ENCRYPT,                                  \
+        .type = QEMU_OPT_BOOL,                                      \
+        .help = "Encrypt the image with format 'aes'. (Deprecated " \
+                "in favor of " BLOCK_OPT_ENCRYPT_FORMAT "=aes)",    \
+    },                                                              \
+    {                                                               \
+        .name = BLOCK_OPT_ENCRYPT_FORMAT,                           \
+        .type = QEMU_OPT_STRING,                                    \
+        .help = "Encrypt the image, format choices: 'aes', 'luks'", \
+    },                                                              \
+    BLOCK_CRYPTO_OPT_DEF_KEY_SECRET("encrypt.",                     \
+        "ID of secret providing qcow AES key or LUKS passphrase"),  \
+    BLOCK_CRYPTO_OPT_DEF_LUKS_CIPHER_ALG("encrypt."),               \
+    BLOCK_CRYPTO_OPT_DEF_LUKS_CIPHER_MODE("encrypt."),              \
+    BLOCK_CRYPTO_OPT_DEF_LUKS_IVGEN_ALG("encrypt."),                \
+    BLOCK_CRYPTO_OPT_DEF_LUKS_IVGEN_HASH_ALG("encrypt."),           \
+    BLOCK_CRYPTO_OPT_DEF_LUKS_HASH_ALG("encrypt."),                 \
+    BLOCK_CRYPTO_OPT_DEF_LUKS_ITER_TIME("encrypt."),                \
+    {                                                               \
+        .name = BLOCK_OPT_CLUSTER_SIZE,                             \
+        .type = QEMU_OPT_SIZE,                                      \
+        .help = "qcow2 cluster size",                               \
+        .def_value_str = stringify(DEFAULT_CLUSTER_SIZE)            \
+    },                                                              \
+    {                                                               \
+        .name = BLOCK_OPT_PREALLOC,                                 \
+        .type = QEMU_OPT_STRING,                                    \
+        .help = "Preallocation mode (allowed values: off, "         \
+                "metadata, falloc, full)"                           \
+    },                                                              \
+    {                                                               \
+        .name = BLOCK_OPT_LAZY_REFCOUNTS,                           \
+        .type = QEMU_OPT_BOOL,                                      \
+        .help = "Postpone refcount updates",                        \
+        .def_value_str = "off"                                      \
+    },                                                              \
+    {                                                               \
+        .name = BLOCK_OPT_REFCOUNT_BITS,                            \
+        .type = QEMU_OPT_NUMBER,                                    \
+        .help = "Width of a reference count entry in bits",         \
+        .def_value_str = "16"                                       \
+    },                                                              \
+    {                                                               \
+        .name = BLOCK_OPT_COMPRESSION_TYPE,                         \
+        .type = QEMU_OPT_STRING,                                    \
+        .help = "Compression method used for image cluster "        \
+                "compression",                                      \
+        .def_value_str = "zlib"                                     \
+    }

total: 1 errors, 0 warnings, 244 lines checked

Patch 12/31 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

13/31 Checking commit 37d5645c2d89 (block/amend: refactor qcow2 amend options)
14/31 Checking commit 381affeb1932 (block/crypto: rename two functions)
15/31 Checking commit 75ebd2518718 (block/crypto: implement the encryption key management)
16/31 Checking commit 1981eea00495 (block/qcow2: extend qemu-img amend interface with crypto options)
17/31 Checking commit 5737d9411ca1 (iotests: qemu-img tests for luks key management)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#19: 
new file mode 100755

total: 0 errors, 1 warnings, 433 lines checked

Patch 17/31 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
18/31 Checking commit f905f403e917 (block/core: add generic infrastructure for x-blockdev-amend qmp command)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#33: 
new file mode 100644

total: 0 errors, 1 warnings, 221 lines checked

Patch 18/31 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
19/31 Checking commit 925429913f58 (block/crypto: implement blockdev-amend)
20/31 Checking commit ee66938d1193 (block/qcow2: implement blockdev-amend)
21/31 Checking commit ecc887e8c0a4 (iotests: add tests for blockdev-amend)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#19: 
new file mode 100755

total: 0 errors, 1 warnings, 593 lines checked

Patch 21/31 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
22/31 Checking commit d5d6d75d306c (qemu-img: convert: don't use unallocated_blocks_are_zero)
23/31 Checking commit f73a13e6c086 (block: inline bdrv_unallocated_blocks_are_zero())
24/31 Checking commit 42d9c04825ab (block/vdi: return ZERO block-status when appropriate)
25/31 Checking commit 4d6c6ad7b389 (block/vpc: return ZERO block-status when appropriate)
26/31 Checking commit 9aacd22b62a4 (block/crypto: drop unallocated_blocks_are_zero)
27/31 Checking commit ee4e5f6a6804 (block/iscsi: drop unallocated_blocks_are_zero)
28/31 Checking commit fc425f8700a0 (block/file-posix: drop unallocated_blocks_are_zero)
29/31 Checking commit d59b973ebbed (block/vhdx: drop unallocated_blocks_are_zero)
30/31 Checking commit 816019134241 (block: drop unallocated_blocks_are_zero)
31/31 Checking commit 61a68058fcb1 (qed: Simplify backing reads)
=== OUTPUT END ===

Test command exited with code: 1


The full log is available at
http://patchew.org/logs/20200706100432.2301919-1-mreitz@redhat.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
Re: [PULL 00/31] Block patches
Posted by Peter Maydell 3 years, 9 months ago
On Mon, 6 Jul 2020 at 11:04, Max Reitz <mreitz@redhat.com> wrote:
>
> The following changes since commit eb6490f544388dd24c0d054a96dd304bc7284450:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200703' into staging (2020-07-04 16:08:41 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/XanClic/qemu.git tags/pull-block-2020-07-06
>
> for you to fetch changes up to 365fed5111b06d31c1632af63c7528dfe49d62a2:
>
>   qed: Simplify backing reads (2020-07-06 10:34:14 +0200)
>
> ----------------------------------------------------------------
> Block patches for 5.1:
> - LUKS keyslot amendment
>   (+ patches to make the iotests pass on non-Linux systems, and to keep
>      the tests passing for qcow v1, and to skip LUKS tests (including
>      qcow2 LUKS) when the built qemu does not support it)
> - Refactoring in the block layer: Drop the basically unnecessary
>   unallocated_blocks_are_zero field from BlockDriverInfo
> - Fix qcow2 preallocation when the image size is not a multiple of the
>   cluster size
> - Fix in block-copy code
>



Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.1
for any user-visible changes.

-- PMM

Re: [PULL 00/31] Block patches
Posted by Maxim Levitsky 3 years, 9 months ago
On Tue, 2020-07-07 at 21:40 +0100, Peter Maydell wrote:
> On Mon, 6 Jul 2020 at 11:04, Max Reitz <mreitz@redhat.com> wrote:
> > The following changes since commit eb6490f544388dd24c0d054a96dd304bc7284450:
> > 
> >   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200703' into staging (2020-07-04 16:08:41 +0100)
> > 
> > are available in the Git repository at:
> > 
> >   https://github.com/XanClic/qemu.git tags/pull-block-2020-07-06
> > 
> > for you to fetch changes up to 365fed5111b06d31c1632af63c7528dfe49d62a2:
> > 
> >   qed: Simplify backing reads (2020-07-06 10:34:14 +0200)
> > 
> > ----------------------------------------------------------------
> > Block patches for 5.1:
> > - LUKS keyslot amendment
> >   (+ patches to make the iotests pass on non-Linux systems, and to keep
> >      the tests passing for qcow v1, and to skip LUKS tests (including
> >      qcow2 LUKS) when the built qemu does not support it)
> > - Refactoring in the block layer: Drop the basically unnecessary
> >   unallocated_blocks_are_zero field from BlockDriverInfo
> > - Fix qcow2 preallocation when the image size is not a multiple of the
> >   cluster size
> > - Fix in block-copy code
> > 
> 
> 
> Applied, thanks.
> 
> Please update the changelog at https://wiki.qemu.org/ChangeLog/5.1
> for any user-visible changes.

Since this includes my luks patches, I guess I need to add them to this changelog.
How do I get an account on the wiki?

Best regards,
	Maxim Levitsky

> 
> -- PMM
> 



Re: [PULL 00/31] Block patches
Posted by Kevin Wolf 3 years, 9 months ago
Am 08.07.2020 um 17:11 hat Maxim Levitsky geschrieben:
> On Tue, 2020-07-07 at 21:40 +0100, Peter Maydell wrote:
> > Applied, thanks.
> > 
> > Please update the changelog at https://wiki.qemu.org/ChangeLog/5.1
> > for any user-visible changes.
> 
> Since this includes my luks patches, I guess I need to add them to this changelog.
> How do I get an account on the wiki?

For the record, I contacted Maxim on IRC and created an account for him.

Kevin


Re: [PULL 00/31] Block patches
Posted by Maxim Levitsky 3 years, 9 months ago
On Wed, 2020-07-08 at 18:11 +0300, Maxim Levitsky wrote:
> On Tue, 2020-07-07 at 21:40 +0100, Peter Maydell wrote:
> > On Mon, 6 Jul 2020 at 11:04, Max Reitz <mreitz@redhat.com> wrote:
> > > The following changes since commit eb6490f544388dd24c0d054a96dd304bc7284450:
> > > 
> > >   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200703' into staging (2020-07-04 16:08:41 +0100)
> > > 
> > > are available in the Git repository at:
> > > 
> > >   https://github.com/XanClic/qemu.git tags/pull-block-2020-07-06
> > > 
> > > for you to fetch changes up to 365fed5111b06d31c1632af63c7528dfe49d62a2:
> > > 
> > >   qed: Simplify backing reads (2020-07-06 10:34:14 +0200)
> > > 
> > > ----------------------------------------------------------------
> > > Block patches for 5.1:
> > > - LUKS keyslot amendment
> > >   (+ patches to make the iotests pass on non-Linux systems, and to keep
> > >      the tests passing for qcow v1, and to skip LUKS tests (including
> > >      qcow2 LUKS) when the built qemu does not support it)
> > > - Refactoring in the block layer: Drop the basically unnecessary
> > >   unallocated_blocks_are_zero field from BlockDriverInfo
> > > - Fix qcow2 preallocation when the image size is not a multiple of the
> > >   cluster size
> > > - Fix in block-copy code
> > > 
> > 
> > Applied, thanks.
> > 
> > Please update the changelog at https://wiki.qemu.org/ChangeLog/5.1
> > for any user-visible changes.
> 
> Since this includes my luks patches, I guess I need to add them to this changelog.
> How do I get an account on the wiki?

Kevin Wolf gave me an account, so I'll write today a short description in the changelog.
Thanks for everyone that helped me get this merged upstream!

Best regards,
	Maxim Levitsky
> 
> Best regards,
> 	Maxim Levitsky
> 
> > -- PMM
> >