From nobody Sun May 19 00:17:25 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1675183505; cv=none;
	d=zohomail.com; s=zohoarc;
	b=PP3FRvvb9m1A9OsM8XcbT8zlsD5o+B+ned0IZ1R3lAHgk/SQCA+br5eM3uhFZkqGi3yevUPtkcFzRPXvQxmxDWcdXRqpu+mUuBn3sXLkr/HFpftt6wI7ro+a9+DZN9Kv+3qPWky+JwHAkiSaYXIL1dbKFyfmaQR6aexKSMF1hJk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1675183505;
 h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=kmm6azy8hD6hpqnFdAYcNzPMQDjWnDsnp4X3vHYdfYc=;
	b=iu9uYdNRXwifZMSOd5AvieNxQWU4jpIlgtD6C7iBEkEkH7YMHlboTJKhyYEOc7uI0tWo/Ahw632CxyH27OqE7j33tMTykDLB3aSNmuvmx5RgsA9Ao7gTijTgB5Mr0wWjuw9Gfb+k1I5uxsJ78KPQtiOuvO6M2n0f9umL8Je3TVU=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<mprivozn@redhat.com> (p=none dis=none)
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com
	with SMTPS id 1675183505784899.8143508993259;
 Tue, 31 Jan 2023 08:45:05 -0800 (PST)
Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com
 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-649-UaRVZipFPduy_gK-yQPOBQ-1; Tue, 31 Jan 2023 11:44:36 -0500
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com
 [10.11.54.2])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3C0661C05EA2;
	Tue, 31 Jan 2023 16:44:27 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (unknown [10.30.29.100])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 27CF340C1255;
	Tue, 31 Jan 2023 16:44:27 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (localhost [IPv6:::1])
	by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id E91FA1946589;
	Tue, 31 Jan 2023 16:44:26 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com
 [10.11.54.9])
 by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id A1AAF1946587 for <libvir-list@listman.corp.redhat.com>;
 Tue, 31 Jan 2023 16:44:23 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id 96939492B06; Tue, 31 Jan 2023 16:44:23 +0000 (UTC)
Received: from maggie.redhat.com (unknown [10.43.2.39])
 by smtp.corp.redhat.com (Postfix) with ESMTP id 3E833492B05
 for <libvir-list@redhat.com>; Tue, 31 Jan 2023 16:44:23 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1675183504;
	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:
	 in-reply-to:in-reply-to:references:references:list-id:list-help:
	 list-unsubscribe:list-subscribe:list-post;
	bh=kmm6azy8hD6hpqnFdAYcNzPMQDjWnDsnp4X3vHYdfYc=;
	b=Z2GBVxY977S5G9arr1SYQc/FVBKB30N/tt9gpQphdEUVILCO7H4r3WXpjj46IOUPzhq5vA
	1I7wPBpKhU9VoC18N+YQ3rHE97tIzflD11RA3EXGCWS2IfWeduYYdOlgcAZLzovrzTMxfp
	zFkg0S3CnrhSH/EFEEJsHNVeMJIs3xQ=
X-MC-Unique: UaRVZipFPduy_gK-yQPOBQ-1
X-Original-To: libvir-list@listman.corp.redhat.com
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH 1/7] qemuxml2xmloutdata: Turn net-mtu.xml into a symlink
Date: Tue, 31 Jan 2023 17:44:15 +0100
Message-Id: 
 <b4c8bcfea26e034e4830bbc4a7589afe50b3a3fc.1675183375.git.mprivozn@redhat.com>
In-Reply-To: <cover.1675183375.git.mprivozn@redhat.com>
References: <cover.1675183375.git.mprivozn@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <http://listman.redhat.com/archives/libvir-list/>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=subscribe>
Errors-To: libvir-list-bounces@redhat.com
Sender: "libvir-list" <libvir-list-bounces@redhat.com>
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1675183506744100001
Content-Type: text/plain; charset="utf-8"; x-default="true"

There's nothing specific about net-mtu test. In fact, if device
addresses are filled in (and some elements reordered), we get the
same XML. Make those changes to the input XML and turn the output
XML to be a symlink.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---
 tests/qemuxml2argvdata/net-mtu.xml   | 23 ++++++---
 tests/qemuxml2xmloutdata/net-mtu.xml | 72 +---------------------------
 2 files changed, 18 insertions(+), 77 deletions(-)
 mode change 100644 =3D> 120000 tests/qemuxml2xmloutdata/net-mtu.xml

diff --git a/tests/qemuxml2argvdata/net-mtu.xml b/tests/qemuxml2argvdata/ne=
t-mtu.xml
index 99258b97fa..900548b465 100644
--- a/tests/qemuxml2argvdata/net-mtu.xml
+++ b/tests/qemuxml2argvdata/net-mtu.xml
@@ -29,32 +29,43 @@
       <readonly/>
       <address type=3D'drive' controller=3D'0' bus=3D'1' target=3D'0' unit=
=3D'0'/>
     </disk>
-    <controller type=3D'usb' index=3D'0'/>
+    <controller type=3D'usb' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
     <controller type=3D'virtio-serial' index=3D'0'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
     </controller>
-    <controller type=3D'ide' index=3D'0'/>
+    <controller type=3D'ide' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
+    </controller>
     <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
     <interface type=3D'network'>
-      <source network=3D'default'/>
       <mac address=3D'52:54:00:e5:48:58'/>
+      <source network=3D'default'/>
       <model type=3D'virtio'/>
       <mtu size=3D'1500'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
     </interface>
     <interface type=3D'network'>
-      <source network=3D'default'/>
       <mac address=3D'52:54:00:e5:48:59'/>
+      <source network=3D'default'/>
       <model type=3D'virtio'/>
       <mtu size=3D'9000'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
     </interface>
     <serial type=3D'pty'>
-      <target port=3D'0'/>
+      <target type=3D'isa-serial' port=3D'0'>
+        <model name=3D'isa-serial'/>
+      </target>
     </serial>
     <console type=3D'pty'>
       <target type=3D'serial' port=3D'0'/>
     </console>
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
-    <memballoon model=3D'virtio'/>
+    <audio id=3D'1' type=3D'none'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
+    </memballoon>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-mtu.xml b/tests/qemuxml2xmloutdat=
a/net-mtu.xml
deleted file mode 100644
index 900548b465..0000000000
--- a/tests/qemuxml2xmloutdata/net-mtu.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<domain type=3D'qemu'>
-  <name>test</name>
-  <uuid>15d091de-0181-456b-9554-e4382dc1f1ab</uuid>
-  <memory unit=3D'KiB'>1048576</memory>
-  <currentMemory unit=3D'KiB'>1048576</currentMemory>
-  <vcpu placement=3D'static'>1</vcpu>
-  <os>
-    <type arch=3D'x86_64' machine=3D'pc'>hvm</type>
-    <boot dev=3D'cdrom'/>
-    <boot dev=3D'hd'/>
-    <bootmenu enable=3D'yes'/>
-  </os>
-  <clock offset=3D'utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type=3D'file' device=3D'disk'>
-      <driver name=3D'qemu' type=3D'qcow2' event_idx=3D'on'/>
-      <source file=3D'/var/lib/libvirt/images/f14.img'/>
-      <target dev=3D'vda' bus=3D'virtio'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
-    </disk>
-    <disk type=3D'file' device=3D'cdrom'>
-      <driver name=3D'qemu' type=3D'raw'/>
-      <source file=3D'/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso'/>
-      <target dev=3D'hdc' bus=3D'ide'/>
-      <readonly/>
-      <address type=3D'drive' controller=3D'0' bus=3D'1' target=3D'0' unit=
=3D'0'/>
-    </disk>
-    <controller type=3D'usb' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
-    </controller>
-    <controller type=3D'virtio-serial' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
-    </controller>
-    <controller type=3D'ide' index=3D'0'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x1'/>
-    </controller>
-    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
-    <interface type=3D'network'>
-      <mac address=3D'52:54:00:e5:48:58'/>
-      <source network=3D'default'/>
-      <model type=3D'virtio'/>
-      <mtu size=3D'1500'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02' f=
unction=3D'0x0'/>
-    </interface>
-    <interface type=3D'network'>
-      <mac address=3D'52:54:00:e5:48:59'/>
-      <source network=3D'default'/>
-      <model type=3D'virtio'/>
-      <mtu size=3D'9000'/>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
-    </interface>
-    <serial type=3D'pty'>
-      <target type=3D'isa-serial' port=3D'0'>
-        <model name=3D'isa-serial'/>
-      </target>
-    </serial>
-    <console type=3D'pty'>
-      <target type=3D'serial' port=3D'0'/>
-    </console>
-    <input type=3D'mouse' bus=3D'ps2'/>
-    <input type=3D'keyboard' bus=3D'ps2'/>
-    <audio id=3D'1' type=3D'none'/>
-    <memballoon model=3D'virtio'>
-      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmloutdata/net-mtu.xml b/tests/qemuxml2xmloutdat=
a/net-mtu.xml
new file mode 120000
index 0000000000..a4a2e06bc6
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/net-mtu.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/net-mtu.xml
\ No newline at end of file
--=20
2.39.1
From nobody Sun May 19 00:17:25 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 170.10.129.124 as permitted sender) client-ip=170.10.129.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 170.10.129.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=1675183478; cv=none;
	d=zohomail.com; s=zohoarc;
	b=fb1QlJndXU2ZxBBGgTFA3IHpWn3Lyl27YGyH/njtHwg5PaFHxwvxkD5tWZfHvsJh3hjtNQT9TjZyWGWHWa01CUZBBaME9pJhIRgSEHOUK9za3YPs8lNQuL/DiW7EYr8S4TpsbjEXVzhSJEZCGtdFUSHlwmOSpZFBG6deZIBbOrI=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1675183478;
 h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=n+EQPwLV9ESsIullAwGmXMLzLsXd8KR5K+Mu9x8NbHw=;
	b=CXKnb/jD9nt4/rJUXE8fc4W8dYM8yng4Ade8OuQ/8wTHqhEieGusHg5G1uC7Ib5S9hEy4RRyL6FuwzvX1LprpleY8eDMDAImoP5v3WzO51PXUauZ7S+iknALjzegA75OUG9HWv9bEQLRR532bCgSkfd18fZ0Ixu0yw+OjGXUZfY=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<mprivozn@redhat.com> (p=none dis=none)
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com
	with SMTPS id 1675183478150372.73601382527966;
 Tue, 31 Jan 2023 08:44:38 -0800 (PST)
Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com
 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-299-gs0-XeJTPd-PRfpoFce-Kw-1; Tue, 31 Jan 2023 11:44:29 -0500
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com
 [10.11.54.1])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A5F9E3810B1E;
	Tue, 31 Jan 2023 16:44:25 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (unknown [10.30.29.100])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 8F96C40C2005;
	Tue, 31 Jan 2023 16:44:25 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (localhost [IPv6:::1])
	by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id EB01319465B9;
	Tue, 31 Jan 2023 16:44:24 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com
 [10.11.54.9])
 by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id 4B8811946587 for <libvir-list@listman.corp.redhat.com>;
 Tue, 31 Jan 2023 16:44:24 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id 2FD8F492B06; Tue, 31 Jan 2023 16:44:24 +0000 (UTC)
Received: from maggie.redhat.com (unknown [10.43.2.39])
 by smtp.corp.redhat.com (Postfix) with ESMTP id CC5B7492B05
 for <libvir-list@redhat.com>; Tue, 31 Jan 2023 16:44:23 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1675183477;
	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:
	 in-reply-to:in-reply-to:references:references:list-id:list-help:
	 list-unsubscribe:list-subscribe:list-post;
	bh=n+EQPwLV9ESsIullAwGmXMLzLsXd8KR5K+Mu9x8NbHw=;
	b=gxxMyGloKKTyDhUkJ2SUY64RyDyTS4G0C6aLVzxnD1tb7w1NKG10J5KappqPwnu/c91mqX
	PW9yUmdHwQ5D35HF4HCJFan58zOwloadK/EKrRk3DaJS/6kI0gPpzUWrHfjdxW7Q9gGxvp
	v+aoMC3SJ0JX+W8OrRKl4+q1flBI3Ug=
X-MC-Unique: gs0-XeJTPd-PRfpoFce-Kw-1
X-Original-To: libvir-list@listman.corp.redhat.com
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH 2/7] virDomainNetDefFormat: Rename @attrBuf to @targetAttrBuf
Date: Tue, 31 Jan 2023 17:44:16 +0100
Message-Id: 
 <ed906d3cc4d1dbc555e838f64783cc8369fa4cb1.1675183375.git.mprivozn@redhat.com>
In-Reply-To: <cover.1675183375.git.mprivozn@redhat.com>
References: <cover.1675183375.git.mprivozn@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <http://listman.redhat.com/archives/libvir-list/>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=subscribe>
Errors-To: libvir-list-bounces@redhat.com
Sender: "libvir-list" <libvir-list-bounces@redhat.com>
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1675183478597100001
Content-Type: text/plain; charset="utf-8"; x-default="true"

The @attrBuf variable in virDomainNetDefFormat() is named too
broadly. It holds attribute buffer to the <target/> element.
Rename it to @targetAttrBuf then.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---
 src/conf/domain_conf.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 0cd6020ea3..382c32db67 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -23685,7 +23685,7 @@ virDomainNetDefFormat(virBuffer *buf,
     const char *typeStr;
     virDomainHostdevDef *hostdef =3D NULL;
     char macstr[VIR_MAC_STRING_BUFLEN];
-    g_auto(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) targetAttrBuf =3D VIR_BUFFER_INITIALIZER;
     const char *prefix =3D xmlopt ? xmlopt->config.netPrefix : NULL;
=20
     /* publicActual is true if we should report the current state in
@@ -23945,14 +23945,14 @@ virDomainNetDefFormat(virBuffer *buf,
             STRPREFIX(def->ifname, VIR_NET_GENERATED_MACVLAN_PREFIX) ||
             (prefix && STRPREFIX(def->ifname, prefix)))))) {
         /* Skip auto-generated target names for inactive config. */
-        virBufferEscapeString(&attrBuf, " dev=3D'%s'", def->ifname);
+        virBufferEscapeString(&targetAttrBuf, " dev=3D'%s'", def->ifname);
     }
     if (def->managed_tap !=3D VIR_TRISTATE_BOOL_ABSENT) {
-        virBufferAsprintf(&attrBuf, " managed=3D'%s'",
+        virBufferAsprintf(&targetAttrBuf, " managed=3D'%s'",
                           virTristateBoolTypeToString(def->managed_tap));
     }
=20
-    virXMLFormatElement(buf, "target", &attrBuf, NULL);
+    virXMLFormatElement(buf, "target", &targetAttrBuf, NULL);
=20
     if (def->ifname_guest || def->ifname_guest_actual) {
         virBufferAddLit(buf, "<guest");
--=20
2.39.1
From nobody Sun May 19 00:17:25 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 170.10.129.124 as permitted sender) client-ip=170.10.129.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 170.10.129.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=1675183486; cv=none;
	d=zohomail.com; s=zohoarc;
	b=ZkwEyj4crEgQ+fu3JCnx4jDXqXRLnfUP8F3CDDMiEH5y4PdTvuUIH709BRC93ab6DeAx7mJwSviIrOb6ZL6tQuShmXFCKHN78tEkUjkFuphU+lYxflIChfwbZII6O8N9GoigCIIOx2F/W6/8u9OUOtnBGVI3sf7y69ONlj94Wok=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1675183486;
 h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=iBFFt6NYkaVNRBWDcfaKs9ejrNnAuue5SD6Xfl1MFUk=;
	b=LNe9UsayA0LMSPdMEj9IzDyASYcT12TzE/kPFxg8y15d+Z/CNNeGo3hSWyT8osNvLMWoBGHMS+KEEiZw/Gy3mX9nT6aHqjb1ZMmMECiQkzfbMUzSUcjdBDtRjRh1qpyoXQJqhJ/uIJJ+NbAsBPB6MFYkcKhZgWmWRs4Ai7awkGA=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<mprivozn@redhat.com> (p=none dis=none)
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com
	with SMTPS id 1675183486275568.4177503209858;
 Tue, 31 Jan 2023 08:44:46 -0800 (PST)
Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com
 [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-219-xptWtsFVNXadnDkhihfuHA-1; Tue, 31 Jan 2023 11:44:41 -0500
Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com
 [10.11.54.10])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9E0F918A6476;
	Tue, 31 Jan 2023 16:44:27 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (unknown [10.30.29.100])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 82B3B492B11;
	Tue, 31 Jan 2023 16:44:27 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (localhost [IPv6:::1])
	by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id 2AA5D19465B7;
	Tue, 31 Jan 2023 16:44:27 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com
 [10.11.54.9])
 by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id DC41F19465B3 for <libvir-list@listman.corp.redhat.com>;
 Tue, 31 Jan 2023 16:44:24 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id BEB0E492B07; Tue, 31 Jan 2023 16:44:24 +0000 (UTC)
Received: from maggie.redhat.com (unknown [10.43.2.39])
 by smtp.corp.redhat.com (Postfix) with ESMTP id 661E4492B05
 for <libvir-list@redhat.com>; Tue, 31 Jan 2023 16:44:24 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1675183485;
	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:
	 in-reply-to:in-reply-to:references:references:list-id:list-help:
	 list-unsubscribe:list-subscribe:list-post;
	bh=iBFFt6NYkaVNRBWDcfaKs9ejrNnAuue5SD6Xfl1MFUk=;
	b=FE9KHUXGyNEELP9hZytQaQvLXcvNZz3+pvxN2dhvvcwmoDylmGEEPgtlG98Sslyp2O+KzI
	TzzkO6iUd5dCCYl0nlL5a/S2tMvQo/q34cQ7FxSabOg2EpUz6CPftM47IIomQF7DqpVB8s
	4XV0lUeEPf848Pcz1knrn/J9Xh8V7iU=
X-MC-Unique: xptWtsFVNXadnDkhihfuHA-1
X-Original-To: libvir-list@listman.corp.redhat.com
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH 3/7] virDomainNetDefFormat: Modernize <tune/> formatting
Date: Tue, 31 Jan 2023 17:44:17 +0100
Message-Id: 
 <d150e5252372bc4911894a116620955de59449aa.1675183375.git.mprivozn@redhat.com>
In-Reply-To: <cover.1675183375.git.mprivozn@redhat.com>
References: <cover.1675183375.git.mprivozn@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <http://listman.redhat.com/archives/libvir-list/>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=subscribe>
Errors-To: libvir-list-bounces@redhat.com
Sender: "libvir-list" <libvir-list-bounces@redhat.com>
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1675183488542100001
Content-Type: text/plain; charset="utf-8"; x-default="true"

The <tune/> child element of <interface/> is formatted the old
way. Switch to virXMLFormatElement().

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---
 src/conf/domain_conf.c             | 10 +++++-----
 tests/qemuxml2argvdata/net-mtu.xml |  3 +++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 382c32db67..4c6f79efe3 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -23993,11 +23993,11 @@ virDomainNetDefFormat(virBuffer *buf,
     }
=20
     if (def->tune.sndbuf_specified) {
-        virBufferAddLit(buf,   "<tune>\n");
-        virBufferAdjustIndent(buf, 2);
-        virBufferAsprintf(buf, "<sndbuf>%llu</sndbuf>\n", def->tune.sndbuf=
);
-        virBufferAdjustIndent(buf, -2);
-        virBufferAddLit(buf,   "</tune>\n");
+        g_auto(virBuffer) sndChildBuf =3D VIR_BUFFER_INIT_CHILD(buf);
+
+        virBufferAsprintf(&sndChildBuf, "<sndbuf>%llu</sndbuf>\n", def->tu=
ne.sndbuf);
+
+        virXMLFormatElement(buf, "tune", NULL, &sndChildBuf);
     }
=20
     virDomainNetTeamingInfoFormat(def->teaming, buf);
diff --git a/tests/qemuxml2argvdata/net-mtu.xml b/tests/qemuxml2argvdata/ne=
t-mtu.xml
index 900548b465..092978bea0 100644
--- a/tests/qemuxml2argvdata/net-mtu.xml
+++ b/tests/qemuxml2argvdata/net-mtu.xml
@@ -50,6 +50,9 @@
       <mac address=3D'52:54:00:e5:48:59'/>
       <source network=3D'default'/>
       <model type=3D'virtio'/>
+      <tune>
+        <sndbuf>1600</sndbuf>
+      </tune>
       <mtu size=3D'9000'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
     </interface>
--=20
2.39.1
From nobody Sun May 19 00:17:25 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 170.10.129.124 as permitted sender) client-ip=170.10.129.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 170.10.129.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=1675183487; cv=none;
	d=zohomail.com; s=zohoarc;
	b=LatZhWYwNKQFCXIppQTUQTh2nllNHI53vRsoOM3kyc7TjCkTem4wHMcUrNSY5+OPz6VPzJ9CrUuOe2b5ae9ZDmkuyjhHOVgXYUgg3n+gri/eIo3ytWUrMUEwryu0t70roB6F1CUmpJfG9Y99CCqwSfxZDj+lVnEJ4wnzQzvrSlo=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1675183487;
 h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=/QWwBIGsPGuCv4gsr5MFozAm4ukKawODU7LGIRRjtFo=;
	b=HItEfci93uIWSR2TEksjgOZCU+1sC791fG64yQWu8t4XRgrO/TH4Pp3yvsnLKZOSnsAOjGrO89YOYQ8zHpaAEcYHCOgYkOpSprZhHeaODtDiOOvrjBemaYDjK+f0DbjbnzDQgzAj4bnaTJ0GG0o+P8+fUH6NDIkReI6urGoIHd4=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<mprivozn@redhat.com> (p=none dis=none)
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com
	with SMTPS id 1675183487211383.4283472764922;
 Tue, 31 Jan 2023 08:44:47 -0800 (PST)
Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com
 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-259-iyVC8qGBPLq54wvKSNPOCA-1; Tue, 31 Jan 2023 11:44:38 -0500
Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com
 [10.11.54.9])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A4B0729A9D5C;
	Tue, 31 Jan 2023 16:44:27 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (unknown [10.30.29.100])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 89020492B06;
	Tue, 31 Jan 2023 16:44:27 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (localhost [IPv6:::1])
	by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id 2E79E19465BA;
	Tue, 31 Jan 2023 16:44:27 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com
 [10.11.54.9])
 by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id 792161946589 for <libvir-list@listman.corp.redhat.com>;
 Tue, 31 Jan 2023 16:44:25 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id 5B668492B0B; Tue, 31 Jan 2023 16:44:25 +0000 (UTC)
Received: from maggie.redhat.com (unknown [10.43.2.39])
 by smtp.corp.redhat.com (Postfix) with ESMTP id 00150492B05
 for <libvir-list@redhat.com>; Tue, 31 Jan 2023 16:44:24 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1675183485;
	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:
	 in-reply-to:in-reply-to:references:references:list-id:list-help:
	 list-unsubscribe:list-subscribe:list-post;
	bh=/QWwBIGsPGuCv4gsr5MFozAm4ukKawODU7LGIRRjtFo=;
	b=CX0brXkNWd4BJtmGHt4v4UCEvy1DUHUsIvpXhvqtmFqJOgHp7H8yX+DwjKDlMMIXLQVIHR
	OLbI8ryGTNXk3W9ERy2vgsOvR4c/5fRXV9nf97iynLTEzZuWn5vD6HKO6+HYSadVYoAB4O
	X17YmJ/YotMDmyBvgAbkvjmuOyIovpQ=
X-MC-Unique: iyVC8qGBPLq54wvKSNPOCA-1
X-Original-To: libvir-list@listman.corp.redhat.com
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH 4/7] virDomainNetDefFormat: Modernize <guest/> formatting
Date: Tue, 31 Jan 2023 17:44:18 +0100
Message-Id: 
 <9b1f1ef853fe21a77c87713aba080b320373c97c.1675183375.git.mprivozn@redhat.com>
In-Reply-To: <cover.1675183375.git.mprivozn@redhat.com>
References: <cover.1675183375.git.mprivozn@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <http://listman.redhat.com/archives/libvir-list/>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=subscribe>
Errors-To: libvir-list-bounces@redhat.com
Sender: "libvir-list" <libvir-list-bounces@redhat.com>
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1675183488549100002
Content-Type: text/plain; charset="utf-8"; x-default="true"

The <guest/> child element of <interface/> is formatted the old
way. Switch to virXMLFormatElement(). Since this element is used
in LXC driver, this part of the function is tested by
lxcxml2xmltest (specifically lxc-ethernet* test cases).

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---
 src/conf/domain_conf.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 4c6f79efe3..bab8f09e26 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -23955,16 +23955,17 @@ virDomainNetDefFormat(virBuffer *buf,
     virXMLFormatElement(buf, "target", &targetAttrBuf, NULL);
=20
     if (def->ifname_guest || def->ifname_guest_actual) {
-        virBufferAddLit(buf, "<guest");
+        g_auto(virBuffer) guestAttrBuf =3D VIR_BUFFER_INITIALIZER;
+
         /* Skip auto-generated target names for inactive config. */
-        if (def->ifname_guest)
-            virBufferEscapeString(buf, " dev=3D'%s'", def->ifname_guest);
+        virBufferEscapeString(&guestAttrBuf, " dev=3D'%s'", def->ifname_gu=
est);
=20
         /* Only set if the host is running, so shouldn't pollute output */
-        if (def->ifname_guest_actual)
-            virBufferEscapeString(buf, " actual=3D'%s'", def->ifname_guest=
_actual);
-        virBufferAddLit(buf, "/>\n");
+        virBufferEscapeString(&guestAttrBuf, " actual=3D'%s'", def->ifname=
_guest_actual);
+
+        virXMLFormatElement(buf, "guest", &guestAttrBuf, NULL);
     }
+
     if (virDomainNetGetModelString(def)) {
         virBufferEscapeString(buf, "<model type=3D'%s'/>\n",
                               virDomainNetGetModelString(def));
--=20
2.39.1
From nobody Sun May 19 00:17:25 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 170.10.129.124 as permitted sender) client-ip=170.10.129.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 170.10.129.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=1675183515; cv=none;
	d=zohomail.com; s=zohoarc;
	b=XDXKQ3QTnu3wRYO8sTLcpYhhliKlViLeXLfYIs+IB2BAsf26sSwJJkoq8+SbPWKOU79dvpqD96jKuBE3Hr4ifru6/c2r+smXexiGYRbJC9SU9lUBa8zbc0zHE82YITC4PT7N2XBxhCfO/63psY8ZG3newKICeqNUzXWR+H6mzsk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1675183515;
 h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=Hjc3ikm+l98HPDkX0dTdyNVVGBApO+pHGl+5ribDCfg=;
	b=WPNPgo7RuNTfaJY5Bzz41k3RD6FU5lkcjzCXXsiqsamWqGHfFUzIqPLvcfIjXJR8LcqgcLaZ95dEy1EWqFiZx4VW0+HB/ftHmSvX2XRmUVwZu+Vs22Up6vqHdVZCvz/A7Fh3c1bjRwDCAmkB0vTyhx5F7RLdVjlXSx1AcS2irqc=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<mprivozn@redhat.com> (p=none dis=none)
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com
	with SMTPS id 1675183515474329.81741031352055;
 Tue, 31 Jan 2023 08:45:15 -0800 (PST)
Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com
 [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-15-XFHvfIt-Pmqf6zmqnEfWWA-1; Tue, 31 Jan 2023 11:44:38 -0500
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com
 [10.11.54.7])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 40D8D87AA0A;
	Tue, 31 Jan 2023 16:44:28 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (unknown [10.30.29.100])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 1ADE414171BB;
	Tue, 31 Jan 2023 16:44:28 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (localhost [IPv6:::1])
	by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id 7EFBA1946A4C;
	Tue, 31 Jan 2023 16:44:27 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com
 [10.11.54.9])
 by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id 7D3F31946587 for <libvir-list@listman.corp.redhat.com>;
 Tue, 31 Jan 2023 16:44:26 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id 53521492B06; Tue, 31 Jan 2023 16:44:26 +0000 (UTC)
Received: from maggie.redhat.com (unknown [10.43.2.39])
 by smtp.corp.redhat.com (Postfix) with ESMTP id 8E4A0492B05
 for <libvir-list@redhat.com>; Tue, 31 Jan 2023 16:44:25 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1675183514;
	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:
	 in-reply-to:in-reply-to:references:references:list-id:list-help:
	 list-unsubscribe:list-subscribe:list-post;
	bh=Hjc3ikm+l98HPDkX0dTdyNVVGBApO+pHGl+5ribDCfg=;
	b=R/8qO0e8PHMbmTUeSV71gMQCvEo9cmdUEC2cv0IhZww9yYoWCeFF5vvakCdWEN5NuNrzt2
	yeq2nUzukFyJ0gIHLxsKZ9v6Zh/oFph+PH9bqFo60Hqub1SgZaOJxUhiPUG5z35uQcoBol
	OqZCouecVlZqagZJC6fpprrPCX23Np4=
X-MC-Unique: XFHvfIt-Pmqf6zmqnEfWWA-1
X-Original-To: libvir-list@listman.corp.redhat.com
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH 5/7] virDomainNetDefFormat: Modernize <source/> formatting
Date: Tue, 31 Jan 2023 17:44:19 +0100
Message-Id: 
 <433ccd3c7e3bbbf9c267697944e13296099dcdef.1675183375.git.mprivozn@redhat.com>
In-Reply-To: <cover.1675183375.git.mprivozn@redhat.com>
References: <cover.1675183375.git.mprivozn@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <http://listman.redhat.com/archives/libvir-list/>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=subscribe>
Errors-To: libvir-list-bounces@redhat.com
Sender: "libvir-list" <libvir-list-bounces@redhat.com>
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1675183516681100003
Content-Type: text/plain; charset="utf-8"; x-default="true"

The <source/> child element of <interface/> is formatted the old
way. Switch to virXMLFormatElement().

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---
 src/conf/domain_conf.c | 103 ++++++++++++-----------------------------
 1 file changed, 30 insertions(+), 73 deletions(-)

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 =3D virDomainNetGetActualType(def);
     bool publicActual =3D false;
-    int sourceLines =3D 0;
     const char *typeStr;
     virDomainHostdevDef *hostdef =3D NULL;
     char macstr[VIR_MAC_STRING_BUFLEN];
@@ -23745,6 +23744,8 @@ virDomainNetDefFormat(virBuffer *buf,
         if (virDomainActualNetDefContentsFormat(buf, def, false, flags, xm=
lopt) < 0)
             return -1;
     } else {
+        g_auto(virBuffer) sourceAttrBuf =3D VIR_BUFFER_INITIALIZER;
+        g_auto(virBuffer) sourceChildBuf =3D 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 <actual>
          * 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, "<source network=3D'%s'",
+            virBufferEscapeString(&sourceAttrBuf, " network=3D'%s'",
                                   def->data.network.name);
-            virBufferEscapeString(buf, " portgroup=3D'%s'",
+            virBufferEscapeString(&sourceAttrBuf, " portgroup=3D'%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=3D'%s'", portidstr);
+                virBufferEscapeString(&sourceAttrBuf, " portid=3D'%s'", po=
rtidstr);
             }
-            sourceLines++;
             break;
=20
         case VIR_DOMAIN_NET_TYPE_ETHERNET:
@@ -23772,31 +23772,23 @@ virDomainNetDefFormat(virBuffer *buf,
=20
         case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
             if (def->data.vhostuser->type =3D=3D VIR_DOMAIN_CHR_TYPE_UNIX)=
 {
-                virBufferAddLit(buf, "<source type=3D'unix'");
-                virBufferEscapeString(buf, " path=3D'%s'",
+                virBufferAddLit(&sourceAttrBuf, " type=3D'unix'");
+                virBufferEscapeString(&sourceAttrBuf, " path=3D'%s'",
                                       def->data.vhostuser->data.nix.path);
-                virBufferAsprintf(buf, " mode=3D'%s'",
+                virBufferAsprintf(&sourceAttrBuf, " mode=3D'%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.vhostu=
ser->data.nix.reconnect);
-                    virBufferAdjustIndent(buf, -2);
                 }
=20
             }
             break;
=20
         case VIR_DOMAIN_NET_TYPE_BRIDGE:
-           if (def->data.bridge.brname) {
-               virBufferEscapeString(buf, "<source bridge=3D'%s'",
-                                     def->data.bridge.brname);
-               sourceLines++;
-           }
+            virBufferEscapeString(&sourceAttrBuf, " bridge=3D'%s'",
+                                  def->data.bridge.brname);
             break;
=20
         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, "<source address=3D'%s' port=3D'%d'=
",
+                virBufferAsprintf(&sourceAttrBuf, " address=3D'%s' port=3D=
'%d'",
                                   def->data.socket.address,
                                   def->data.socket.port);
             } else {
-                virBufferAsprintf(buf, "<source port=3D'%d'",
+                virBufferAsprintf(&sourceAttrBuf, " port=3D'%d'",
                                   def->data.socket.port);
             }
-            sourceLines++;
=20
             if (def->type !=3D VIR_DOMAIN_NET_TYPE_UDP)
                 break;
=20
-            virBufferAddLit(buf, ">\n");
-            sourceLines++;
-            virBufferAdjustIndent(buf, 2);
-
-            virBufferAsprintf(buf, "<local address=3D'%s' port=3D'%d'/>\n",
+            virBufferAsprintf(&sourceChildBuf, "<local address=3D'%s' port=
=3D'%d'/>\n",
                               def->data.socket.localaddr,
                               def->data.socket.localport);
-            virBufferAdjustIndent(buf, -2);
             break;
=20
         case VIR_DOMAIN_NET_TYPE_INTERNAL:
-            if (def->data.internal.name) {
-                virBufferEscapeString(buf, "<source name=3D'%s'",
-                                      def->data.internal.name);
-                sourceLines++;
-            }
+            virBufferEscapeString(&sourceAttrBuf, " name=3D'%s'",
+                                  def->data.internal.name);
             break;
=20
         case VIR_DOMAIN_NET_TYPE_DIRECT:
-            virBufferEscapeString(buf, "<source dev=3D'%s'",
+            virBufferEscapeString(&sourceAttrBuf, " dev=3D'%s'",
                                   def->data.direct.linkdev);
-            virBufferAsprintf(buf, " mode=3D'%s'",
+            virBufferAsprintf(&sourceAttrBuf, " mode=3D'%s'",
                               virNetDevMacVLanModeTypeToString(def->data.d=
irect.mode));
-            sourceLines++;
             break;
=20
         case VIR_DOMAIN_NET_TYPE_HOSTDEV:
@@ -23850,33 +23832,24 @@ virDomainNetDefFormat(virBuffer *buf,
             break;
=20
         case VIR_DOMAIN_NET_TYPE_VDPA:
-           if (def->data.vdpa.devicepath) {
-               virBufferEscapeString(buf, "<source dev=3D'%s'",
-                                     def->data.vdpa.devicepath);
-               sourceLines++;
-           }
-           break;
+            virBufferEscapeString(&sourceAttrBuf, " dev=3D'%s'",
+                                  def->data.vdpa.devicepath);
+            break;
=20
         case VIR_DOMAIN_NET_TYPE_VDS: {
             char switchidstr[VIR_UUID_STRING_BUFLEN];
=20
             virUUIDFormat(def->data.vds.switch_id, switchidstr);
-            virBufferEscapeString(buf, "<source switchid=3D'%s'", switchid=
str);
-            virBufferAsprintf(buf, " portid=3D'%lld'", def->data.vds.port_=
id);
-            virBufferEscapeString(buf, " portgroupid=3D'%s'", def->data.vd=
s.portgroup_id);
-            virBufferAsprintf(buf, " connectionid=3D'%lld'", def->data.vds=
.connection_id);
-
-            sourceLines++;
-
+            virBufferEscapeString(&sourceAttrBuf, " switchid=3D'%s'", swit=
chidstr);
+            virBufferAsprintf(&sourceAttrBuf, " portid=3D'%lld'", def->dat=
a.vds.port_id);
+            virBufferEscapeString(&sourceAttrBuf, " portgroupid=3D'%s'", d=
ef->data.vds.portgroup_id);
+            virBufferAsprintf(&sourceAttrBuf, " connectionid=3D'%lld'", de=
f->data.vds.connection_id);
             break;
         }
=20
         case VIR_DOMAIN_NET_TYPE_USER:
-            if (def->backend.type =3D=3D VIR_DOMAIN_NET_BACKEND_PASST &&
-                def->sourceDev) {
-                virBufferEscapeString(buf, "<source dev=3D'%s'", def->sour=
ceDev);
-                sourceLines++;
-            }
+            if (def->backend.type =3D=3D VIR_DOMAIN_NET_BACKEND_PASST)
+                virBufferEscapeString(&sourceAttrBuf, " dev=3D'%s'", def->=
sourceDev);
             break;
=20
         case VIR_DOMAIN_NET_TYPE_NULL:
@@ -23884,27 +23857,12 @@ virDomainNetDefFormat(virBuffer *buf,
             break;
         }
=20
-        /* if sourceLines =3D=3D 0 - no <source> info at all so far
-         *    sourceLines =3D=3D 1 - first line written, no terminating ">"
-         *    sourceLines > 1 - multiple lines, including subelements
-         */
         if (def->hostIP.nips || def->hostIP.nroutes) {
-            if (sourceLines =3D=3D 0) {
-                virBufferAddLit(buf, "<source>\n");
-                sourceLines +=3D 2;
-            } else if (sourceLines =3D=3D 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 =3D=3D 1)
-            virBufferAddLit(buf, "/>\n");
-        else if (sourceLines > 1)
-            virBufferAddLit(buf, "</source>\n");
+
+        virXMLFormatElement(buf, "source", &sourceAttrBuf, &sourceChildBuf=
);
=20
         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;
-
     }
=20
     if (virDomainNetIPInfoFormat(buf, &def->guestIP) < 0)
--=20
2.39.1
From nobody Sun May 19 00:17:25 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 170.10.129.124 as permitted sender) client-ip=170.10.129.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 170.10.129.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=1675183514; cv=none;
	d=zohomail.com; s=zohoarc;
	b=dkUfKeoMzItadmkYP6t3TE/8ZLU49rV3icbg7h+47ToUUgajZDVuCI6bPNByr0b6EtSmYZiUFet7H1ZMSw9f9iwK69Qizxd9qySiiFraOd3EKbzVhistyVKK9rde7NhCCfnKdATGzPfiu4j0JKx36hFVPiYkCo4fQXAQj53fkl0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1675183514;
 h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=pACvEf9pkONVAZfZTSuZZnqCDDHzBtcxnC57Zv6pAuk=;
	b=MGihuaTHkjVTx2u6Rys23ZSvMhs9uegfIt1CZhJ8kcUD69D//k0HDjfV5xUALRY8iz5aEh3deJxwnOlKzQddkGwQyawEJY6L4rwI2PA5sGBksIKxFlMBQeMIE4+ddryRT76WtcXrrCznOicO7PjWOu1gLIX2Nz/oe9rWMaqTkw8=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<mprivozn@redhat.com> (p=none dis=none)
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com
	with SMTPS id 1675183514305102.98328935180871;
 Tue, 31 Jan 2023 08:45:14 -0800 (PST)
Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com
 [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-371-mwRh90IMM-GLZUakOvRkeA-1; Tue, 31 Jan 2023 11:44:40 -0500
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com
 [10.11.54.6])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8B5A8862FE7;
	Tue, 31 Jan 2023 16:44:28 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (unknown [10.30.29.100])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 759822166B33;
	Tue, 31 Jan 2023 16:44:28 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (localhost [IPv6:::1])
	by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id 6B6261946589;
	Tue, 31 Jan 2023 16:44:28 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com
 [10.11.54.9])
 by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id C679E1946587 for <libvir-list@listman.corp.redhat.com>;
 Tue, 31 Jan 2023 16:44:26 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id B8ED4492B06; Tue, 31 Jan 2023 16:44:26 +0000 (UTC)
Received: from maggie.redhat.com (unknown [10.43.2.39])
 by smtp.corp.redhat.com (Postfix) with ESMTP id 60C9B492B05
 for <libvir-list@redhat.com>; Tue, 31 Jan 2023 16:44:26 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1675183513;
	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:
	 in-reply-to:in-reply-to:references:references:list-id:list-help:
	 list-unsubscribe:list-subscribe:list-post;
	bh=pACvEf9pkONVAZfZTSuZZnqCDDHzBtcxnC57Zv6pAuk=;
	b=YDKBIIYMD6VM1hKaISyNYlveBXVTepm1nHy5KTwM/syo9OmApQ4lEJDJNp9FgGGk/EWC2B
	Xm/u6WchzL7xCWGiH76bUiRehTE9ccK2iiKJ3aQrXbprF/m8peiqydn2SVOQEkIVclCPF1
	H2AQcwKmmR45BTmHeDhCoryN54uAeQo=
X-MC-Unique: mwRh90IMM-GLZUakOvRkeA-1
X-Original-To: libvir-list@listman.corp.redhat.com
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH 6/7] virDomainNetDefFormat: Simplify @sourceAttrBuf handling
 for some types of VIR_DOMAIN_NET
Date: Tue, 31 Jan 2023 17:44:20 +0100
Message-Id: 
 <3337af73ac4c77fea03f9e7130b4c004194486de.1675183375.git.mprivozn@redhat.com>
In-Reply-To: <cover.1675183375.git.mprivozn@redhat.com>
References: <cover.1675183375.git.mprivozn@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <http://listman.redhat.com/archives/libvir-list/>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=subscribe>
Errors-To: libvir-list-bounces@redhat.com
Sender: "libvir-list" <libvir-list-bounces@redhat.com>
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1675183514667100001
Content-Type: text/plain; charset="utf-8"; x-default="true"

For VIR_DOMAIN_NET_TYPE_{SERVER,CLIENT,MCAST,UDP} we need to put
(optionally) 'address' attribute and 'port' attributes of
<source/> element. But the way we currently do that is
particularly verbose. It can be shortened using
virBufferEscapeString().

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---
 src/conf/domain_conf.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index fb2455840a..b991a01af3 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -23795,14 +23795,10 @@ virDomainNetDefFormat(virBuffer *buf,
         case VIR_DOMAIN_NET_TYPE_CLIENT:
         case VIR_DOMAIN_NET_TYPE_MCAST:
         case VIR_DOMAIN_NET_TYPE_UDP:
-            if (def->data.socket.address) {
-                virBufferAsprintf(&sourceAttrBuf, " address=3D'%s' port=3D=
'%d'",
-                                  def->data.socket.address,
-                                  def->data.socket.port);
-            } else {
-                virBufferAsprintf(&sourceAttrBuf, " port=3D'%d'",
-                                  def->data.socket.port);
-            }
+            virBufferEscapeString(&sourceAttrBuf, " address=3D'%s'",
+                                  def->data.socket.address);
+            virBufferAsprintf(&sourceAttrBuf, " port=3D'%d'",
+                              def->data.socket.port);
=20
             if (def->type !=3D VIR_DOMAIN_NET_TYPE_UDP)
                 break;
--=20
2.39.1
From nobody Sun May 19 00:17:25 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 170.10.129.124 as permitted sender) client-ip=170.10.129.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 170.10.129.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=1675183525; cv=none;
	d=zohomail.com; s=zohoarc;
	b=F4Y6U0Ec7Mz55Z6QCnnx788eK/OXIFWCrxBCMsD7uE/8UKDHgSiKka1W4ZyGszoK3hX2BMYI9tDuTXzSJwQJvxCXl0zLCdtAMCGqnavp8+m+VGyMTabcac6LCq+ibHqApRuBEPAV+T1irdvmFsWeMs7zFmYLvxjLqRNh0Nqnyyk=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1675183525;
 h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=Jdhtinek31KAMTn1G6HRWDd80GZ6Ps42Oj4Py5MasTE=;
	b=nwNJIjNSGFr1vw/6kN2L+r1o7mWT1jH5EHFEMi5PlOdVDFWywi+Nk9rUoNfIvi06zF+KE6eaGn0yNA4HW6xez1uCIws0nJ4ZQe8FO/q9OdgZpa9Affpl0eSWioOAV6EJ37OhqPWwD+LxjGLVVIA6nsi2XblKu6JnE13B5bkmG2U=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<mprivozn@redhat.com> (p=none dis=none)
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com
	with SMTPS id 16751835253781005.0589724819517;
 Tue, 31 Jan 2023 08:45:25 -0800 (PST)
Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com
 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-445-xuNouVKDO4mbk56YUL3wWw-1; Tue, 31 Jan 2023 11:44:40 -0500
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com
 [10.11.54.2])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CDA2E1C068D9;
	Tue, 31 Jan 2023 16:44:31 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (unknown [10.30.29.100])
	by smtp.corp.redhat.com (Postfix) with ESMTP id BA4C540C141B;
	Tue, 31 Jan 2023 16:44:31 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (localhost [IPv6:::1])
	by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id AB4D21946589;
	Tue, 31 Jan 2023 16:44:31 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com
 [10.11.54.9])
 by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id 5FAE41946A4C for <libvir-list@listman.corp.redhat.com>;
 Tue, 31 Jan 2023 16:44:27 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id 5343B492B06; Tue, 31 Jan 2023 16:44:27 +0000 (UTC)
Received: from maggie.redhat.com (unknown [10.43.2.39])
 by smtp.corp.redhat.com (Postfix) with ESMTP id EFDA8492B05
 for <libvir-list@redhat.com>; Tue, 31 Jan 2023 16:44:26 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1675183524;
	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:
	 in-reply-to:in-reply-to:references:references:list-id:list-help:
	 list-unsubscribe:list-subscribe:list-post;
	bh=Jdhtinek31KAMTn1G6HRWDd80GZ6Ps42Oj4Py5MasTE=;
	b=eTTDl6K5WsQ/B9uXmr75nkSN9Gm8s2dzl6QooDKzfi7BD4o9+GzMN/7f4g8yNNeS49mnwG
	7AfFtvoFvITksTpmgs47/JAtgjVFjuIzgTRtMSQLhMyANXm5YiJ8FYJe7Fx2+JlbstVGBG
	BKV8Bjohac28/CBNSPNWid9+m9049K4=
X-MC-Unique: xuNouVKDO4mbk56YUL3wWw-1
X-Original-To: libvir-list@listman.corp.redhat.com
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH 7/7] virDomainNetDefFormat: Modernize <mac/> formatting
Date: Tue, 31 Jan 2023 17:44:21 +0100
Message-Id: 
 <b2bfbca8f1b948277c088c55634ca17df6871bcc.1675183375.git.mprivozn@redhat.com>
In-Reply-To: <cover.1675183375.git.mprivozn@redhat.com>
References: <cover.1675183375.git.mprivozn@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <http://listman.redhat.com/archives/libvir-list/>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=subscribe>
Errors-To: libvir-list-bounces@redhat.com
Sender: "libvir-list" <libvir-list-bounces@redhat.com>
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
X-ZM-MESSAGEID: 1675183526724100001
Content-Type: text/plain; charset="utf-8"; x-default="true"

The <source/> child element of <mac/> is formatted the old way.
Switch to virXMLFormatElement().

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---
 src/conf/domain_conf.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b991a01af3..1cf2bf84bc 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -23685,6 +23685,7 @@ virDomainNetDefFormat(virBuffer *buf,
     virDomainHostdevDef *hostdef =3D NULL;
     char macstr[VIR_MAC_STRING_BUFLEN];
     g_auto(virBuffer) targetAttrBuf =3D VIR_BUFFER_INITIALIZER;
+    g_auto(virBuffer) macAttrBuf =3D VIR_BUFFER_INITIALIZER;
     const char *prefix =3D xmlopt ? xmlopt->config.netPrefix : NULL;
=20
     /* publicActual is true if we should report the current state in
@@ -23725,13 +23726,13 @@ virDomainNetDefFormat(virBuffer *buf,
     virBufferAddLit(buf, ">\n");
=20
     virBufferAdjustIndent(buf, 2);
-    virBufferAsprintf(buf, "<mac address=3D'%s'",
+    virBufferAsprintf(&macAttrBuf, " address=3D'%s'",
                       virMacAddrFormat(&def->mac, macstr));
     if (def->mac_type)
-        virBufferAsprintf(buf, " type=3D'%s'", virDomainNetMacTypeTypeToSt=
ring(def->mac_type));
+        virBufferAsprintf(&macAttrBuf, " type=3D'%s'", virDomainNetMacType=
TypeToString(def->mac_type));
     if (def->mac_check !=3D VIR_TRISTATE_BOOL_ABSENT)
-        virBufferAsprintf(buf, " check=3D'%s'", virTristateBoolTypeToStrin=
g(def->mac_check));
-    virBufferAddLit(buf, "/>\n");
+        virBufferAsprintf(&macAttrBuf, " check=3D'%s'", virTristateBoolTyp=
eToString(def->mac_check));
+    virXMLFormatElement(buf, "mac", &macAttrBuf, NULL);
=20
     if (publicActual) {
         /* when there is a virDomainActualNetDef, and we haven't been
--=20
2.39.1