提交 107f7a2d 编写于 作者: P Peter Krempa

qemu: domain: Convert child buffers to use VIR_BUFFER_INIT_CHILD

Use the new helper to initialize child XML element buffers.
Signed-off-by: NPeter Krempa <pkrempa@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 15dc7708
...@@ -2289,7 +2289,7 @@ static int ...@@ -2289,7 +2289,7 @@ static int
qemuStorageSourcePrivateDataFormat(virStorageSourcePtr src, qemuStorageSourcePrivateDataFormat(virStorageSourcePtr src,
virBufferPtr buf) virBufferPtr buf)
{ {
g_auto(virBuffer) tmp = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) tmp = VIR_BUFFER_INIT_CHILD(buf);
qemuDomainStorageSourcePrivatePtr srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src); qemuDomainStorageSourcePrivatePtr srcPriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src);
int ret = -1; int ret = -1;
...@@ -2308,8 +2308,6 @@ qemuStorageSourcePrivateDataFormat(virStorageSourcePtr src, ...@@ -2308,8 +2308,6 @@ qemuStorageSourcePrivateDataFormat(virStorageSourcePtr src,
if (virStorageSourcePrivateDataFormatRelPath(src, buf) < 0) if (virStorageSourcePrivateDataFormatRelPath(src, buf) < 0)
goto cleanup; goto cleanup;
virBufferSetChildIndent(&tmp, buf);
if (srcPriv) { if (srcPriv) {
qemuStorageSourcePrivateDataFormatSecinfo(&tmp, srcPriv->secinfo, "auth"); qemuStorageSourcePrivateDataFormatSecinfo(&tmp, srcPriv->secinfo, "auth");
qemuStorageSourcePrivateDataFormatSecinfo(&tmp, srcPriv->encinfo, "encryption"); qemuStorageSourcePrivateDataFormatSecinfo(&tmp, srcPriv->encinfo, "encryption");
...@@ -2435,11 +2433,9 @@ qemuDomainObjPrivateXMLFormatBlockjobFormatSource(virBufferPtr buf, ...@@ -2435,11 +2433,9 @@ qemuDomainObjPrivateXMLFormatBlockjobFormatSource(virBufferPtr buf,
bool chain) bool chain)
{ {
g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf);
unsigned int xmlflags = VIR_DOMAIN_DEF_FORMAT_STATUS; unsigned int xmlflags = VIR_DOMAIN_DEF_FORMAT_STATUS;
virBufferSetChildIndent(&childBuf, buf);
virBufferAsprintf(&attrBuf, " type='%s' format='%s'", virBufferAsprintf(&attrBuf, " type='%s' format='%s'",
virStorageTypeToString(src->type), virStorageTypeToString(src->type),
virStorageFileFormatTypeToString(src->format)); virStorageFileFormatTypeToString(src->format));
...@@ -2462,20 +2458,17 @@ qemuDomainObjPrivateXMLFormatBlockjobIterator(void *payload, ...@@ -2462,20 +2458,17 @@ qemuDomainObjPrivateXMLFormatBlockjobIterator(void *payload,
const void *name G_GNUC_UNUSED, const void *name G_GNUC_UNUSED,
void *opaque) void *opaque)
{ {
struct qemuDomainPrivateBlockJobFormatData *data = opaque;
g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(data->buf);
g_auto(virBuffer) chainsBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) chainsBuf = VIR_BUFFER_INIT_CHILD(&childBuf);
qemuBlockJobDataPtr job = payload; qemuBlockJobDataPtr job = payload;
const char *state = qemuBlockjobStateTypeToString(job->state); const char *state = qemuBlockjobStateTypeToString(job->state);
const char *newstate = NULL; const char *newstate = NULL;
struct qemuDomainPrivateBlockJobFormatData *data = opaque;
if (job->newstate != -1) if (job->newstate != -1)
newstate = qemuBlockjobStateTypeToString(job->newstate); newstate = qemuBlockjobStateTypeToString(job->newstate);
virBufferSetChildIndent(&childBuf, data->buf);
virBufferSetChildIndent(&chainsBuf, &childBuf);
virBufferEscapeString(&attrBuf, " name='%s'", job->name); virBufferEscapeString(&attrBuf, " name='%s'", job->name);
virBufferEscapeString(&attrBuf, " type='%s'", qemuBlockjobTypeToString(job->type)); virBufferEscapeString(&attrBuf, " type='%s'", qemuBlockjobTypeToString(job->type));
virBufferEscapeString(&attrBuf, " state='%s'", state); virBufferEscapeString(&attrBuf, " state='%s'", state);
...@@ -2558,7 +2551,7 @@ qemuDomainObjPrivateXMLFormatBlockjobs(virBufferPtr buf, ...@@ -2558,7 +2551,7 @@ qemuDomainObjPrivateXMLFormatBlockjobs(virBufferPtr buf,
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf);
bool bj = qemuDomainHasBlockjob(vm, false); bool bj = qemuDomainHasBlockjob(vm, false);
struct qemuDomainPrivateBlockJobFormatData iterdata = { priv->driver->xmlopt, struct qemuDomainPrivateBlockJobFormatData iterdata = { priv->driver->xmlopt,
&childBuf }; &childBuf };
...@@ -2566,8 +2559,6 @@ qemuDomainObjPrivateXMLFormatBlockjobs(virBufferPtr buf, ...@@ -2566,8 +2559,6 @@ qemuDomainObjPrivateXMLFormatBlockjobs(virBufferPtr buf,
virBufferAsprintf(&attrBuf, " active='%s'", virBufferAsprintf(&attrBuf, " active='%s'",
virTristateBoolTypeToString(virTristateBoolFromBool(bj))); virTristateBoolTypeToString(virTristateBoolFromBool(bj)));
virBufferSetChildIndent(&childBuf, buf);
if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) && if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) &&
virHashForEach(priv->blockjobs, virHashForEach(priv->blockjobs,
qemuDomainObjPrivateXMLFormatBlockjobIterator, qemuDomainObjPrivateXMLFormatBlockjobIterator,
...@@ -2604,11 +2595,9 @@ qemuDomainObjPrivateXMLFormatNBDMigrationSource(virBufferPtr buf, ...@@ -2604,11 +2595,9 @@ qemuDomainObjPrivateXMLFormatNBDMigrationSource(virBufferPtr buf,
virDomainXMLOptionPtr xmlopt) virDomainXMLOptionPtr xmlopt)
{ {
g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf);
int ret = -1; int ret = -1;
virBufferSetChildIndent(&childBuf, buf);
virBufferAsprintf(&attrBuf, " type='%s' format='%s'", virBufferAsprintf(&attrBuf, " type='%s' format='%s'",
virStorageTypeToString(src->type), virStorageTypeToString(src->type),
virStorageFileFormatTypeToString(src->format)); virStorageFileFormatTypeToString(src->format));
...@@ -2631,19 +2620,17 @@ qemuDomainObjPrivateXMLFormatNBDMigration(virBufferPtr buf, ...@@ -2631,19 +2620,17 @@ qemuDomainObjPrivateXMLFormatNBDMigration(virBufferPtr buf,
virDomainObjPtr vm) virDomainObjPtr vm)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER;
size_t i; size_t i;
virDomainDiskDefPtr disk; virDomainDiskDefPtr disk;
qemuDomainDiskPrivatePtr diskPriv; qemuDomainDiskPrivatePtr diskPriv;
int ret = -1; int ret = -1;
for (i = 0; i < vm->def->ndisks; i++) { for (i = 0; i < vm->def->ndisks; i++) {
g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf);
disk = vm->def->disks[i]; disk = vm->def->disks[i];
diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
virBufferSetChildIndent(&childBuf, buf);
virBufferAsprintf(&attrBuf, " dev='%s' migrating='%s'", virBufferAsprintf(&attrBuf, " dev='%s' migrating='%s'",
disk->dst, diskPriv->migrating ? "yes" : "no"); disk->dst, diskPriv->migrating ? "yes" : "no");
...@@ -2669,7 +2656,7 @@ qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, ...@@ -2669,7 +2656,7 @@ qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf,
qemuDomainObjPrivatePtr priv) qemuDomainObjPrivatePtr priv)
{ {
g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
g_auto(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf);
qemuDomainJob job = priv->job.active; qemuDomainJob job = priv->job.active;
int ret = -1; int ret = -1;
...@@ -2680,8 +2667,6 @@ qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf, ...@@ -2680,8 +2667,6 @@ qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf,
priv->job.asyncJob == QEMU_ASYNC_JOB_NONE) priv->job.asyncJob == QEMU_ASYNC_JOB_NONE)
return 0; return 0;
virBufferSetChildIndent(&childBuf, buf);
virBufferAsprintf(&attrBuf, " type='%s' async='%s'", virBufferAsprintf(&attrBuf, " type='%s' async='%s'",
qemuDomainJobTypeToString(job), qemuDomainJobTypeToString(job),
qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); qemuDomainAsyncJobTypeToString(priv->job.asyncJob));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册