From: Ján Tomko <jtomko@redhat.com>
Date: Thu, 10 Dec 2020 08:49:07 +0000 (+0100)
Subject: qemuBuildMemoryDeviceStr: check return of qemuBuildDeviceAddressStr
X-Git-Tag: v7.0.0-rc1~227
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9a7b84f72181b860a7809eef11c0d4a32908de4;p=thirdparty%2Flibvirt.git

qemuBuildMemoryDeviceStr: check return of qemuBuildDeviceAddressStr

Although the function currently only returns errors for PCI addresses,
check it here too, in case that changes in the future.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 76edc3c617..b06a086e18 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3317,7 +3317,8 @@ qemuBuildMemoryDeviceStr(const virDomainDef *def,
         virBufferAsprintf(&buf, "memdev=mem%s,id=%s",
                           mem->info.alias, mem->info.alias);
 
-        qemuBuildDeviceAddressStr(&buf, def, &mem->info, qemuCaps);
+        if (qemuBuildDeviceAddressStr(&buf, def, &mem->info, qemuCaps) < 0)
+            return NULL;
         break;
 
     case VIR_DOMAIN_MEMORY_MODEL_NONE: