]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
domain_conf: make virDomainVsockDefFormat() void
authorMatt Coleman <mcoleman@datto.com>
Fri, 6 Nov 2020 03:33:04 +0000 (22:33 -0500)
committerMichal Privoznik <mprivozn@redhat.com>
Wed, 11 Nov 2020 11:53:11 +0000 (12:53 +0100)
This function always returns zero, so it might as well be void.

Signed-off-by: Matt Coleman <matt@datto.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/conf/domain_conf.c

index 420c958d6c850fe50ea66927027a4123a637c645..a3ca332279a8d4b180ee2dd0135d81b200708fd1 100644 (file)
@@ -29446,7 +29446,7 @@ virDomainMemorybackingFormat(virBufferPtr buf,
 }
 
 
-static int
+static void
 virDomainVsockDefFormat(virBufferPtr buf,
                         virDomainVsockDefPtr vsock)
 {
@@ -29470,8 +29470,6 @@ virDomainVsockDefFormat(virBufferPtr buf,
     virDomainDeviceInfoFormat(&childBuf, &vsock->info, 0);
 
     virXMLFormatElement(buf, "vsock", &attrBuf, &childBuf);
-
-    return 0;
 }
 
 
@@ -30355,9 +30353,8 @@ virDomainDefFormatInternalSetRootName(virDomainDefPtr def,
     if (def->iommu)
         virDomainIOMMUDefFormat(buf, def->iommu);
 
-    if (def->vsock &&
-        virDomainVsockDefFormat(buf, def->vsock) < 0)
-        return -1;
+    if (def->vsock)
+        virDomainVsockDefFormat(buf, def->vsock);
 
     virBufferAdjustIndent(buf, -2);
     virBufferAddLit(buf, "</devices>\n");
@@ -31467,7 +31464,8 @@ virDomainDeviceDefCopy(virDomainDeviceDefPtr src,
         rc = 0;
         break;
     case VIR_DOMAIN_DEVICE_VSOCK:
-        rc = virDomainVsockDefFormat(&buf, src->data.vsock);
+        virDomainVsockDefFormat(&buf, src->data.vsock);
+        rc = 0;
         break;
     case VIR_DOMAIN_DEVICE_AUDIO:
         rc = virDomainAudioDefFormat(&buf, src->data.audio);