External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 22:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuBlockJobDiskNewCommit: Propagate 'disabledBitmapsBase'

Browse Source 
Add an argument to qemuBlockJobDiskNewCommit to propagate the list of
disabled bitmaps into the job data structure.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Peter Krempa 2020-03-03 13:31:57 +01:00
parent 4e9bb10cf3
commit a2bf4a13ac
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_blockjob.c
View File

@ -285,6 +285,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm,
virStorageSourcePtr topparent, virStorageSourcePtr topparent,
virStorageSourcePtr top, virStorageSourcePtr top,
virStorageSourcePtr base, virStorageSourcePtr base,
char ***disabledBitmapsBase,
bool delete_imgs, bool delete_imgs,
unsigned int jobflags) unsigned int jobflags)
{ {
@ -310,6 +311,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm,
job->data.commit.top = top; job->data.commit.top = top;
job->data.commit.base = base; job->data.commit.base = base;
job->data.commit.deleteCommittedImages = delete_imgs; job->data.commit.deleteCommittedImages = delete_imgs;
job->data.commit.disabledBitmapsBase = g_steal_pointer(disabledBitmapsBase);
job->jobflags = jobflags; job->jobflags = jobflags;
if (qemuBlockJobRegister(job, vm, disk, true) < 0) if (qemuBlockJobRegister(job, vm, disk, true) < 0)

1
src/qemu/qemu_blockjob.h
View File

@ -187,6 +187,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm,
virStorageSourcePtr topparent, virStorageSourcePtr topparent,
virStorageSourcePtr top, virStorageSourcePtr top,
virStorageSourcePtr base, virStorageSourcePtr base,
char ***disabledBitmapsBase,
bool delete_imgs, bool delete_imgs,
unsigned int jobflags); unsigned int jobflags);

2
src/qemu/qemu_driver.c
View File

@ -18556,7 +18556,7 @@ qemuDomainBlockCommit(virDomainPtr dom,
} }
if (!(job = qemuBlockJobDiskNewCommit(vm, disk, top_parent, topSource, if (!(job = qemuBlockJobDiskNewCommit(vm, disk, top_parent, topSource,
baseSource, baseSource, NULL,
flags & VIR_DOMAIN_BLOCK_COMMIT_DELETE, flags & VIR_DOMAIN_BLOCK_COMMIT_DELETE,
flags))) flags)))
goto endjob; goto endjob;