diff options
| author | Peter Maydell | 2020-05-13 16:35:32 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-05-13 16:35:32 +0200 |
| commit | d8f9d57dbd0caf225c47f12e9faea9180e79fe2a (patch) | |
| tree | cd665ce0f5dd06ab74b5c34a14e89eae0adab326 /include | |
| parent | Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2020-05-08-1... (diff) | |
| parent | block/block-copy: fix use-after-free of task pointer (diff) | |
| download | qemu-d8f9d57dbd0caf225c47f12e9faea9180e79fe2a.tar.gz qemu-d8f9d57dbd0caf225c47f12e9faea9180e79fe2a.tar.xz qemu-d8f9d57dbd0caf225c47f12e9faea9180e79fe2a.zip | |
Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2020-05-13' into staging
Block patches:
- zstd compression for qcow2
- Fix use-after-free
# gpg: Signature made Wed 13 May 2020 15:14:06 BST
# gpg: using RSA key 91BEB60A30DB3E8857D11829F407DB0061D5CF40
# gpg: issuer "mreitz@redhat.com"
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>" [full]
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40
* remotes/maxreitz/tags/pull-block-2020-05-13:
block/block-copy: fix use-after-free of task pointer
iotests: 287: add qcow2 compression type test
qcow2: add zstd cluster compression
qcow2: rework the cluster compression routine
qcow2: introduce compression type feature
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/block_int.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/block/block_int.h b/include/block/block_int.h index df6d0273d6..7ba8c89036 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -57,6 +57,7 @@ #define BLOCK_OPT_REFCOUNT_BITS "refcount_bits" #define BLOCK_OPT_DATA_FILE "data_file" #define BLOCK_OPT_DATA_FILE_RAW "data_file_raw" +#define BLOCK_OPT_COMPRESSION_TYPE "compression_type" #define BLOCK_PROBE_BUF_SIZE 512 |