It always returns true for iSCSI, so we can remove the fallback logic.
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
src/qemu/qemu_command.c | 22 +++++-----------------
1 file changed, 5 insertions(+), 17 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 60b47573d5..0b87719f75 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4501,24 +4501,12 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDef *dev)
g_autoptr(virJSONValue) srcprops = NULL;
virDomainHostdevSubsysSCSI *scsisrc = &dev->source.subsys.u.scsi;
virDomainHostdevSubsysSCSIiSCSI *iscsisrc = &scsisrc->u.iscsi;
- qemuDomainStorageSourcePrivate *srcPriv =
- QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(iscsisrc->src);
- if (qemuDiskSourceNeedsProps(iscsisrc->src)) {
- if (!(srcprops = qemuDiskSourceGetProps(iscsisrc->src)))
- return NULL;
- if (!(netsource = virQEMUBuildDriveCommandlineFromJSON(srcprops)))
- return NULL;
- 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)))
- return NULL;
- virBufferAddLit(&buf, "file=");
- virQEMUBuildBufferEscapeComma(&buf, netsource);
- virBufferAddLit(&buf, ",if=none,format=raw");
- }
+ if (!(srcprops = qemuDiskSourceGetProps(iscsisrc->src)))
+ return NULL;
+ if (!(netsource = virQEMUBuildDriveCommandlineFromJSON(srcprops)))
+ return NULL;
+ virBufferAsprintf(&buf, "%s,if=none,format=raw", netsource);
return virBufferContentAndReset(&buf);
}
--
2.31.1