[PATCH 27/28] domain_conf: make virDomainShmemDefFormat() void

Matt Coleman mcoleman at datto.com
Fri Nov 6 03:33:03 UTC 2020


This function always returns zero, so it might as well be void.

Signed-off-by: Matt Coleman <matt at datto.com>
---
 src/conf/domain_conf.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e3d1922943..df876ae8c3 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -27738,7 +27738,7 @@ static void virDomainPanicDefFormat(virBufferPtr buf, virDomainPanicDefPtr def)
     virXMLFormatElement(buf, "panic", &attrBuf, &childrenBuf);
 }
 
-static int
+static void
 virDomainShmemDefFormat(virBufferPtr buf,
                         virDomainShmemDefPtr def,
                         unsigned int flags)
@@ -27777,8 +27777,6 @@ virDomainShmemDefFormat(virBufferPtr buf,
 
     virBufferAdjustIndent(buf, -2);
     virBufferAddLit(buf, "</shmem>\n");
-
-    return 0;
 }
 
 static int
@@ -30346,10 +30344,8 @@ virDomainDefFormatInternalSetRootName(virDomainDefPtr def,
     for (n = 0; n < def->npanics; n++)
         virDomainPanicDefFormat(buf, def->panics[n]);
 
-    for (n = 0; n < def->nshmems; n++) {
-        if (virDomainShmemDefFormat(buf, def->shmems[n], flags) < 0)
-            return -1;
-    }
+    for (n = 0; n < def->nshmems; n++)
+        virDomainShmemDefFormat(buf, def->shmems[n], flags);
 
     for (n = 0; n < def->nmems; n++) {
         if (virDomainMemoryDefFormat(buf, def->mems[n], def, flags) < 0)
@@ -31467,7 +31463,8 @@ virDomainDeviceDefCopy(virDomainDeviceDefPtr src,
         rc = virDomainMemoryDefFormat(&buf, src->data.memory, def, flags);
         break;
     case VIR_DOMAIN_DEVICE_SHMEM:
-        rc = virDomainShmemDefFormat(&buf, src->data.shmem, flags);
+        virDomainShmemDefFormat(&buf, src->data.shmem, flags);
+        rc = 0;
         break;
     case VIR_DOMAIN_DEVICE_VSOCK:
         rc = virDomainVsockDefFormat(&buf, src->data.vsock);
-- 
2.27.0





More information about the libvir-list mailing list