From: Andrea Bolognani <abologna@redhat.com>
Date: Tue, 28 May 2019 12:18:15 +0000 (+0200)
Subject: qemu: Format SMMUv3 IOMMU
X-Git-Tag: v5.5.0-rc1~359
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1462881f4ec80c27e4803098d0a8b3f8a98b0ff0;p=thirdparty%2Flibvirt.git

qemu: Format SMMUv3 IOMMU

https://bugzilla.redhat.com/show_bug.cgi?id=1575526

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index a11b6d40da..59dc134785 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6968,7 +6968,8 @@ qemuBuildIOMMUCommandLine(virCommandPtr cmd,
     }
 
     case VIR_DOMAIN_IOMMU_MODEL_SMMUV3:
-        break;
+        /* There is no -device for SMMUv3, so nothing to be done here */
+        return 0;
 
     case VIR_DOMAIN_IOMMU_MODEL_LAST:
     default:
@@ -7617,6 +7618,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,
             break;
 
         case VIR_DOMAIN_IOMMU_MODEL_SMMUV3:
+            virBufferAddLit(&buf, ",iommu=smmuv3");
             break;
 
         case VIR_DOMAIN_IOMMU_MODEL_LAST:
diff --git a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args b/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args
index a96669078b..3d4bf3f0d6 100644
--- a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args
@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -object secret,id=masterKey0,format=raw,\
 file=/tmp/lib/domain--1-guest/master-key.aes \
--machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,iommu=smmuv3 \
 -m 1024 \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \