From c996f879ba0d8ba02a4cf6706278509072470e8b Mon Sep 17 00:00:00 2001 From: Matt Coleman Date: Thu, 5 Nov 2020 22:33:04 -0500 Subject: [PATCH] domain_conf: make virDomainVsockDefFormat() void This function always returns zero, so it might as well be void. Signed-off-by: Matt Coleman Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 420c958d6c..a3ca332279 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -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, "\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);