On 15.09.19 22:36, Maxim Levitsky wrote:
> * Change the qcow2_co_{encrypt|decrypt} to just receive full host and
> guest offsets and use this function directly instead of calling
> do_perform_cow_encrypt (which is removed by that patch).
>
> * Adjust qcow2_co_encdec to take full host and guest offsets as well.
>
> * Document the qcow2_co_{encrypt|decrypt} arguments
> to prevent the bug fixed in former commit from hopefully
> happening again.
>
> Signed-off-by: Maxim Levitsky <mlevi...@redhat.com>
> ---
> block/qcow2-cluster.c | 41 ++++++++++------------------
> block/qcow2-threads.c | 63 +++++++++++++++++++++++++++++++++----------
> block/qcow2.c | 5 ++--
> block/qcow2.h | 8 +++---
> 4 files changed, 70 insertions(+), 47 deletions(-)Looks good to me, but there are conflicts with two series I’ve already taken to my branch: Namely “qcow2: async handling of fragmented io” by Vladimir and “Alignment checks cleanup” by Nir. Unfortunately, those conflicts (while not difficult to resolve) are not quite trivial, so I’d rather not resolve them myself. I’ll send a pull request today, but until they are in master, you could rebase on my branch (either of - https://git.xanclic.moe/XanClic/qemu.git block - https://github.com/XanClic/qemu.git block , whichever you prefer that works). Max
signature.asc
Description: OpenPGP digital signature
