提交 6b770f9a 编写于 作者: A Anya Harter 提交者: John Ferlan

qemu: use virBuffer in qemuBuildSCSIiSCSIHostdevDrvStr

Instead of source to enable use of virBuffer functions in
string construction.
Signed-off-by: NAnya Harter <aharter@redhat.com>
上级 2d5b3323
......@@ -4643,7 +4643,8 @@ static char *
qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDefPtr dev,
virQEMUCapsPtr qemuCaps)
{
char *source = NULL;
virBuffer buf = VIR_BUFFER_INITIALIZER;
char *netsource = NULL;
virJSONValuePtr srcprops = NULL;
virDomainHostdevSubsysSCSIPtr scsisrc = &dev->source.subsys.u.scsi;
......@@ -4656,21 +4657,25 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDefPtr dev,
goto cleanup;
if (!(netsource = virQEMUBuildDriveCommandlineFromJSON(srcprops)))
goto cleanup;
if (virAsprintf(&source, "%s,if=none,format=raw", netsource) < 0)
goto cleanup;
virBufferAsprintf(&buf, "%s,if=none,format=raw", netsource);
} else {
/* Rather than pull what we think we want - use the network disk code */
if (!(netsource = qemuBuildNetworkDriveStr(iscsisrc->src, srcPriv ?
srcPriv->secinfo : NULL)))
goto cleanup;
if (virAsprintf(&source, "file=%s,if=none,format=raw", netsource) < 0)
goto cleanup;
virBufferAsprintf(&buf, "file=%s,if=none,format=raw", netsource);
}
if (virBufferCheckError(&buf) < 0)
goto cleanup;
return virBufferContentAndReset(&buf);
cleanup:
VIR_FREE(netsource);
virJSONValueFree(srcprops);
return source;
virBufferFreeAndReset(&buf);
return NULL;
}
char *
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册