From 70cdf1b52e2193524b51d7d0431bfa13dec04625 Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Tue, 28 May 2019 12:45:26 +0200 Subject: [PATCH] qemu: Move virBuffer inside switch() statement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This doesn't make a whole lot of difference now, but once we introduce more virDomainIOMMUModel values the current structure will no longer work. Signed-off-by: Andrea Bolognani Reviewed-by: Ján Tomko --- src/qemu/qemu_command.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index dd7ea0941d..d5016cc99c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6928,7 +6928,6 @@ qemuBuildIOMMUCommandLine(virCommandPtr cmd, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { - VIR_AUTOCLEAN(virBuffer) opts = VIR_BUFFER_INITIALIZER; const virDomainIOMMUDef *iommu = def->iommu; if (!iommu) @@ -6942,7 +6941,9 @@ qemuBuildIOMMUCommandLine(virCommandPtr cmd, return 0; switch (iommu->model) { - case VIR_DOMAIN_IOMMU_MODEL_INTEL: + case VIR_DOMAIN_IOMMU_MODEL_INTEL: { + VIR_AUTOCLEAN(virBuffer) opts = VIR_BUFFER_INITIALIZER; + virBufferAddLit(&opts, "intel-iommu"); if (iommu->intremap != VIR_TRISTATE_SWITCH_ABSENT) { virBufferAsprintf(&opts, ",intremap=%s", @@ -6960,15 +6961,17 @@ qemuBuildIOMMUCommandLine(virCommandPtr cmd, virBufferAsprintf(&opts, ",device-iotlb=%s", virTristateSwitchTypeToString(iommu->iotlb)); } + + virCommandAddArg(cmd, "-device"); + virCommandAddArgBuffer(cmd, &opts); break; + } case VIR_DOMAIN_IOMMU_MODEL_LAST: default: virReportEnumRangeError(virDomainIOMMUModel, iommu->model); return -1; } - virCommandAddArg(cmd, "-device"); - virCommandAddArgBuffer(cmd, &opts); return 0; }