提交 a2bf4a13 编写于 作者: P Peter Krempa

qemuBlockJobDiskNewCommit: Propagate 'disabledBitmapsBase'

Add an argument to qemuBlockJobDiskNewCommit to propagate the list of
disabled bitmaps into the job data structure.
Signed-off-by: NPeter Krempa <pkrempa@redhat.com>
Reviewed-by: NEric Blake <eblake@redhat.com>
上级 4e9bb10c
...@@ -285,6 +285,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm, ...@@ -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, ...@@ -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)
......
...@@ -187,6 +187,7 @@ qemuBlockJobDiskNewCommit(virDomainObjPtr vm, ...@@ -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);
......
...@@ -18556,7 +18556,7 @@ qemuDomainBlockCommit(virDomainPtr dom, ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册