External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Refactor qemuBuildSCSIiSCSIHostdevDrvStr slightly

Browse Source 
Rather than building the "file" string in qemuBuildSCSIHostdevDrvStr
build it in the called helper.
This commit is contained in:
John Ferlan 2017-09-24 09:35:34 -04:00
parent 1d9108cf16
commit 8001c2f3e4
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/qemu/qemu_command.c
View File

@ -4959,15 +4959,22 @@ static char *
qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDefPtr dev) qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDefPtr dev)
{ {
char *source = NULL; char *source = NULL;
char *netsource = NULL;
virDomainHostdevSubsysSCSIPtr scsisrc = &dev->source.subsys.u.scsi; virDomainHostdevSubsysSCSIPtr scsisrc = &dev->source.subsys.u.scsi;
virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc = &scsisrc->u.iscsi; virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc = &scsisrc->u.iscsi;
qemuDomainStorageSourcePrivatePtr srcPriv = qemuDomainStorageSourcePrivatePtr srcPriv =
QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(iscsisrc->src); QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(iscsisrc->src);
/* Rather than pull what we think we want - use the network disk code */ /* Rather than pull what we think we want - use the network disk code */
source = qemuBuildNetworkDriveStr(iscsisrc->src, srcPriv ? netsource = qemuBuildNetworkDriveStr(iscsisrc->src, srcPriv ?
srcPriv->secinfo : NULL); srcPriv->secinfo : NULL);
if (!netsource)
goto cleanup;
if (virAsprintf(&source, "file=%s,if=none,format=raw", netsource) < 0)
goto cleanup;
cleanup:
VIR_FREE(netsource);
return source; return source;
} }
@ -5020,7 +5027,7 @@ qemuBuildSCSIHostdevDrvStr(virDomainHostdevDefPtr dev)
if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) { if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) {
if (!(source = qemuBuildSCSIiSCSIHostdevDrvStr(dev))) if (!(source = qemuBuildSCSIiSCSIHostdevDrvStr(dev)))
goto error; goto error;
virBufferAsprintf(&buf, "file=%s,if=none,format=raw", source); virBufferAdd(&buf, source, -1);
} else { } else {
if (!(source = qemuBuildSCSIHostHostdevDrvStr(dev))) if (!(source = qemuBuildSCSIHostHostdevDrvStr(dev)))
goto error; goto error;