From nobody Wed May 8 00:41:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1614880733; cv=none; d=zohomail.com; s=zohoarc; b=Eb7cK1o6aWMo2y7KNH8S/3folJsG+KwB87bTD2pzZri/3bLR2NdJmDHrqpmLQp7mlSHDgcTyf/L6/A0gE6dbuFitxAc3Fc/HmhRil+mzYIqnD9kBLBWa2Q2by+/f3q99XwT4n4cIH1nHMMG/7SeNxUlI+uy8RpFYBNGQ7sdGpSU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614880733; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=e7JOhJC0538rjo17ITon7qlmt22Ze+/KCawjfnYIXdc=; b=lUK2YFDq2I2Ha5fnr89vcHXsK+pS9oLuHq2dr/e4xL/e6KNIu2JJdmwTiVvV63FSgIz5990tGq/me2vstpcZorEjWPyUuDu2j4UQCl0YIxbQXE64+JKAoGW3sPW1+r6ostCX55FfJePBTAasBEr3IuK+EGn+ZTe8oU/dY3LxKj8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1614880733698831.6077600907975; Thu, 4 Mar 2021 09:58:53 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-157-6Pqm3KVsOeOQZKYQnQZoSg-1; Thu, 04 Mar 2021 12:58:50 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 58F8F101F00E; Thu, 4 Mar 2021 17:58:42 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 59F235D9C6; Thu, 4 Mar 2021 17:58:41 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8909818095CA; Thu, 4 Mar 2021 17:58:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 124HwZ8o005142 for ; Thu, 4 Mar 2021 12:58:35 -0500 Received: by smtp.corp.redhat.com (Postfix) id B7A1C10190AA; Thu, 4 Mar 2021 17:58:35 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 01B651002393 for ; Thu, 4 Mar 2021 17:58:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614880732; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=e7JOhJC0538rjo17ITon7qlmt22Ze+/KCawjfnYIXdc=; b=BdMbRdHjIB/semdrSNr/cCn8FUG+6wC7tc6QkTu1Wjsfk2DdU3deGMQsbasXu4BNlmrr8e wDTGobXNuI7MpY/ie2QQoAUZLlrY8dAajIGkGU9P262Uo9ztXl7tJMj7W14jeuPV6SYlRG lHNVH9GtiKFr9IR7wYG2M4weOjksFjc= X-MC-Unique: 6Pqm3KVsOeOQZKYQnQZoSg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH] conf: Rewrite network virtio driver formatting using virXMLFormatElement Date: Thu, 4 Mar 2021 18:58:33 +0100 Message-Id: <1a8cc1b74ff43fcfdb7aac2d66b8b6eb94b6f677.1614880713.git.pkrempa@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Simplify the logic picking which element form to format by using virBuffers for the partial properties and virXMLFormatElement for combining them. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 93 ++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 58 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 05b6cb3000..0220db794e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -25428,108 +25428,97 @@ virDomainActualNetDefFormat(virBufferPtr buf, static void -virDomainVirtioNetGuestOptsFormat(char **outstr, +virDomainVirtioNetGuestOptsFormat(virBufferPtr buf, virDomainNetDefPtr def) { - g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; if (def->driver.virtio.guest.csum) { - virBufferAsprintf(&buf, "csum=3D'%s' ", + virBufferAsprintf(buf, " csum=3D'%s'", virTristateSwitchTypeToString(def->driver.virtio= .guest.csum)); } if (def->driver.virtio.guest.tso4) { - virBufferAsprintf(&buf, "tso4=3D'%s' ", + virBufferAsprintf(buf, " tso4=3D'%s'", virTristateSwitchTypeToString(def->driver.virtio= .guest.tso4)); } if (def->driver.virtio.guest.tso6) { - virBufferAsprintf(&buf, "tso6=3D'%s' ", + virBufferAsprintf(buf, " tso6=3D'%s'", virTristateSwitchTypeToString(def->driver.virtio= .guest.tso6)); } if (def->driver.virtio.guest.ecn) { - virBufferAsprintf(&buf, "ecn=3D'%s' ", + virBufferAsprintf(buf, " ecn=3D'%s'", virTristateSwitchTypeToString(def->driver.virtio= .guest.ecn)); } if (def->driver.virtio.guest.ufo) { - virBufferAsprintf(&buf, "ufo=3D'%s' ", + virBufferAsprintf(buf, " ufo=3D'%s'", virTristateSwitchTypeToString(def->driver.virtio= .guest.ufo)); } - virBufferTrim(&buf, " "); - - *outstr =3D virBufferContentAndReset(&buf); } static void -virDomainVirtioNetHostOptsFormat(char **outstr, +virDomainVirtioNetHostOptsFormat(virBufferPtr buf, virDomainNetDefPtr def) { - g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; if (def->driver.virtio.host.csum) { - virBufferAsprintf(&buf, "csum=3D'%s' ", + virBufferAsprintf(buf, " csum=3D'%s'", virTristateSwitchTypeToString(def->driver.virtio= .host.csum)); } if (def->driver.virtio.host.gso) { - virBufferAsprintf(&buf, "gso=3D'%s' ", + virBufferAsprintf(buf, " gso=3D'%s'", virTristateSwitchTypeToString(def->driver.virtio= .host.gso)); } if (def->driver.virtio.host.tso4) { - virBufferAsprintf(&buf, "tso4=3D'%s' ", + virBufferAsprintf(buf, " tso4=3D'%s'", virTristateSwitchTypeToString(def->driver.virtio= .host.tso4)); } if (def->driver.virtio.host.tso6) { - virBufferAsprintf(&buf, "tso6=3D'%s' ", + virBufferAsprintf(buf, " tso6=3D'%s'", virTristateSwitchTypeToString(def->driver.virtio= .host.tso6)); } if (def->driver.virtio.host.ecn) { - virBufferAsprintf(&buf, "ecn=3D'%s' ", + virBufferAsprintf(buf, " ecn=3D'%s'", virTristateSwitchTypeToString(def->driver.virtio= .host.ecn)); } if (def->driver.virtio.host.ufo) { - virBufferAsprintf(&buf, "ufo=3D'%s' ", + virBufferAsprintf(buf, " ufo=3D'%s'", virTristateSwitchTypeToString(def->driver.virtio= .host.ufo)); } if (def->driver.virtio.host.mrg_rxbuf) { - virBufferAsprintf(&buf, "mrg_rxbuf=3D'%s' ", + virBufferAsprintf(buf, " mrg_rxbuf=3D'%s'", virTristateSwitchTypeToString(def->driver.virtio= .host.mrg_rxbuf)); } - virBufferTrim(&buf, " "); - - *outstr =3D virBufferContentAndReset(&buf); } static void -virDomainVirtioNetDriverFormat(char **outstr, +virDomainVirtioNetDriverFormat(virBufferPtr buf, virDomainNetDefPtr def) { - g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; if (def->driver.virtio.name) { - virBufferAsprintf(&buf, " name=3D'%s'", + virBufferAsprintf(buf, " name=3D'%s'", virDomainNetBackendTypeToString(def->driver.virt= io.name)); } if (def->driver.virtio.txmode) { - virBufferAsprintf(&buf, " txmode=3D'%s'", + virBufferAsprintf(buf, " txmode=3D'%s'", virDomainNetVirtioTxModeTypeToString(def->driver= .virtio.txmode)); } if (def->driver.virtio.ioeventfd) { - virBufferAsprintf(&buf, " ioeventfd=3D'%s'", + virBufferAsprintf(buf, " ioeventfd=3D'%s'", virTristateSwitchTypeToString(def->driver.virtio= .ioeventfd)); } if (def->driver.virtio.event_idx) { - virBufferAsprintf(&buf, " event_idx=3D'%s'", + virBufferAsprintf(buf, " event_idx=3D'%s'", virTristateSwitchTypeToString(def->driver.virtio= .event_idx)); } if (def->driver.virtio.queues) - virBufferAsprintf(&buf, " queues=3D'%u'", def->driver.virtio.queue= s); + virBufferAsprintf(buf, " queues=3D'%u'", def->driver.virtio.queues= ); if (def->driver.virtio.rx_queue_size) - virBufferAsprintf(&buf, " rx_queue_size=3D'%u'", + virBufferAsprintf(buf, " rx_queue_size=3D'%u'", def->driver.virtio.rx_queue_size); if (def->driver.virtio.tx_queue_size) - virBufferAsprintf(&buf, " tx_queue_size=3D'%u'", + virBufferAsprintf(buf, " tx_queue_size=3D'%u'", def->driver.virtio.tx_queue_size); - virDomainVirtioOptionsFormat(&buf, def->virtio); - - *outstr =3D virBufferContentAndReset(&buf); + virDomainVirtioOptionsFormat(buf, def->virtio); } @@ -25834,30 +25823,18 @@ virDomainNetDefFormat(virBufferPtr buf, virBufferEscapeString(buf, "\n", virDomainNetGetModelString(def)); if (virDomainNetIsVirtioModel(def)) { - g_autofree char *str =3D NULL; - g_autofree char *gueststr =3D NULL; - g_autofree char *hoststr =3D NULL; - - virDomainVirtioNetDriverFormat(&str, def); - virDomainVirtioNetGuestOptsFormat(&gueststr, def); - virDomainVirtioNetHostOptsFormat(&hoststr, def); - - if (!gueststr && !hoststr) { - if (str) - virBufferAsprintf(buf, "\n", str); - } else { - if (str) - virBufferAsprintf(buf, "\n", str); - else - virBufferAddLit(buf, "\n"); - virBufferAdjustIndent(buf, 2); - if (hoststr) - virBufferAsprintf(buf, "\n", hoststr); - if (gueststr) - virBufferAsprintf(buf, "\n", gueststr); - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); - } + g_auto(virBuffer) driverAttrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) driverChildBuf =3D VIR_BUFFER_INIT_CHILD(buf= ); + g_auto(virBuffer) hostAttrBuf =3D VIR_BUFFER_INITIALIZER; + g_auto(virBuffer) guestAttrBuf =3D VIR_BUFFER_INITIALIZER; + + virDomainVirtioNetDriverFormat(&driverAttrBuf, def); + virDomainVirtioNetGuestOptsFormat(&guestAttrBuf, def); + virDomainVirtioNetHostOptsFormat(&hostAttrBuf, def); + + virXMLFormatElement(&driverChildBuf, "host", &hostAttrBuf, NUL= L); + virXMLFormatElement(&driverChildBuf, "guest", &guestAttrBuf, N= ULL); + virXMLFormatElement(buf, "driver", &driverAttrBuf, &driverChil= dBuf); } } if (def->backend.tap || def->backend.vhost) { --=20 2.29.2