External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-26 23:55:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: refactor qemuBuildIOMMUCommandLine

Browse Source 
Introduce a separate buffer for options and use a helper
variable for def->iommu.
This commit is contained in:
Ján Tomko 2017-03-21 10:27:34 +01:00
parent 4ae59411fa
commit b595cc05e8
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/qemu/qemu_command.c
View File

@ -6674,33 +6674,42 @@ qemuBuildIOMMUCommandLine(virCommandPtr cmd,
const virDomainDef *def, const virDomainDef *def,
virQEMUCapsPtr qemuCaps) virQEMUCapsPtr qemuCaps)
{ {
if (!def->iommu) virBuffer opts = VIR_BUFFER_INITIALIZER;
const virDomainIOMMUDef *iommu = def->iommu;
int ret = -1;
if (!iommu)
return 0; return 0;
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_IOMMU)) if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_IOMMU))
return 0; /* Already handled via -machine */ return 0; /* Already handled via -machine */
switch (def->iommu->model) { switch (iommu->model) {
case VIR_DOMAIN_IOMMU_MODEL_INTEL: case VIR_DOMAIN_IOMMU_MODEL_INTEL:
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_INTEL_IOMMU)) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_INTEL_IOMMU)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("IOMMU device: '%s' is not supported with " _("IOMMU device: '%s' is not supported with "
"this QEMU binary"), "this QEMU binary"),
virDomainIOMMUModelTypeToString(def->iommu->model)); virDomainIOMMUModelTypeToString(iommu->model));
return -1; return -1;
} }
if (!qemuDomainMachineIsQ35(def)) { if (!qemuDomainMachineIsQ35(def)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("IOMMU device: '%s' is only supported with " _("IOMMU device: '%s' is only supported with "
"Q35 machines"), "Q35 machines"),
virDomainIOMMUModelTypeToString(def->iommu->model)); virDomainIOMMUModelTypeToString(iommu->model));
return -1; return -1;
} }
virCommandAddArgList(cmd, "-device", "intel-iommu", NULL); virBufferAddLit(&opts, "intel-iommu");
case VIR_DOMAIN_IOMMU_MODEL_LAST: case VIR_DOMAIN_IOMMU_MODEL_LAST:
break; break;
} }
return 0; virCommandAddArg(cmd, "-device");
virCommandAddArgBuffer(cmd, &opts);
ret = 0;
virBufferFreeAndReset(&opts);
return ret;
} }