From: Michal Privoznik Date: Tue, 31 Jan 2023 15:41:19 +0000 (+0100) Subject: virDomainNetDefFormat: Modernize formatting X-Git-Tag: v9.1.0-rc1~138 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95c5ff9890335515b6f80b105684f7cd3450390a;p=thirdparty%2Flibvirt.git virDomainNetDefFormat: Modernize formatting The child element of is formatted the old way. Switch to virXMLFormatElement(). Signed-off-by: Michal Privoznik Reviewed-by: Peter Krempa --- diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bab8f09e26..fb2455840a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -23681,7 +23681,6 @@ virDomainNetDefFormat(virBuffer *buf, { virDomainNetType actualType = virDomainNetGetActualType(def); bool publicActual = false; - int sourceLines = 0; const char *typeStr; virDomainHostdevDef *hostdef = NULL; char macstr[VIR_MAC_STRING_BUFLEN]; @@ -23745,6 +23744,8 @@ virDomainNetDefFormat(virBuffer *buf, if (virDomainActualNetDefContentsFormat(buf, def, false, flags, xmlopt) < 0) return -1; } else { + g_auto(virBuffer) sourceAttrBuf = VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) sourceChildBuf = VIR_BUFFER_INIT_CHILD(buf); /* ...but if we've asked for the inactive XML (rather than * status), or to report the ActualDef as a separate * subelement (this is how we privately store interface @@ -23754,17 +23755,16 @@ virDomainNetDefFormat(virBuffer *buf, */ switch (def->type) { case VIR_DOMAIN_NET_TYPE_NETWORK: - virBufferEscapeString(buf, "data.network.name); - virBufferEscapeString(buf, " portgroup='%s'", + virBufferEscapeString(&sourceAttrBuf, " portgroup='%s'", def->data.network.portgroup); if (virUUIDIsValid(def->data.network.portid) && !(flags & (VIR_DOMAIN_DEF_FORMAT_INACTIVE))) { char portidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(def->data.network.portid, portidstr); - virBufferEscapeString(buf, " portid='%s'", portidstr); + virBufferEscapeString(&sourceAttrBuf, " portid='%s'", portidstr); } - sourceLines++; break; case VIR_DOMAIN_NET_TYPE_ETHERNET: @@ -23772,31 +23772,23 @@ virDomainNetDefFormat(virBuffer *buf, case VIR_DOMAIN_NET_TYPE_VHOSTUSER: if (def->data.vhostuser->type == VIR_DOMAIN_CHR_TYPE_UNIX) { - virBufferAddLit(buf, "data.vhostuser->data.nix.path); - virBufferAsprintf(buf, " mode='%s'", + virBufferAsprintf(&sourceAttrBuf, " mode='%s'", def->data.vhostuser->data.nix.listen ? "server" : "client"); - sourceLines++; if (def->data.vhostuser->data.nix.reconnect.enabled) { - virBufferAddLit(buf, ">\n"); - sourceLines++; - virBufferAdjustIndent(buf, 2); - virDomainChrSourceReconnectDefFormat(buf, + virDomainChrSourceReconnectDefFormat(&sourceChildBuf, &def->data.vhostuser->data.nix.reconnect); - virBufferAdjustIndent(buf, -2); } } break; case VIR_DOMAIN_NET_TYPE_BRIDGE: - if (def->data.bridge.brname) { - virBufferEscapeString(buf, "data.bridge.brname); - sourceLines++; - } + virBufferEscapeString(&sourceAttrBuf, " bridge='%s'", + def->data.bridge.brname); break; case VIR_DOMAIN_NET_TYPE_SERVER: @@ -23804,42 +23796,32 @@ virDomainNetDefFormat(virBuffer *buf, case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_UDP: if (def->data.socket.address) { - virBufferAsprintf(buf, "data.socket.address, def->data.socket.port); } else { - virBufferAsprintf(buf, "data.socket.port); } - sourceLines++; if (def->type != VIR_DOMAIN_NET_TYPE_UDP) break; - virBufferAddLit(buf, ">\n"); - sourceLines++; - virBufferAdjustIndent(buf, 2); - - virBufferAsprintf(buf, "\n", + virBufferAsprintf(&sourceChildBuf, "\n", def->data.socket.localaddr, def->data.socket.localport); - virBufferAdjustIndent(buf, -2); break; case VIR_DOMAIN_NET_TYPE_INTERNAL: - if (def->data.internal.name) { - virBufferEscapeString(buf, "data.internal.name); - sourceLines++; - } + virBufferEscapeString(&sourceAttrBuf, " name='%s'", + def->data.internal.name); break; case VIR_DOMAIN_NET_TYPE_DIRECT: - virBufferEscapeString(buf, "data.direct.linkdev); - virBufferAsprintf(buf, " mode='%s'", + virBufferAsprintf(&sourceAttrBuf, " mode='%s'", virNetDevMacVLanModeTypeToString(def->data.direct.mode)); - sourceLines++; break; case VIR_DOMAIN_NET_TYPE_HOSTDEV: @@ -23850,33 +23832,24 @@ virDomainNetDefFormat(virBuffer *buf, break; case VIR_DOMAIN_NET_TYPE_VDPA: - if (def->data.vdpa.devicepath) { - virBufferEscapeString(buf, "data.vdpa.devicepath); - sourceLines++; - } - break; + virBufferEscapeString(&sourceAttrBuf, " dev='%s'", + def->data.vdpa.devicepath); + break; case VIR_DOMAIN_NET_TYPE_VDS: { char switchidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(def->data.vds.switch_id, switchidstr); - virBufferEscapeString(buf, "data.vds.port_id); - virBufferEscapeString(buf, " portgroupid='%s'", def->data.vds.portgroup_id); - virBufferAsprintf(buf, " connectionid='%lld'", def->data.vds.connection_id); - - sourceLines++; - + virBufferEscapeString(&sourceAttrBuf, " switchid='%s'", switchidstr); + virBufferAsprintf(&sourceAttrBuf, " portid='%lld'", def->data.vds.port_id); + virBufferEscapeString(&sourceAttrBuf, " portgroupid='%s'", def->data.vds.portgroup_id); + virBufferAsprintf(&sourceAttrBuf, " connectionid='%lld'", def->data.vds.connection_id); break; } case VIR_DOMAIN_NET_TYPE_USER: - if (def->backend.type == VIR_DOMAIN_NET_BACKEND_PASST && - def->sourceDev) { - virBufferEscapeString(buf, "sourceDev); - sourceLines++; - } + if (def->backend.type == VIR_DOMAIN_NET_BACKEND_PASST) + virBufferEscapeString(&sourceAttrBuf, " dev='%s'", def->sourceDev); break; case VIR_DOMAIN_NET_TYPE_NULL: @@ -23884,27 +23857,12 @@ virDomainNetDefFormat(virBuffer *buf, break; } - /* if sourceLines == 0 - no info at all so far - * sourceLines == 1 - first line written, no terminating ">" - * sourceLines > 1 - multiple lines, including subelements - */ if (def->hostIP.nips || def->hostIP.nroutes) { - if (sourceLines == 0) { - virBufferAddLit(buf, "\n"); - sourceLines += 2; - } else if (sourceLines == 1) { - virBufferAddLit(buf, ">\n"); - sourceLines++; - } - virBufferAdjustIndent(buf, 2); - if (virDomainNetIPInfoFormat(buf, &def->hostIP) < 0) + if (virDomainNetIPInfoFormat(&sourceChildBuf, &def->hostIP) < 0) return -1; - virBufferAdjustIndent(buf, -2); } - if (sourceLines == 1) - virBufferAddLit(buf, "/>\n"); - else if (sourceLines > 1) - virBufferAddLit(buf, "\n"); + + virXMLFormatElement(buf, "source", &sourceAttrBuf, &sourceChildBuf); if (virNetDevVlanFormat(&def->vlan, buf) < 0) return -1; @@ -23922,7 +23880,6 @@ virDomainNetDefFormat(virBuffer *buf, (flags & VIR_DOMAIN_DEF_FORMAT_ACTUAL_NET) && (virDomainActualNetDefFormat(buf, def, flags, xmlopt) < 0)) return -1; - } if (virDomainNetIPInfoFormat(buf, &def->guestIP) < 0)