[PATCH 2/2] qemuBlockJobProcessEventCompletedPull: Add backingStore terminators if base is NULL

[Pavel Hrdina]

On Mon, Apr 12, 2021 at 05:57:46PM +0200, Peter Krempa wrote:
> When doing a blockpull with NULL base the full contents of the disk are
> pulled into the topmost image which then becomes fullu self-contained.

s/fullu/fully/

> qemuBlockJobProcessEventCompletedPull doesn't install the backing chain
> terminators though, although it's guaranteed that there will be no
> backing chain behind disk->src.
> 
> Add the terminators for completness and for disabling backing chain
> detection on further boots.
> 
> Signed-off-by: Peter Krempa <pkrempa at redhat.com>
> ---
>  src/qemu/qemu_blockjob.c | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
> index d708fd18fd..d2a769136d 100644
> --- a/src/qemu/qemu_blockjob.c
> +++ b/src/qemu/qemu_blockjob.c
> @@ -992,6 +992,7 @@ qemuBlockJobProcessEventCompletedPull(virQEMUDriverPtr driver,
>                                        qemuBlockJobDataPtr job,
>                                        qemuDomainAsyncJob asyncJob)
>  {
> +    virStorageSource *base = NULL;
>      virStorageSourcePtr baseparent = NULL;
>      virDomainDiskDefPtr cfgdisk = NULL;
>      virStorageSourcePtr cfgbase = NULL;
> @@ -1015,8 +1016,11 @@ qemuBlockJobProcessEventCompletedPull(virQEMUDriverPtr driver,
>          return;
> 
>      if (job->data.pull.base) {
> +        base = job->data.pull.base;
> +
>          if (cfgdisk)
>              cfgbase = cfgdisk->src->backingStore;
> +
>          for (n = job->disk->src->backingStore; n && n != job->data.pull.base; n = n->backingStore) {
>              /* find the image on top of 'base' */
> 
> @@ -1027,10 +1031,17 @@ qemuBlockJobProcessEventCompletedPull(virQEMUDriverPtr driver,
> 
>              baseparent = n;
>          }
> +    } else {
> +        /* create terminators for the chain; since we are pulling everything
> +         * into the top image the chain is automatically considered terminated */
> +        base = virStorageSourceNew();
> +
> +        if (cfgdisk)
> +            cfgbase = virStorageSourceNew();
>      }
> 
>      tmp = job->disk->src->backingStore;
> -    job->disk->src->backingStore = job->data.pull.base;
> +    job->disk->src->backingStore = base;
>      if (baseparent)
>          baseparent->backingStore = NULL;
>      qemuBlockJobEventProcessConcludedRemoveChain(driver, vm, asyncJob, tmp);
> -- 
> 2.30.2
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20210412/0279d508/attachment-0001.sig>