Fix printf style used with virDomainIOMMUDef::aw_bits

The aw_bits member of the virDomainIOMMUDef is of type unsigned
int. However, in a few places
(virDomainIOMMUDefCheckABIStability(), virDomainIOMMUDefFormat(),
qemuBuildIOMMUCommandLine()) incorrect printf modifier is used.
Fix those places.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 8b26de674e5679ac145f99a53709c215a8def672..9672168df98e0a3ff88333b953a2321ed0a6c7e2 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -22301,7 +22301,7 @@ virDomainIOMMUDefCheckABIStability(virDomainIOMMUDef *src,
     }
     if (src->aw_bits != dst->aw_bits) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("Target domain IOMMU device aw_bits value '%1$d' does not match source '%2$d'"),
+                       _("Target domain IOMMU device aw_bits value '%1$u' does not match source '%2$u'"),
                        dst->aw_bits, src->aw_bits);
         return false;
     }
@@ -28638,7 +28638,7 @@ virDomainIOMMUDefFormat(virBuffer *buf,
                           virTristateSwitchTypeToString(iommu->iotlb));
     }
     if (iommu->aw_bits > 0) {
-        virBufferAsprintf(&driverAttrBuf, " aw_bits='%d'",
+        virBufferAsprintf(&driverAttrBuf, " aw_bits='%u'",
                           iommu->aw_bits);
     }
     if (iommu->dma_translation != VIR_TRISTATE_SWITCH_ABSENT) {

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 0de0a79b46350221e662d92213e21a756cdc78a0..e81efdfde7f7f9468fe6ae1cc7fffc160b52df07 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6295,7 +6295,7 @@ qemuBuildIOMMUCommandLine(virCommand *cmd,
                                       "T:caching-mode", iommu->caching_mode,
                                       "S:eim", qemuOnOffAuto(iommu->eim),
                                       "T:device-iotlb", iommu->iotlb,
-                                      "z:aw-bits", iommu->aw_bits,
+                                      "p:aw-bits", iommu->aw_bits,
                                       "T:dma-translation", iommu->dma_translation,
                                       NULL) < 0)
                 return -1;