From nobody Fri Apr 19 16:00:11 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1552492289814195.59744709895108;
 Wed, 13 Mar 2019 08:51:29 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
 [10.5.11.13])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id DD46B3018991;
	Wed, 13 Mar 2019 15:51:27 +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 B54666A96F;
	Wed, 13 Mar 2019 15:51:27 +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 778BC181A13C;
	Wed, 13 Mar 2019 15:51:27 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
	[10.5.11.13])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x2DFpQrs001338 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 13 Mar 2019 11:51:26 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 115FE6A96F; Wed, 13 Mar 2019 15:51:26 +0000 (UTC)
Received: from worklaptop.redhat.com (ovpn-124-40.rdu2.redhat.com
	[10.10.124.40])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 7FEC66B8C4;
	Wed, 13 Mar 2019 15:51:25 +0000 (UTC)
From: Cole Robinson <crobinso@redhat.com>
To: libvirt-list@redhat.com
Date: Wed, 13 Mar 2019 11:51:10 -0400
Message-Id: 
 <fbc506f8b163a7296a5dc0f4d360ce7580d7a39d.1552492022.git.crobinso@redhat.com>
In-Reply-To: <cover.1552492022.git.crobinso@redhat.com>
References: <cover.1552492022.git.crobinso@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH v2 01/11] tests: Add several net model passthrough
	tests
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.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://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]);
 Wed, 13 Mar 2019 15:51:28 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Examples of passing unknown strings through <interface>
<model type=3DX/>

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 tests/qemuxml2argvdata/net-many-models.args   | 39 ++++++++++++++
 tests/qemuxml2argvdata/net-many-models.xml    | 37 +++++++++++++
 tests/qemuxml2argvtest.c                      |  1 +
 tests/qemuxml2xmloutdata/net-many-models.xml  | 53 +++++++++++++++++++
 tests/qemuxml2xmltest.c                       |  1 +
 tests/xlconfigdata/test-net-fakemodel.cfg     | 24 +++++++++
 tests/xlconfigdata/test-net-fakemodel.xml     | 39 ++++++++++++++
 tests/xlconfigtest.c                          |  1 +
 .../test-paravirt-net-fakemodel.cfg           | 13 +++++
 .../test-paravirt-net-fakemodel.xml           | 40 ++++++++++++++
 .../test-paravirt-net-modelstr.cfg            | 13 +++++
 tests/xmconfigtest.c                          |  1 +
 .../xml2sexpr-fv-net-many-models.sexpr        |  1 +
 .../xml2sexpr-fv-net-many-models.xml          | 43 +++++++++++++++
 tests/xml2sexprtest.c                         |  1 +
 15 files changed, 307 insertions(+)
 create mode 100644 tests/qemuxml2argvdata/net-many-models.args
 create mode 100644 tests/qemuxml2argvdata/net-many-models.xml
 create mode 100644 tests/qemuxml2xmloutdata/net-many-models.xml
 create mode 100644 tests/xlconfigdata/test-net-fakemodel.cfg
 create mode 100644 tests/xlconfigdata/test-net-fakemodel.xml
 create mode 100644 tests/xmconfigdata/test-paravirt-net-fakemodel.cfg
 create mode 100644 tests/xmconfigdata/test-paravirt-net-fakemodel.xml
 create mode 100644 tests/xmconfigdata/test-paravirt-net-modelstr.cfg
 create mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-many-models.sexpr
 create mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-many-models.xml

diff --git a/tests/qemuxml2argvdata/net-many-models.args b/tests/qemuxml2ar=
gvdata/net-many-models.args
new file mode 100644
index 0000000000..69909fc699
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-many-models.args
@@ -0,0 +1,39 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/home/test \
+USER=3Dtest \
+LOGNAME=3Dtest \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-i686 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-smp 1,sockets=3D1,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-no-acpi \
+-netdev user,id=3Dhostnet0 \
+-device idontexist,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=
=3Dpci.0,\
+addr=3D0x3 \
+-netdev user,id=3Dhostnet1 \
+-device vmxnet3,netdev=3Dhostnet1,id=3Dnet1,mac=3D00:11:22:33:44:56,bus=3D=
pci.0,\
+addr=3D0x4 \
+-netdev user,id=3Dhostnet2 \
+-device netfront,netdev=3Dhostnet2,id=3Dnet2,mac=3D00:11:22:33:44:57,bus=
=3Dpci.0,\
+addr=3D0x5 \
+-netdev user,id=3Dhostnet3 \
+-device virtio-net-pci,netdev=3Dhostnet3,id=3Dnet3,mac=3D00:11:22:33:44:58=
,bus=3Dpci.0,\
+addr=3D0x6 \
+-netdev user,id=3Dhostnet4 \
+-device ne2k_pci,netdev=3Dhostnet4,id=3Dnet4,mac=3D00:11:22:33:44:58,bus=
=3Dpci.0,\
+addr=3D0x7 \
+-netdev user,id=3Dhostnet5 \
+-device pcnet,netdev=3Dhostnet5,id=3Dnet5,mac=3D00:11:22:33:44:58,bus=3Dpc=
i.0,addr=3D0x8
diff --git a/tests/qemuxml2argvdata/net-many-models.xml b/tests/qemuxml2arg=
vdata/net-many-models.xml
new file mode 100644
index 0000000000..2b8f9b18eb
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-many-models.xml
@@ -0,0 +1,37 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <os>
+    <type arch=3D'i686' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <devices>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:55'/>
+      <model type=3D'idontexist'/>
+    </interface>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:56'/>
+      <model type=3D'vmxnet3'/>
+    </interface>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:57'/>
+      <model type=3D'netfront'/>
+    </interface>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:58'/>
+      <model type=3D'virtio'/>
+    </interface>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:58'/>
+      <model type=3D'ne2k_pci'/>
+    </interface>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:58'/>
+      <model type=3D'pcnet'/>
+    </interface>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 03e8d79595..26e869f881 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1347,6 +1347,7 @@ mymain(void)
     DO_TEST("net-eth-hostip", NONE);
     DO_TEST("net-client", NONE);
     DO_TEST("net-server", NONE);
+    DO_TEST("net-many-models", NONE);
     DO_TEST("net-mcast", NONE);
     DO_TEST("net-udp", NONE);
     DO_TEST("net-hostdev", NONE);
diff --git a/tests/qemuxml2xmloutdata/net-many-models.xml b/tests/qemuxml2x=
mloutdata/net-many-models.xml
new file mode 100644
index 0000000000..8fb3be920b
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/net-many-models.xml
@@ -0,0 +1,53 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'i686' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <controller type=3D'usb' index=3D'0' model=3D'none'/>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:55'/>
+      <model type=3D'idontexist'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </interface>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:56'/>
+      <model type=3D'vmxnet3'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </interface>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:57'/>
+      <model type=3D'netfront'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05' f=
unction=3D'0x0'/>
+    </interface>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:58'/>
+      <model type=3D'virtio'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06' f=
unction=3D'0x0'/>
+    </interface>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:58'/>
+      <model type=3D'ne2k_pci'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x07' f=
unction=3D'0x0'/>
+    </interface>
+    <interface type=3D'user'>
+      <mac address=3D'00:11:22:33:44:58'/>
+      <model type=3D'pcnet'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x08' f=
unction=3D'0x0'/>
+    </interface>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <memballoon model=3D'none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 83a0d1cf7b..03a6b8741e 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -433,6 +433,7 @@ mymain(void)
     DO_TEST("net-bandwidth2", NONE);
     DO_TEST("net-mtu", NONE);
     DO_TEST("net-coalesce", NONE);
+    DO_TEST("net-many-models", NONE);
=20
     DO_TEST("serial-tcp-tlsx509-chardev", NONE);
     DO_TEST("serial-tcp-tlsx509-chardev-notls", NONE);
diff --git a/tests/xlconfigdata/test-net-fakemodel.cfg b/tests/xlconfigdata=
/test-net-fakemodel.cfg
new file mode 100644
index 0000000000..70bd922ac0
--- /dev/null
+++ b/tests/xlconfigdata/test-net-fakemodel.cfg
@@ -0,0 +1,24 @@
+name =3D "XenGuest2"
+uuid =3D "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
+maxmem =3D 579
+memory =3D 394
+vcpus =3D 1
+pae =3D 1
+acpi =3D 1
+apic =3D 1
+viridian =3D 0
+rtc_timeoffset =3D 0
+localtime =3D 0
+on_poweroff =3D "destroy"
+on_reboot =3D "restart"
+on_crash =3D "restart"
+device_model =3D "/usr/lib/xen/bin/qemu-system-i386"
+sdl =3D 0
+vnc =3D 1
+vncunused =3D 1
+vnclisten =3D "127.0.0.1"
+vif =3D [ "mac=3D00:16:3e:66:92:9c,bridge=3Dxenbr1,script=3Dvif-bridge,mod=
el=3Dfakemodel" ]
+parallel =3D "none"
+serial =3D "none"
+builder =3D "hvm"
+boot =3D "d"
diff --git a/tests/xlconfigdata/test-net-fakemodel.xml b/tests/xlconfigdata=
/test-net-fakemodel.xml
new file mode 100644
index 0000000000..b9afbac78d
--- /dev/null
+++ b/tests/xlconfigdata/test-net-fakemodel.xml
@@ -0,0 +1,39 @@
+<domain type=3D'xen'>
+  <name>XenGuest2</name>
+  <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>592896</memory>
+  <currentMemory unit=3D'KiB'>403456</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <os>
+    <type arch=3D'x86_64' machine=3D'xenfv'>hvm</type>
+    <loader type=3D'rom'>/usr/lib/xen/boot/hvmloader</loader>
+    <boot dev=3D'cdrom'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <clock offset=3D'variable' adjustment=3D'0' basis=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator>
+    <interface type=3D'bridge'>
+      <mac address=3D'00:16:3e:66:92:9c'/>
+      <source bridge=3D'xenbr1'/>
+      <script path=3D'vif-bridge'/>
+      <model type=3D'fakemodel'/>
+    </interface>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <graphics type=3D'vnc' port=3D'-1' autoport=3D'yes' listen=3D'127.0.0.=
1'>
+      <listen type=3D'address' address=3D'127.0.0.1'/>
+    </graphics>
+    <video>
+      <model type=3D'cirrus' vram=3D'8192' heads=3D'1' primary=3D'yes'/>
+    </video>
+    <memballoon model=3D'xen'/>
+  </devices>
+</domain>
diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c
index 492bda2e63..ff27c96e87 100644
--- a/tests/xlconfigtest.c
+++ b/tests/xlconfigtest.c
@@ -259,6 +259,7 @@ mymain(void)
 #ifdef LIBXL_HAVE_QED
     DO_TEST_FORMAT("disk-qed", false);
 #endif
+    DO_TEST("net-fakemodel");
     DO_TEST("spice");
     DO_TEST("spice-features");
     DO_TEST("vif-rate");
diff --git a/tests/xmconfigdata/test-paravirt-net-fakemodel.cfg b/tests/xmc=
onfigdata/test-paravirt-net-fakemodel.cfg
new file mode 100644
index 0000000000..bf00cb555d
--- /dev/null
+++ b/tests/xmconfigdata/test-paravirt-net-fakemodel.cfg
@@ -0,0 +1,13 @@
+name =3D "XenGuest1"
+uuid =3D "c7a5fdb0-cdaf-9455-926a-d65c16db1809"
+maxmem =3D 579
+memory =3D 394
+vcpus =3D 1
+localtime =3D 0
+on_poweroff =3D "destroy"
+on_reboot =3D "restart"
+on_crash =3D "restart"
+vfb =3D [ "type=3Dvnc,vncunused=3D1,vnclisten=3D127.0.0.1,vncpasswd=3D123p=
oi" ]
+vif =3D [ "mac=3D00:16:3e:66:94:9c,bridge=3Dbr0,script=3Dvif-bridge,model=
=3Dfakemodel" ]
+bootloader =3D "/usr/bin/pygrub"
+disk =3D [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]
diff --git a/tests/xmconfigdata/test-paravirt-net-fakemodel.xml b/tests/xmc=
onfigdata/test-paravirt-net-fakemodel.xml
new file mode 100644
index 0000000000..80819fa55e
--- /dev/null
+++ b/tests/xmconfigdata/test-paravirt-net-fakemodel.xml
@@ -0,0 +1,40 @@
+<domain type=3D'xen'>
+  <name>XenGuest1</name>
+  <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>592896</memory>
+  <currentMemory unit=3D'KiB'>403456</currentMemory>
+  <vcpu placement=3D'static'>1</vcpu>
+  <bootloader>/usr/bin/pygrub</bootloader>
+  <os>
+    <type arch=3D'x86_64' machine=3D'xenpv'>linux</type>
+  </os>
+  <clock offset=3D'utc' adjustment=3D'reset'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <disk type=3D'block' device=3D'disk'>
+      <driver name=3D'phy' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/XenGuest1'/>
+      <target dev=3D'xvda' bus=3D'xen'/>
+    </disk>
+    <interface type=3D'bridge'>
+      <mac address=3D'00:16:3e:66:94:9c'/>
+      <source bridge=3D'br0'/>
+      <script path=3D'vif-bridge'/>
+      <model type=3D'fakemodel'/>
+    </interface>
+    <console type=3D'pty'>
+      <target type=3D'xen' port=3D'0'/>
+    </console>
+    <input type=3D'mouse' bus=3D'xen'/>
+    <input type=3D'keyboard' bus=3D'xen'/>
+    <graphics type=3D'vnc' port=3D'-1' autoport=3D'yes' listen=3D'127.0.0.=
1' passwd=3D'123poi'>
+      <listen type=3D'address' address=3D'127.0.0.1'/>
+    </graphics>
+    <video>
+      <model type=3D'xen' vram=3D'4096' heads=3D'1' primary=3D'yes'/>
+    </video>
+    <memballoon model=3D'xen'/>
+  </devices>
+</domain>
diff --git a/tests/xmconfigdata/test-paravirt-net-modelstr.cfg b/tests/xmco=
nfigdata/test-paravirt-net-modelstr.cfg
new file mode 100644
index 0000000000..bf00cb555d
--- /dev/null
+++ b/tests/xmconfigdata/test-paravirt-net-modelstr.cfg
@@ -0,0 +1,13 @@
+name =3D "XenGuest1"
+uuid =3D "c7a5fdb0-cdaf-9455-926a-d65c16db1809"
+maxmem =3D 579
+memory =3D 394
+vcpus =3D 1
+localtime =3D 0
+on_poweroff =3D "destroy"
+on_reboot =3D "restart"
+on_crash =3D "restart"
+vfb =3D [ "type=3Dvnc,vncunused=3D1,vnclisten=3D127.0.0.1,vncpasswd=3D123p=
oi" ]
+vif =3D [ "mac=3D00:16:3e:66:94:9c,bridge=3Dbr0,script=3Dvif-bridge,model=
=3Dfakemodel" ]
+bootloader =3D "/usr/bin/pygrub"
+disk =3D [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]
diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
index cae1ed15d4..1de3c33f69 100644
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -193,6 +193,7 @@ mymain(void)
     DO_TEST("paravirt-new-pvfb");
     DO_TEST("paravirt-new-pvfb-vncdisplay");
     DO_TEST("paravirt-net-e1000");
+    DO_TEST("paravirt-net-fakemodel");
     DO_TEST("paravirt-net-vifname");
     DO_TEST("paravirt-vcpu");
     DO_TEST("paravirt-maxvcpus");
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-many-models.sexpr b/tests=
/xml2sexprdata/xml2sexpr-fv-net-many-models.sexpr
new file mode 100644
index 0000000000..118dfd87bb
--- /dev/null
+++ b/tests/xml2sexprdata/xml2sexpr-fv-net-many-models.sexpr
@@ -0,0 +1 @@
+(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)(uuid 'b5d70dd2-75cd-a=
ca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_cras=
h 'destroy')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boo=
t c)(pae 1)(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen=
/bin/qemu-dm')(rtc_timeoffset 0)(localtime 0)))(localtime 0)(device (vif (m=
ac '00:11:22:33:44:55')(bridge 'xenbr0')(script 'vif-bridge')(model 'idonte=
xist')))(device (vif (mac '00:11:22:33:44:56')(bridge 'xenbr0')(script 'vif=
-bridge')(model 'vmxnet3')))(device (vif (mac '00:11:22:33:44:57')(bridge '=
xenbr0')(script 'vif-bridge')(type netfront)))(device (vif (mac '00:11:22:3=
3:44:58')(bridge 'xenbr0')(script 'vif-bridge')(model 'virtio')))(device (v=
if (mac '00:11:22:33:44:58')(bridge 'xenbr0')(script 'vif-bridge')(model 'n=
e2k_pci')))(device (vif (mac '00:11:22:33:44:58')(bridge 'xenbr0')(script '=
vif-bridge')(model 'pcnet'))))
diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-many-models.xml b/tests/x=
ml2sexprdata/xml2sexpr-fv-net-many-models.xml
new file mode 100644
index 0000000000..e95cba7f6a
--- /dev/null
+++ b/tests/xml2sexprdata/xml2sexpr-fv-net-many-models.xml
@@ -0,0 +1,43 @@
+<domain type=3D'xen'>
+  <name>fvtest</name>
+  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
+  <memory unit=3D'KiB'>409600</memory>
+  <os>
+    <type>hvm</type>
+    <loader>/usr/lib/xen/boot/hvmloader</loader>
+    <boot dev=3D'hd'/>
+  </os>
+  <devices>
+    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <interface type=3D'bridge'>
+      <source bridge=3D'xenbr0'/>
+      <mac address=3D'00:11:22:33:44:55'/>
+      <model type=3D'idontexist'/>
+    </interface>
+    <interface type=3D'bridge'>
+      <source bridge=3D'xenbr0'/>
+      <mac address=3D'00:11:22:33:44:56'/>
+      <model type=3D'vmxnet3'/>
+    </interface>
+    <interface type=3D'bridge'>
+      <source bridge=3D'xenbr0'/>
+      <mac address=3D'00:11:22:33:44:57'/>
+      <model type=3D'netfront'/>
+    </interface>
+    <interface type=3D'bridge'>
+      <source bridge=3D'xenbr0'/>
+      <mac address=3D'00:11:22:33:44:58'/>
+      <model type=3D'virtio'/>
+    </interface>
+    <interface type=3D'bridge'>
+      <source bridge=3D'xenbr0'/>
+      <mac address=3D'00:11:22:33:44:58'/>
+      <model type=3D'ne2k_pci'/>
+    </interface>
+    <interface type=3D'bridge'>
+      <source bridge=3D'xenbr0'/>
+      <mac address=3D'00:11:22:33:44:58'/>
+      <model type=3D'pcnet'/>
+    </interface>
+  </devices>
+</domain>
diff --git a/tests/xml2sexprtest.c b/tests/xml2sexprtest.c
index de68ea1f05..64383876ab 100644
--- a/tests/xml2sexprtest.c
+++ b/tests/xml2sexprtest.c
@@ -151,6 +151,7 @@ mymain(void)
=20
     DO_TEST("fv-sound", "fv-sound", "fvtest");
=20
+    DO_TEST("fv-net-many-models", "fv-net-many-models", "fvtest");
     DO_TEST("fv-net-netfront", "fv-net-netfront", "fvtest");
     DO_TEST("fv-net-rate", "fv-net-rate", "fvtest");
=20
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Fri Apr 19 16:00:11 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 155249229334410.53818963974004;
 Wed, 13 Mar 2019 08:51:33 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id 79C767F746;
	Wed, 13 Mar 2019 15:51:31 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 4F21A5DE65;
	Wed, 13 Mar 2019 15:51:31 +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 0A2994EA28;
	Wed, 13 Mar 2019 15:51:31 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
	[10.5.11.13])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x2DFpQju001346 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 13 Mar 2019 11:51:26 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id C882C6B8C4; Wed, 13 Mar 2019 15:51:26 +0000 (UTC)
Received: from worklaptop.redhat.com (ovpn-124-40.rdu2.redhat.com
	[10.10.124.40])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 451EF17CEB;
	Wed, 13 Mar 2019 15:51:26 +0000 (UTC)
From: Cole Robinson <crobinso@redhat.com>
To: libvirt-list@redhat.com
Date: Wed, 13 Mar 2019 11:51:11 -0400
Message-Id: 
 <5dbfb14ad730b118fec14a0b2fbc9421e66d6190.1552492022.git.crobinso@redhat.com>
In-Reply-To: <cover.1552492022.git.crobinso@redhat.com>
References: <cover.1552492022.git.crobinso@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH v2 02/11] conf: net: Add wrapper functions for
	<model> value
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.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://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]);
 Wed, 13 Mar 2019 15:51:32 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

To ease converting the net->model value to an enum, add
the wrapper functions:

virDomainNetGetModelString
virDomainNetSetModelString
virDomainNetStreqModelString
virDomainNetStrcaseeqModelString

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 src/bhyve/bhyve_command.c       |  8 ++++----
 src/bhyve/bhyve_parse_command.c |  2 +-
 src/conf/domain_conf.c          | 36 ++++++++++++++++++++++++++++-----
 src/conf/domain_conf.h          |  7 +++++++
 src/libvirt_private.syms        |  4 ++++
 src/libxl/libxl_conf.c          |  8 ++++----
 src/qemu/qemu_command.c         | 15 +++++++-------
 src/qemu/qemu_domain.c          |  4 ++--
 src/qemu/qemu_domain_address.c  | 13 ++++++------
 src/qemu/qemu_driver.c          | 14 ++++++++++---
 src/qemu/qemu_hotplug.c         |  7 ++++---
 src/qemu/qemu_parse_command.c   |  5 +++--
 src/vbox/vbox_common.c          | 18 ++++++++---------
 src/vmx/vmx.c                   | 31 ++++++++++++++--------------
 src/vz/vz_driver.c              |  4 ++--
 src/vz/vz_sdk.c                 | 14 ++++++-------
 src/xenconfig/xen_common.c      | 21 ++++++++++---------
 src/xenconfig/xen_sxpr.c        | 21 ++++++++++---------
 18 files changed, 140 insertions(+), 92 deletions(-)

diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
index 10340ee436..d3d790f6b6 100644
--- a/src/bhyve/bhyve_command.c
+++ b/src/bhyve/bhyve_command.c
@@ -57,16 +57,16 @@ bhyveBuildNetArgStr(virConnectPtr conn,
     int ret =3D -1;
     virDomainNetType actualType =3D virDomainNetGetActualType(net);
=20
-    if (net->model =3D=3D NULL) {
+    if (!virDomainNetGetModelString(net)) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("NIC model must be specified"));
         return -1;
     }
=20
-    if (STREQ(net->model, "virtio")) {
+    if (virDomainNetStreqModelString(net, "virtio")) {
         if (VIR_STRDUP(nic_model, "virtio-net") < 0)
             return -1;
-    } else if (STREQ(net->model, "e1000")) {
+    } else if (virDomainNetStreqModelString(net, "e1000")) {
         if ((bhyveDriverGetCaps(conn) & BHYVE_CAP_NET_E1000) !=3D 0) {
             if (VIR_STRDUP(nic_model, "e1000") < 0)
                 return -1;
@@ -79,7 +79,7 @@ bhyveBuildNetArgStr(virConnectPtr conn,
     } else {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("NIC model '%s' is not supported"),
-                       net->model);
+                       virDomainNetGetModelString(net));
         return -1;
     }
=20
diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_comman=
d.c
index bd93070dfb..60eb4c5412 100644
--- a/src/bhyve/bhyve_parse_command.c
+++ b/src/bhyve/bhyve_parse_command.c
@@ -511,7 +511,7 @@ bhyveParsePCINet(virDomainDefPtr def,
     if (VIR_STRDUP(net->data.bridge.brname, "virbr0") < 0)
         goto error;
=20
-    if (VIR_STRDUP(net->model, model) < 0)
+    if (virDomainNetSetModelString(net, model) < 0)
         goto error;
=20
     net->info.type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 778c386ee2..d282b4d3ae 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -25282,9 +25282,9 @@ virDomainNetDefFormat(virBufferPtr buf,
             virBufferEscapeString(buf, " actual=3D'%s'", def->ifname_guest=
_actual);
         virBufferAddLit(buf, "/>\n");
     }
-    if (def->model) {
+    if (virDomainNetGetModelString(def)) {
         virBufferEscapeString(buf, "<model type=3D'%s'/>\n",
-                              def->model);
+                              virDomainNetGetModelString(def));
         if (virDomainNetIsVirtioModel(def)) {
             int rc =3D 0;
             VIR_AUTOFREE(char *) str =3D NULL;
@@ -29376,13 +29376,39 @@ virDomainNetGetActualTrustGuestRxFilters(virDomai=
nNetDefPtr iface)
     return iface->trustGuestRxFilters =3D=3D VIR_TRISTATE_BOOL_YES;
 }
=20
+const char *
+virDomainNetGetModelString(const virDomainNetDef *net)
+{
+    return net->model;
+}
+
+int
+virDomainNetSetModelString(virDomainNetDefPtr net,
+                           const char *model)
+{
+    return VIR_STRDUP(net->model, model);
+}
+
+int
+virDomainNetStreqModelString(const virDomainNetDef *net,
+                             const char *model)
+{
+    return STREQ_NULLABLE(net->model, model);
+}
+
+int
+virDomainNetStrcaseeqModelString(const virDomainNetDef *net,
+                                 const char *model)
+{
+    return net->model && STRCASEEQ(net->model, model);
+}
=20
 bool
 virDomainNetIsVirtioModel(const virDomainNetDef *net)
 {
-    return (STREQ_NULLABLE(net->model, "virtio") ||
-            STREQ_NULLABLE(net->model, "virtio-transitional") ||
-            STREQ_NULLABLE(net->model, "virtio-non-transitional"));
+    return (virDomainNetStreqModelString(net, "virtio") ||
+            virDomainNetStreqModelString(net, "virtio-transitional") ||
+            virDomainNetStreqModelString(net, "virtio-non-transitional"));
 }
=20
=20
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index fe9d4fb81a..39618928f7 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3314,6 +3314,13 @@ virNetDevBandwidthPtr
 virDomainNetGetActualBandwidth(virDomainNetDefPtr iface);
 virNetDevVlanPtr virDomainNetGetActualVlan(virDomainNetDefPtr iface);
 bool virDomainNetGetActualTrustGuestRxFilters(virDomainNetDefPtr iface);
+const char *virDomainNetGetModelString(const virDomainNetDef *net);
+int virDomainNetSetModelString(virDomainNetDefPtr et,
+                               const char *model);
+int virDomainNetStreqModelString(const virDomainNetDef *net,
+                                 const char *model);
+int virDomainNetStrcaseeqModelString(const virDomainNetDef *net,
+                                     const char *model);
 bool virDomainNetIsVirtioModel(const virDomainNetDef *net);
 int virDomainNetAppendIPAddress(virDomainNetDefPtr def,
                                 const char *address,
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 960a97cf1d..a01f158946 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -474,6 +474,7 @@ virDomainNetGetActualTrustGuestRxFilters;
 virDomainNetGetActualType;
 virDomainNetGetActualVirtPortProfile;
 virDomainNetGetActualVlan;
+virDomainNetGetModelString;
 virDomainNetInsert;
 virDomainNetIsVirtioModel;
 virDomainNetNotifyActualDevice;
@@ -482,6 +483,9 @@ virDomainNetRemove;
 virDomainNetRemoveHostdev;
 virDomainNetResolveActualType;
 virDomainNetSetDeviceImpl;
+virDomainNetSetModelString;
+virDomainNetStrcaseeqModelString;
+virDomainNetStreqModelString;
 virDomainNetTypeFromString;
 virDomainNetTypeSharesHostView;
 virDomainNetTypeToString;
diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index c769050ff1..9236820bfe 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -1266,18 +1266,18 @@ libxlMakeNic(virDomainDefPtr def,
      * xen commit 32e9d0f ("libxl: nic type defaults to vif in hotplug for
      * hvm guest").
      */
-    if (l_nic->model) {
+    if (virDomainNetGetModelString(l_nic)) {
         if ((def->os.type =3D=3D VIR_DOMAIN_OSTYPE_XEN ||
             def->os.type =3D=3D VIR_DOMAIN_OSTYPE_XENPVH) &&
-            STRNEQ(l_nic->model, "netfront")) {
+            !virDomainNetStreqModelString(l_nic, "netfront")) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                            _("only model 'netfront' is supported for "
                              "Xen PV(H) domains"));
             return -1;
         }
-        if (VIR_STRDUP(x_nic->model, l_nic->model) < 0)
+        if (VIR_STRDUP(x_nic->model, virDomainNetGetModelString(l_nic)) < =
0)
             goto cleanup;
-        if (STREQ(l_nic->model, "netfront"))
+        if (virDomainNetStreqModelString(l_nic, "netfront"))
             x_nic->nictype =3D LIBXL_NIC_TYPE_VIF;
         else
             x_nic->nictype =3D LIBXL_NIC_TYPE_VIF_IOEMU;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 5e56447b76..0388ebc5af 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -479,10 +479,10 @@ qemuBuildVirtioDevStr(virBufferPtr buf,
             break;
=20
         case VIR_DOMAIN_DEVICE_NET:
-            has_tmodel =3D STREQ_NULLABLE(device.data.net->model,
-                                        "virtio-transitional");
-            has_ntmodel =3D STREQ_NULLABLE(device.data.net->model,
-                                         "virtio-non-transitional");
+            has_tmodel =3D virDomainNetStreqModelString(device.data.net,
+                                                      "virtio-transitional=
");
+            has_ntmodel =3D virDomainNetStreqModelString(device.data.net,
+                                                       "virtio-non-transit=
ional");
             break;
=20
         case VIR_DOMAIN_DEVICE_HOSTDEV:
@@ -3842,13 +3842,14 @@ qemuBuildLegacyNicStr(virDomainNetDefPtr net)
 {
     char *str;
     char macaddr[VIR_MAC_STRING_BUFLEN];
+    const char *netmodel =3D virDomainNetGetModelString(net);
=20
     ignore_value(virAsprintf(&str,
                              "nic,macaddr=3D%s,netdev=3Dhost%s%s%s%s%s",
                              virMacAddrFormat(&net->mac, macaddr),
                              net->info.alias,
-                             (net->model ? ",model=3D" : ""),
-                             NULLSTR_EMPTY(net->model),
+                             netmodel ? ",model=3D" : "",
+                             NULLSTR_EMPTY(netmodel),
                              (net->info.alias ? ",id=3D" : ""),
                              NULLSTR_EMPTY(net->info.alias)));
     return str;
@@ -3874,7 +3875,7 @@ qemuBuildNicDevStr(virDomainDefPtr def,
=20
         usingVirtio =3D true;
     } else {
-        virBufferAddStr(&buf, net->model);
+        virBufferAddStr(&buf, virDomainNetGetModelString(net));
     }
=20
     if (usingVirtio && net->driver.virtio.txmode) {
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 788c19c248..7b001bca52 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -6727,8 +6727,8 @@ qemuDomainDeviceNetDefPostParse(virDomainNetDefPtr ne=
t,
                                 virQEMUCapsPtr qemuCaps)
 {
     if (net->type !=3D VIR_DOMAIN_NET_TYPE_HOSTDEV &&
-        !net->model) {
-        if (VIR_STRDUP(net->model,
+        !virDomainNetGetModelString(net)) {
+        if (virDomainNetSetModelString(net,
                        qemuDomainDefaultNetModel(def, qemuCaps)) < 0)
             return -1;
     }
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 4740536d82..380c5bffcc 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -230,7 +230,7 @@ qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def)
     for (i =3D 0; i < def->nnets; i++) {
         virDomainNetDefPtr net =3D def->nets[i];
=20
-        if (STREQ_NULLABLE(net->model, "spapr-vlan"))
+        if (virDomainNetStreqModelString(net, "spapr-vlan"))
             net->info.type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO;
=20
         if (qemuDomainAssignSpaprVIOAddress(def, &net->info, VIO_ADDR_NET)=
 < 0)
@@ -715,19 +715,18 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDev=
iceDefPtr dev,
          * addresses for other hostdev devices.
          */
         if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_HOSTDEV ||
-            STREQ_NULLABLE(net->model, "usb-net")) {
+            virDomainNetStreqModelString(net, "usb-net")) {
             return 0;
         }
=20
-        if (STREQ_NULLABLE(net->model, "virtio") ||
-            STREQ_NULLABLE(net->model, "virtio-non-transitional"))
+        if (virDomainNetStreqModelString(net, "virtio") ||
+            virDomainNetStreqModelString(net, "virtio-non-transitional"))
             return virtioFlags;
=20
-        /* Transitional devices only work in conventional PCI slots */
-        if (STREQ_NULLABLE(net->model, "virtio-transitional"))
+        if (virDomainNetStreqModelString(net, "virtio-transitional"))
             return pciFlags;
=20
-        if (STREQ_NULLABLE(net->model, "e1000e"))
+        if (virDomainNetStreqModelString(net, "e1000e"))
             return pcieFlags;
=20
         return pciFlags;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index e461fb51b0..a3d52a5dc0 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7444,20 +7444,28 @@ static char *qemuConnectDomainXMLToNative(virConnec=
tPtr conn,
     for (i =3D 0; i < vm->def->nnets; i++) {
         virDomainNetDefPtr net =3D vm->def->nets[i];
         unsigned int bootIndex =3D net->info.bootIndex;
-        char *model =3D net->model;
+        char *model;
         virMacAddr mac =3D net->mac;
         char *script =3D net->script;
=20
-        net->model =3D NULL;
+        if (virDomainNetGetModelString(net) &&
+            VIR_STRDUP(model, virDomainNetGetModelString(net)) < 0)
+            goto cleanup;
+
         net->script =3D NULL;
=20
         virDomainNetDefClear(net);
=20
         net->type =3D VIR_DOMAIN_NET_TYPE_ETHERNET;
         net->info.bootIndex =3D bootIndex;
-        net->model =3D model;
         net->mac =3D mac;
         net->script =3D script;
+
+        if (model && virDomainNetSetModelString(net, model) < 0) {
+            VIR_FREE(model);
+            goto cleanup;
+        }
+        VIR_FREE(model);
     }
=20
     if (!(cmd =3D qemuProcessCreatePretendCmd(driver, vm, NULL,
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index f43f80668c..872d8e2a6f 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -3692,11 +3692,12 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
         goto cleanup;
     }
=20
-    if (STRNEQ_NULLABLE(olddev->model, newdev->model)) {
+    if (STRNEQ_NULLABLE(virDomainNetGetModelString(olddev),
+                        virDomainNetGetModelString(newdev))) {
         virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
                        _("cannot modify network device model from %s to %s=
"),
-                       olddev->model ? olddev->model : "(default)",
-                       newdev->model ? newdev->model : "(default)");
+                       NULLSTR(virDomainNetGetModelString(olddev)),
+                       NULLSTR(virDomainNetGetModelString(newdev)));
         goto cleanup;
     }
=20
diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c
index 49b34b1c17..fc3f70fcde 100644
--- a/src/qemu/qemu_parse_command.c
+++ b/src/qemu/qemu_parse_command.c
@@ -1109,8 +1109,9 @@ qemuParseCommandLineNet(virDomainXMLOptionPtr xmlopt,
                 goto error;
             }
         } else if (STREQ(keywords[i], "model")) {
-            def->model =3D values[i];
-            values[i] =3D NULL;
+            if (virDomainNetSetModelString(def, values[i]) < 0)
+                goto error;
+            VIR_FREE(values[i]);
         } else if (STREQ(keywords[i], "vhost")) {
             if ((values[i] =3D=3D NULL) || STREQ(values[i], "on")) {
                 def->driver.virtio.name =3D VIR_DOMAIN_NET_BACKEND_TYPE_VH=
OST;
diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index c410514d37..8c28bba8ee 100644
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -1309,7 +1309,7 @@ vboxAttachNetwork(virDomainDefPtr def, vboxDriverPtr =
data, IMachine *machine)
         macaddrvbox[VIR_MAC_STRING_BUFLEN - 6] =3D '\0';
=20
         VIR_DEBUG("NIC(%zu): Type:   %d", i, def->nets[i]->type);
-        VIR_DEBUG("NIC(%zu): Model:  %s", i, def->nets[i]->model);
+        VIR_DEBUG("NIC(%zu): Model:  %s", i, virDomainNetGetModelString(de=
f->nets[i]));
         VIR_DEBUG("NIC(%zu): Mac:    %s", i, macaddr);
         VIR_DEBUG("NIC(%zu): ifname: %s", i, def->nets[i]->ifname);
         if (def->nets[i]->type =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK) {
@@ -1338,19 +1338,19 @@ vboxAttachNetwork(virDomainDefPtr def, vboxDriverPt=
r data, IMachine *machine)
=20
         gVBoxAPI.UINetworkAdapter.SetEnabled(adapter, 1);
=20
-        if (def->nets[i]->model) {
-            if (STRCASEEQ(def->nets[i]->model, "Am79C970A")) {
+        if (virDomainNetGetModelString(def->nets[i])) {
+            if (virDomainNetStrcaseeqModelString(def->nets[i], "Am79C970A"=
)) {
                 adapterType =3D NetworkAdapterType_Am79C970A;
-            } else if (STRCASEEQ(def->nets[i]->model, "Am79C973")) {
+            } else if (virDomainNetStrcaseeqModelString(def->nets[i], "Am7=
9C973")) {
                 adapterType =3D NetworkAdapterType_Am79C973;
-            } else if (STRCASEEQ(def->nets[i]->model, "82540EM")) {
+            } else if (virDomainNetStrcaseeqModelString(def->nets[i], "825=
40EM")) {
                 adapterType =3D NetworkAdapterType_I82540EM;
-            } else if (STRCASEEQ(def->nets[i]->model, "82545EM")) {
+            } else if (virDomainNetStrcaseeqModelString(def->nets[i], "825=
45EM")) {
                 adapterType =3D NetworkAdapterType_I82545EM;
-            } else if (STRCASEEQ(def->nets[i]->model, "82543GC")) {
+            } else if (virDomainNetStrcaseeqModelString(def->nets[i], "825=
43GC")) {
                 adapterType =3D NetworkAdapterType_I82543GC;
             } else if (gVBoxAPI.APIVersion >=3D 3000051 &&
-                       STRCASEEQ(def->nets[i]->model, "virtio")) {
+                       virDomainNetStrcaseeqModelString(def->nets[i], "vir=
tio")) {
                 /* Only vbox 3.1 and later support NetworkAdapterType_Virt=
o */
                 adapterType =3D NetworkAdapterType_Virtio;
             }
@@ -3762,7 +3762,7 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter *=
adapter)
             model =3D "virtio";
         break;
     }
-    if (VIR_STRDUP(net->model, model) < 0)
+    if (virDomainNetSetModelString(net, model) < 0)
         goto error;
=20
     gVBoxAPI.UINetworkAdapter.GetMACAddress(adapter, &utf16);
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 8ffd5ff088..7a557847ba 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -2671,10 +2671,8 @@ virVMXParseEthernet(virConfPtr conf, int controller,=
 virDomainNetDefPtr *def)
     /* Setup virDomainNetDef */
     if (connectionType =3D=3D NULL || STRCASEEQ(connectionType, "bridged")=
) {
         (*def)->type =3D VIR_DOMAIN_NET_TYPE_BRIDGE;
-        (*def)->model =3D virtualDev;
         (*def)->data.bridge.brname =3D networkName;
=20
-        virtualDev =3D NULL;
         networkName =3D NULL;
     } else if (STRCASEEQ(connectionType, "hostonly")) {
         /* FIXME */
@@ -2684,16 +2682,12 @@ virVMXParseEthernet(virConfPtr conf, int controller=
, virDomainNetDefPtr *def)
         goto cleanup;
     } else if (STRCASEEQ(connectionType, "nat")) {
         (*def)->type =3D VIR_DOMAIN_NET_TYPE_USER;
-        (*def)->model =3D virtualDev;
=20
-        virtualDev =3D NULL;
     } else if (STRCASEEQ(connectionType, "custom")) {
         (*def)->type =3D VIR_DOMAIN_NET_TYPE_BRIDGE;
-        (*def)->model =3D virtualDev;
         (*def)->data.bridge.brname =3D networkName;
         (*def)->ifname =3D vnet;
=20
-        virtualDev =3D NULL;
         networkName =3D NULL;
         vnet =3D NULL;
     } else {
@@ -2703,6 +2697,10 @@ virVMXParseEthernet(virConfPtr conf, int controller,=
 virDomainNetDefPtr *def)
         goto cleanup;
     }
=20
+    if (virDomainNetSetModelString((*def), virtualDev) < 0)
+        goto cleanup;
+    VIR_FREE(virtualDev);
+
     result =3D 0;
=20
  cleanup:
@@ -3740,28 +3738,29 @@ virVMXFormatEthernet(virDomainNetDefPtr def, int co=
ntroller,
     virBufferAsprintf(buffer, "ethernet%d.present =3D \"true\"\n", control=
ler);
=20
     /* def:model -> vmx:virtualDev, vmx:features */
-    if (def->model !=3D NULL) {
-        if (STRCASENEQ(def->model, "vlance") &&
-            STRCASENEQ(def->model, "vmxnet") &&
-            STRCASENEQ(def->model, "vmxnet2") &&
-            STRCASENEQ(def->model, "vmxnet3") &&
-            STRCASENEQ(def->model, "e1000") &&
-            STRCASENEQ(def->model, "e1000e")) {
+    if (virDomainNetGetModelString(def)) {
+        if (!virDomainNetStrcaseeqModelString(def, "vlance") &&
+            !virDomainNetStrcaseeqModelString(def, "vmxnet") &&
+            !virDomainNetStrcaseeqModelString(def, "vmxnet2") &&
+            !virDomainNetStrcaseeqModelString(def, "vmxnet3") &&
+            !virDomainNetStrcaseeqModelString(def, "e1000") &&
+            !virDomainNetStrcaseeqModelString(def, "e1000e")) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
                            _("Expecting domain XML entry 'devices/interfac=
e/model' "
                              "to be 'vlance' or 'vmxnet' or 'vmxnet2' or '=
vmxnet3' "
-                             "or 'e1000' or 'e1000e' but found '%s'"), def=
->model);
+                             "or 'e1000' or 'e1000e' but found '%s'"),
+                            virDomainNetGetModelString(def));
             return -1;
         }
=20
-        if (STRCASEEQ(def->model, "vmxnet2")) {
+        if (virDomainNetStrcaseeqModelString(def, "vmxnet2")) {
             virBufferAsprintf(buffer, "ethernet%d.virtualDev =3D \"vmxnet\=
"\n",
                               controller);
             virBufferAsprintf(buffer, "ethernet%d.features =3D \"15\"\n",
                               controller);
         } else {
             virBufferAsprintf(buffer, "ethernet%d.virtualDev =3D \"%s\"\n",
-                              controller, def->model);
+                              controller, virDomainNetGetModelString(def));
         }
     }
=20
diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 066d617524..66d019378f 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -265,9 +265,9 @@ vzDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
     if (dev->type =3D=3D VIR_DOMAIN_DEVICE_NET &&
         (dev->data.net->type =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK ||
          dev->data.net->type =3D=3D VIR_DOMAIN_NET_TYPE_BRIDGE) &&
-        !dev->data.net->model &&
+        !virDomainNetGetModelString(dev->data.net) &&
         def->os.type =3D=3D VIR_DOMAIN_OSTYPE_HVM &&
-        VIR_STRDUP(dev->data.net->model, "e1000") < 0)
+        virDomainNetSetModelString(dev->data.net, "e1000") < 0)
         return -1;
=20
     return 0;
diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index b9fd03c0d2..ed8345a874 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -1104,15 +1104,15 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNe=
tDefPtr net, bool isCt)
=20
         switch ((int)type) {
         case PNT_RTL:
-            if (VIR_STRDUP(net->model, "rtl8139") < 0)
+            if (virDomainNetSetModelString(net, "rtl8139") < 0)
                 goto cleanup;
             break;
         case PNT_E1000:
-            if (VIR_STRDUP(net->model, "e1000") < 0)
+            if (virDomainNetSetModelString(net, "e1000") < 0)
                 goto cleanup;
             break;
         case PNT_VIRTIO:
-            if (VIR_STRDUP(net->model, "virtio") < 0)
+            if (virDomainNetSetModelString(net, "virtio") < 0)
                 goto cleanup;
             break;
         default:
@@ -3377,15 +3377,15 @@ static int prlsdkConfigureNet(vzDriverPtr driver AT=
TRIBUTE_UNUSED,
         goto cleanup;
=20
     if (isCt) {
-        if (net->model)
+        if (virDomainNetGetModelString(net))
             VIR_WARN("Setting network adapter for containers is not "
                      "supported by vz driver.");
     } else {
-        if (STREQ(net->model, "rtl8139")) {
+        if (virDomainNetStreqModelString(net, "rtl8139")) {
             pret =3D PrlVmDevNet_SetAdapterType(sdknet, PNT_RTL);
-        } else if (STREQ(net->model, "e1000")) {
+        } else if (virDomainNetStreqModelString(net, "e1000")) {
             pret =3D PrlVmDevNet_SetAdapterType(sdknet, PNT_E1000);
-        } else if (STREQ(net->model, "virtio")) {
+        } else if (virDomainNetStreqModelString(net, "virtio")) {
             pret =3D PrlVmDevNet_SetAdapterType(sdknet, PNT_VIRTIO);
         } else {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c
index 21c56edd58..170378fab5 100644
--- a/src/xenconfig/xen_common.c
+++ b/src/xenconfig/xen_common.c
@@ -1069,11 +1069,11 @@ xenParseVif(char *entry, const char *vif_typename)
         goto cleanup;
=20
     if (model[0] &&
-        VIR_STRDUP(net->model, model) < 0)
+        virDomainNetSetModelString(net, model) < 0)
         goto cleanup;
=20
     if (!model[0] && type[0] && STREQ(type, vif_typename) &&
-        VIR_STRDUP(net->model, "netfront") < 0)
+        virDomainNetSetModelString(net, "netfront") < 0)
         goto cleanup;
=20
     if (vifname[0] &&
@@ -1422,15 +1422,16 @@ xenFormatNet(virConnectPtr conn,
         goto cleanup;
     }
=20
-    if (!hvm) {
-        if (net->model !=3D NULL)
-            virBufferAsprintf(&buf, ",model=3D%s", net->model);
-    } else {
-        if (net->model !=3D NULL && STREQ(net->model, "netfront")) {
-            virBufferAsprintf(&buf, ",type=3D%s", vif_typename);
+    if (virDomainNetGetModelString(net)) {
+        if (!hvm) {
+            virBufferAsprintf(&buf, ",model=3D%s",
+                              virDomainNetGetModelString(net));
         } else {
-            if (net->model !=3D NULL)
-                virBufferAsprintf(&buf, ",model=3D%s", net->model);
+            if (virDomainNetStreqModelString(net, "netfront"))
+                virBufferAsprintf(&buf, ",type=3D%s", vif_typename);
+            else
+                virBufferAsprintf(&buf, ",model=3D%s",
+                                  virDomainNetGetModelString(net));
         }
     }
=20
diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index eb535cde19..224c874b90 100644
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -642,11 +642,11 @@ xenParseSxprNets(virDomainDefPtr def,
                 }
             }
=20
-            if (VIR_STRDUP(net->model, model) < 0)
+            if (virDomainNetSetModelString(net, model) < 0)
                 goto cleanup;
=20
             if (!model && type && STREQ(type, "netfront") &&
-                VIR_STRDUP(net->model, "netfront") < 0)
+                virDomainNetSetModelString(net, "netfront") < 0)
                 goto cleanup;
=20
             tmp =3D sexpr_node(node, "device/vif/rate");
@@ -1929,15 +1929,16 @@ xenFormatSxprNet(virConnectPtr conn,
         !STRPREFIX(def->ifname, "vif"))
         virBufferEscapeSexpr(buf, "(vifname '%s')", def->ifname);
=20
-    if (!hvm) {
-        if (def->model !=3D NULL)
-            virBufferEscapeSexpr(buf, "(model '%s')", def->model);
-    } else {
-        if (def->model !=3D NULL && STREQ(def->model, "netfront")) {
-            virBufferAddLit(buf, "(type netfront)");
+    if (virDomainNetGetModelString(def)) {
+        if (!hvm) {
+            virBufferEscapeSexpr(buf, "(model '%s')",
+                                 virDomainNetGetModelString(def));
         } else {
-            if (def->model !=3D NULL)
-                virBufferEscapeSexpr(buf, "(model '%s')", def->model);
+            if (virDomainNetStreqModelString(def, "netfront"))
+                virBufferAddLit(buf, "(type netfront)");
+            else
+                virBufferEscapeSexpr(buf, "(model '%s')",
+                                     virDomainNetGetModelString(def));
         }
     }
=20
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Fri Apr 19 16:00:11 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1552492297355333.50796037103885;
 Wed, 13 Mar 2019 08:51:37 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
 [10.5.11.12])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 097237F6BA;
	Wed, 13 Mar 2019 15:51:35 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id D454760F89;
	Wed, 13 Mar 2019 15:51:34 +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 8CBE94ED25;
	Wed, 13 Mar 2019 15:51:34 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
	[10.5.11.13])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x2DFpRVi001354 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 13 Mar 2019 11:51:27 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 6F5426B8C7; Wed, 13 Mar 2019 15:51:27 +0000 (UTC)
Received: from worklaptop.redhat.com (ovpn-124-40.rdu2.redhat.com
	[10.10.124.40])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 057626A96F;
	Wed, 13 Mar 2019 15:51:26 +0000 (UTC)
From: Cole Robinson <crobinso@redhat.com>
To: libvirt-list@redhat.com
Date: Wed, 13 Mar 2019 11:51:12 -0400
Message-Id: 
 <c36227c80846d2929499c955a2b8e0ac4092a0ab.1552492022.git.crobinso@redhat.com>
In-Reply-To: <cover.1552492022.git.crobinso@redhat.com>
References: <cover.1552492022.git.crobinso@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH v2 03/11] conf: net: Rename 'model' to 'modelstr'
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.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://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]);
 Wed, 13 Mar 2019 15:51:36 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

We will be adding a 'model' enum in upcoming patches. Rename
the existing value to make the differentiation clear

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 src/conf/domain_conf.c | 16 ++++++++--------
 src/conf/domain_conf.h |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d282b4d3ae..fe1945b644 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2227,7 +2227,7 @@ virDomainNetDefClear(virDomainNetDefPtr def)
     if (!def)
         return;
=20
-    VIR_FREE(def->model);
+    VIR_FREE(def->modelstr);
=20
     switch (def->type) {
     case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
@@ -11495,7 +11495,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlop=
t,
                            _("Model name contains invalid characters"));
             goto error;
         }
-        VIR_STEAL_PTR(def->model, model);
+        VIR_STEAL_PTR(def->modelstr, model);
     }
=20
     switch (def->type) {
@@ -21732,10 +21732,10 @@ virDomainNetDefCheckABIStability(virDomainNetDefP=
tr src,
         return false;
     }
=20
-    if (STRNEQ_NULLABLE(src->model, dst->model)) {
+    if (STRNEQ_NULLABLE(src->modelstr, dst->modelstr)) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("Target network card model %s does not match sour=
ce %s"),
-                       NULLSTR(dst->model), NULLSTR(src->model));
+                       NULLSTR(dst->modelstr), NULLSTR(src->modelstr));
         return false;
     }
=20
@@ -29379,28 +29379,28 @@ virDomainNetGetActualTrustGuestRxFilters(virDomai=
nNetDefPtr iface)
 const char *
 virDomainNetGetModelString(const virDomainNetDef *net)
 {
-    return net->model;
+    return net->modelstr;
 }
=20
 int
 virDomainNetSetModelString(virDomainNetDefPtr net,
                            const char *model)
 {
-    return VIR_STRDUP(net->model, model);
+    return VIR_STRDUP(net->modelstr, model);
 }
=20
 int
 virDomainNetStreqModelString(const virDomainNetDef *net,
                              const char *model)
 {
-    return STREQ_NULLABLE(net->model, model);
+    return STREQ_NULLABLE(net->modelstr, model);
 }
=20
 int
 virDomainNetStrcaseeqModelString(const virDomainNetDef *net,
                                  const char *model)
 {
-    return net->model && STRCASEEQ(net->model, model);
+    return net->modelstr && STRCASEEQ(net->modelstr, model);
 }
=20
 bool
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 39618928f7..a0d443ee1b 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1021,7 +1021,7 @@ struct _virDomainNetDef {
     virDomainNetType type;
     virMacAddr mac;
     bool mac_generated; /* true if mac was *just now* auto-generated by li=
bvirt */
-    char *model;
+    char *modelstr;
     union {
         struct {
             virDomainNetBackendType name; /* which driver backend to use */
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Fri Apr 19 16:00:11 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1552492296737602.4909892140823;
 Wed, 13 Mar 2019 08:51:36 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
 [10.5.11.13])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 324B430F8DAD;
	Wed, 13 Mar 2019 15:51:34 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id DA5526B8C8;
	Wed, 13 Mar 2019 15:51:33 +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 9CABB4EA78;
	Wed, 13 Mar 2019 15:51:33 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
	[10.5.11.13])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x2DFpSwf001364 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 13 Mar 2019 11:51:28 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 348D66B8C9; Wed, 13 Mar 2019 15:51:28 +0000 (UTC)
Received: from worklaptop.redhat.com (ovpn-124-40.rdu2.redhat.com
	[10.10.124.40])
	by smtp.corp.redhat.com (Postfix) with ESMTP id B8A716B8C8;
	Wed, 13 Mar 2019 15:51:27 +0000 (UTC)
From: Cole Robinson <crobinso@redhat.com>
To: libvirt-list@redhat.com
Date: Wed, 13 Mar 2019 11:51:13 -0400
Message-Id: 
 <ee6795bd0367efbc3d99718a578b8e755a75f512.1552492022.git.crobinso@redhat.com>
In-Reply-To: <cover.1552492022.git.crobinso@redhat.com>
References: <cover.1552492022.git.crobinso@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH v2 04/11] conf: net: Add model enum,
	and netfront value
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.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://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]);
 Wed, 13 Mar 2019 15:51:35 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

This adds a network model enum. The virDomainNetDef property
is named 'model' like most other devices.

When the XML parser or a driver calls NetSetModelString, if
the passed string is in the enum, we will set net->model,
otherwise we copy the string into net->modelstr

Add a single example for the 'netfront' xen model, and wire
that up, just to verify it's all working

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 src/conf/domain_conf.c     | 55 +++++++++++++++++++++++++++-----------
 src/conf/domain_conf.h     | 10 +++++++
 src/libvirt_private.syms   |  2 ++
 src/libxl/libxl_conf.c     |  4 +--
 src/qemu/qemu_hotplug.c    |  8 ++++++
 src/xenconfig/xen_common.c | 16 +++++------
 src/xenconfig/xen_sxpr.c   | 15 ++++++-----
 7 files changed, 78 insertions(+), 32 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index fe1945b644..571f2eea39 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -472,6 +472,11 @@ VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST,
               "udp",
 );
=20
+VIR_ENUM_IMPL(virDomainNetModel, VIR_DOMAIN_NET_MODEL_LAST,
+              "unknown",
+              "netfront",
+);
+
 VIR_ENUM_IMPL(virDomainNetBackend, VIR_DOMAIN_NET_BACKEND_TYPE_LAST,
               "default",
               "qemu",
@@ -2228,6 +2233,7 @@ virDomainNetDefClear(virDomainNetDefPtr def)
         return;
=20
     VIR_FREE(def->modelstr);
+    def->model =3D VIR_DOMAIN_NET_MODEL_UNKNOWN;
=20
     switch (def->type) {
     case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
@@ -11483,20 +11489,9 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlo=
pt,
             goto error;
     }
=20
-    /* NIC model (see -net nic,model=3D?).  We only check that it looks
-     * reasonable, not that it is a supported NIC type.  FWIW kvm
-     * supports these types as of April 2008:
-     * i82551 i82557b i82559er ne2k_pci pcnet rtl8139 e1000 virtio
-     * QEMU PPC64 supports spapr-vlan
-     */
-    if (model !=3D NULL) {
-        if (strspn(model, NET_MODEL_CHARS) < strlen(model)) {
-            virReportError(VIR_ERR_INVALID_ARG, "%s",
-                           _("Model name contains invalid characters"));
-            goto error;
-        }
-        VIR_STEAL_PTR(def->modelstr, model);
-    }
+    if (model !=3D NULL &&
+        virDomainNetSetModelString(def, model) < 0)
+        goto error;
=20
     switch (def->type) {
     case VIR_DOMAIN_NET_TYPE_NETWORK:
@@ -21739,6 +21734,14 @@ virDomainNetDefCheckABIStability(virDomainNetDefPt=
r src,
         return false;
     }
=20
+    if (src->model !=3D dst->model) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("Target network card model %s does not match sour=
ce %s"),
+                       virDomainNetModelTypeToString(dst->model),
+                       virDomainNetModelTypeToString(src->model));
+        return false;
+    }
+
     if (src->mtu !=3D dst->mtu) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("Target network card MTU %d does not match source=
 %d"),
@@ -29379,6 +29382,8 @@ virDomainNetGetActualTrustGuestRxFilters(virDomainN=
etDefPtr iface)
 const char *
 virDomainNetGetModelString(const virDomainNetDef *net)
 {
+    if (net->model)
+        return virDomainNetModelTypeToString(net->model);
     return net->modelstr;
 }
=20
@@ -29386,13 +29391,31 @@ int
 virDomainNetSetModelString(virDomainNetDefPtr net,
                            const char *model)
 {
-    return VIR_STRDUP(net->modelstr, model);
+    VIR_FREE(net->modelstr);
+    if ((net->model =3D virDomainNetModelTypeFromString(model)) >=3D 0)
+        return 0;
+
+    net->model =3D VIR_DOMAIN_NET_MODEL_UNKNOWN;
+    if (!model)
+        return 0;
+
+    if (strspn(model, NET_MODEL_CHARS) < strlen(model)) {
+        virReportError(VIR_ERR_INVALID_ARG, "%s",
+                       _("Model name contains invalid characters"));
+        return -1;
+    }
+
+    if (VIR_STRDUP(net->modelstr, model) < 0)
+        return -1;
+    return 0;
 }
=20
 int
 virDomainNetStreqModelString(const virDomainNetDef *net,
                              const char *model)
 {
+    if (net->model)
+        return net->model =3D=3D virDomainNetModelTypeFromString(model);
     return STREQ_NULLABLE(net->modelstr, model);
 }
=20
@@ -29400,6 +29423,8 @@ int
 virDomainNetStrcaseeqModelString(const virDomainNetDef *net,
                                  const char *model)
 {
+    if (net->model)
+        return STRCASEEQ(virDomainNetModelTypeToString(net->model), model);
     return net->modelstr && STRCASEEQ(net->modelstr, model);
 }
=20
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index a0d443ee1b..92d54b0348 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -960,6 +960,14 @@ typedef enum {
     VIR_DOMAIN_NET_TYPE_LAST
 } virDomainNetType;
=20
+/* network model types */
+typedef enum {
+    VIR_DOMAIN_NET_MODEL_UNKNOWN,
+    VIR_DOMAIN_NET_MODEL_NETFRONT,
+
+    VIR_DOMAIN_NET_MODEL_LAST
+} virDomainNetModelType;
+
 /* the backend driver used for virtio interfaces */
 typedef enum {
     VIR_DOMAIN_NET_BACKEND_TYPE_DEFAULT, /* prefer kernel, fall back to us=
er */
@@ -1021,6 +1029,7 @@ struct _virDomainNetDef {
     virDomainNetType type;
     virMacAddr mac;
     bool mac_generated; /* true if mac was *just now* auto-generated by li=
bvirt */
+    int model; /* virDomainNetModelType */
     char *modelstr;
     union {
         struct {
@@ -3536,6 +3545,7 @@ VIR_ENUM_DECL(virDomainNet);
 VIR_ENUM_DECL(virDomainNetBackend);
 VIR_ENUM_DECL(virDomainNetVirtioTxMode);
 VIR_ENUM_DECL(virDomainNetInterfaceLinkState);
+VIR_ENUM_DECL(virDomainNetModel);
 VIR_ENUM_DECL(virDomainChrDevice);
 VIR_ENUM_DECL(virDomainChrChannelTarget);
 VIR_ENUM_DECL(virDomainChrConsoleTarget);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index a01f158946..3a0699d724 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -477,6 +477,8 @@ virDomainNetGetActualVlan;
 virDomainNetGetModelString;
 virDomainNetInsert;
 virDomainNetIsVirtioModel;
+virDomainNetModelTypeFromString;
+virDomainNetModelTypeToString;
 virDomainNetNotifyActualDevice;
 virDomainNetReleaseActualDevice;
 virDomainNetRemove;
diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 9236820bfe..007ef9c372 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -1269,7 +1269,7 @@ libxlMakeNic(virDomainDefPtr def,
     if (virDomainNetGetModelString(l_nic)) {
         if ((def->os.type =3D=3D VIR_DOMAIN_OSTYPE_XEN ||
             def->os.type =3D=3D VIR_DOMAIN_OSTYPE_XENPVH) &&
-            !virDomainNetStreqModelString(l_nic, "netfront")) {
+            l_nic->model !=3D VIR_DOMAIN_NET_MODEL_NETFRONT) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                            _("only model 'netfront' is supported for "
                              "Xen PV(H) domains"));
@@ -1277,7 +1277,7 @@ libxlMakeNic(virDomainDefPtr def,
         }
         if (VIR_STRDUP(x_nic->model, virDomainNetGetModelString(l_nic)) < =
0)
             goto cleanup;
-        if (virDomainNetStreqModelString(l_nic, "netfront"))
+        if (l_nic->model =3D=3D VIR_DOMAIN_NET_MODEL_NETFRONT)
             x_nic->nictype =3D LIBXL_NIC_TYPE_VIF;
         else
             x_nic->nictype =3D LIBXL_NIC_TYPE_VIF_IOEMU;
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 872d8e2a6f..7bd3a8a408 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -3701,6 +3701,14 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
         goto cleanup;
     }
=20
+    if (olddev->model !=3D newdev->model) {
+        virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
+                       _("cannot modify network device model from %s to %s=
"),
+                       virDomainNetModelTypeToString(olddev->model),
+                       virDomainNetModelTypeToString(newdev->model));
+        goto cleanup;
+    }
+
     if (virDomainNetIsVirtioModel(olddev) &&
         (olddev->driver.virtio.name !=3D newdev->driver.virtio.name ||
          olddev->driver.virtio.txmode !=3D newdev->driver.virtio.txmode ||
diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c
index 170378fab5..69a6f53507 100644
--- a/src/xenconfig/xen_common.c
+++ b/src/xenconfig/xen_common.c
@@ -1068,13 +1068,13 @@ xenParseVif(char *entry, const char *vif_typename)
         VIR_STRDUP(net->script, script) < 0)
         goto cleanup;
=20
-    if (model[0] &&
-        virDomainNetSetModelString(net, model) < 0)
-        goto cleanup;
-
-    if (!model[0] && type[0] && STREQ(type, vif_typename) &&
-        virDomainNetSetModelString(net, "netfront") < 0)
-        goto cleanup;
+    if (model[0]) {
+        if (virDomainNetSetModelString(net, model) < 0)
+            goto cleanup;
+    } else {
+        if (type[0] && STREQ(type, vif_typename))
+            net->model =3D VIR_DOMAIN_NET_MODEL_NETFRONT;
+    }
=20
     if (vifname[0] &&
         VIR_STRDUP(net->ifname, vifname) < 0)
@@ -1427,7 +1427,7 @@ xenFormatNet(virConnectPtr conn,
             virBufferAsprintf(&buf, ",model=3D%s",
                               virDomainNetGetModelString(net));
         } else {
-            if (virDomainNetStreqModelString(net, "netfront"))
+            if (net->model =3D=3D VIR_DOMAIN_NET_MODEL_NETFRONT)
                 virBufferAsprintf(&buf, ",type=3D%s", vif_typename);
             else
                 virBufferAsprintf(&buf, ",model=3D%s",
diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index 224c874b90..0bff94ead5 100644
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -642,12 +642,13 @@ xenParseSxprNets(virDomainDefPtr def,
                 }
             }
=20
-            if (virDomainNetSetModelString(net, model) < 0)
-                goto cleanup;
-
-            if (!model && type && STREQ(type, "netfront") &&
-                virDomainNetSetModelString(net, "netfront") < 0)
-                goto cleanup;
+            if (model) {
+                if (virDomainNetSetModelString(net, model) < 0)
+                    goto cleanup;
+            } else {
+                if (type && STREQ(type, "netfront"))
+                    net->model =3D VIR_DOMAIN_NET_MODEL_NETFRONT;
+            }
=20
             tmp =3D sexpr_node(node, "device/vif/rate");
             if (tmp) {
@@ -1934,7 +1935,7 @@ xenFormatSxprNet(virConnectPtr conn,
             virBufferEscapeSexpr(buf, "(model '%s')",
                                  virDomainNetGetModelString(def));
         } else {
-            if (virDomainNetStreqModelString(def, "netfront"))
+            if (def->model =3D=3D VIR_DOMAIN_NET_MODEL_NETFRONT)
                 virBufferAddLit(buf, "(type netfront)");
             else
                 virBufferEscapeSexpr(buf, "(model '%s')",
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Fri Apr 19 16:00:11 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1552492301516536.8245238657081;
 Wed, 13 Mar 2019 08:51:41 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
 [10.5.11.12])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 7E7FA31500A7;
	Wed, 13 Mar 2019 15:51:38 +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 550B360F87;
	Wed, 13 Mar 2019 15:51:38 +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 15B3F181A13E;
	Wed, 13 Mar 2019 15:51:38 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
	[10.5.11.13])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x2DFpSjX001376 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 13 Mar 2019 11:51:28 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id CD4B46A96F; Wed, 13 Mar 2019 15:51:28 +0000 (UTC)
Received: from worklaptop.redhat.com (ovpn-124-40.rdu2.redhat.com
	[10.10.124.40])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 61A816B8C8;
	Wed, 13 Mar 2019 15:51:28 +0000 (UTC)
From: Cole Robinson <crobinso@redhat.com>
To: libvirt-list@redhat.com
Date: Wed, 13 Mar 2019 11:51:14 -0400
Message-Id: 
 <18f6ab498d36bf2112fe99f535874ed2e331df95.1552492022.git.crobinso@redhat.com>
In-Reply-To: <cover.1552492022.git.crobinso@redhat.com>
References: <cover.1552492022.git.crobinso@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH v2 05/11] vz: convert to net model enum
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.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://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]);
 Wed, 13 Mar 2019 15:51:39 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

The vz driver only handles three models: virtio, e1000, and rtl8139.
Add enum values for those models, and convert the vz driver to
handling net->model natively

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 src/conf/domain_conf.c |  3 +++
 src/conf/domain_conf.h |  3 +++
 src/vz/vz_driver.c     |  7 +++----
 src/vz/vz_sdk.c        | 17 +++++++----------
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 571f2eea39..854b8eb045 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -475,6 +475,9 @@ VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST,
 VIR_ENUM_IMPL(virDomainNetModel, VIR_DOMAIN_NET_MODEL_LAST,
               "unknown",
               "netfront",
+              "rtl8139",
+              "virtio",
+              "e1000",
 );
=20
 VIR_ENUM_IMPL(virDomainNetBackend, VIR_DOMAIN_NET_BACKEND_TYPE_LAST,
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 92d54b0348..780f878fd8 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -964,6 +964,9 @@ typedef enum {
 typedef enum {
     VIR_DOMAIN_NET_MODEL_UNKNOWN,
     VIR_DOMAIN_NET_MODEL_NETFRONT,
+    VIR_DOMAIN_NET_MODEL_RTL8139,
+    VIR_DOMAIN_NET_MODEL_VIRTIO,
+    VIR_DOMAIN_NET_MODEL_E1000,
=20
     VIR_DOMAIN_NET_MODEL_LAST
 } virDomainNetModelType;
diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 66d019378f..00ee87c8d1 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -265,10 +265,9 @@ vzDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
     if (dev->type =3D=3D VIR_DOMAIN_DEVICE_NET &&
         (dev->data.net->type =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK ||
          dev->data.net->type =3D=3D VIR_DOMAIN_NET_TYPE_BRIDGE) &&
-        !virDomainNetGetModelString(dev->data.net) &&
-        def->os.type =3D=3D VIR_DOMAIN_OSTYPE_HVM &&
-        virDomainNetSetModelString(dev->data.net, "e1000") < 0)
-        return -1;
+        dev->data.net->model =3D=3D VIR_DOMAIN_NET_MODEL_UNKNOWN &&
+        def->os.type =3D=3D VIR_DOMAIN_OSTYPE_HVM)
+        dev->data.net->model =3D VIR_DOMAIN_NET_MODEL_E1000;
=20
     return 0;
 }
diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index ed8345a874..2316ca5a31 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -1104,16 +1104,13 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNe=
tDefPtr net, bool isCt)
=20
         switch ((int)type) {
         case PNT_RTL:
-            if (virDomainNetSetModelString(net, "rtl8139") < 0)
-                goto cleanup;
+            net->model =3D VIR_DOMAIN_NET_MODEL_RTL8139;
             break;
         case PNT_E1000:
-            if (virDomainNetSetModelString(net, "e1000") < 0)
-                goto cleanup;
+            net->model =3D VIR_DOMAIN_NET_MODEL_E1000;
             break;
         case PNT_VIRTIO:
-            if (virDomainNetSetModelString(net, "virtio") < 0)
-                goto cleanup;
+            net->model =3D VIR_DOMAIN_NET_MODEL_VIRTIO;
             break;
         default:
             virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -3377,15 +3374,15 @@ static int prlsdkConfigureNet(vzDriverPtr driver AT=
TRIBUTE_UNUSED,
         goto cleanup;
=20
     if (isCt) {
-        if (virDomainNetGetModelString(net))
+        if (net->model !=3D VIR_DOMAIN_NET_MODEL_UNKNOWN)
             VIR_WARN("Setting network adapter for containers is not "
                      "supported by vz driver.");
     } else {
-        if (virDomainNetStreqModelString(net, "rtl8139")) {
+        if (net->model =3D=3D VIR_DOMAIN_NET_MODEL_RTL8139) {
             pret =3D PrlVmDevNet_SetAdapterType(sdknet, PNT_RTL);
-        } else if (virDomainNetStreqModelString(net, "e1000")) {
+        } else if (net->model =3D=3D VIR_DOMAIN_NET_MODEL_E1000) {
             pret =3D PrlVmDevNet_SetAdapterType(sdknet, PNT_E1000);
-        } else if (virDomainNetStreqModelString(net, "virtio")) {
+        } else if (net->model =3D=3D VIR_DOMAIN_NET_MODEL_VIRTIO) {
             pret =3D PrlVmDevNet_SetAdapterType(sdknet, PNT_VIRTIO);
         } else {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Fri Apr 19 16:00:11 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1552492304776697.6254435521752;
 Wed, 13 Mar 2019 08:51:44 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
 [10.5.11.22])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 27EFFC130706;
	Wed, 13 Mar 2019 15:51: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 EC5341001DE9;
	Wed, 13 Mar 2019 15:51: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 A804C181A266;
	Wed, 13 Mar 2019 15:51:41 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
	[10.5.11.13])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x2DFpTHs001382 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 13 Mar 2019 11:51:29 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 729176B8C9; Wed, 13 Mar 2019 15:51:29 +0000 (UTC)
Received: from worklaptop.redhat.com (ovpn-124-40.rdu2.redhat.com
	[10.10.124.40])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 095B36A96F;
	Wed, 13 Mar 2019 15:51:28 +0000 (UTC)
From: Cole Robinson <crobinso@redhat.com>
To: libvirt-list@redhat.com
Date: Wed, 13 Mar 2019 11:51:15 -0400
Message-Id: 
 <a1c777171a0cf7b42602767d14f6ae8b11404560.1552492022.git.crobinso@redhat.com>
In-Reply-To: <cover.1552492022.git.crobinso@redhat.com>
References: <cover.1552492022.git.crobinso@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH v2 06/11] bhyve: convert to net model enum
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.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://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]);
 Wed, 13 Mar 2019 15:51:43 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

The bhyve driver only works with the virtio and e1000 models,
which we already have in the enum. Some error reporting is
slightly downgraded to avoid some subtle usage of modelstr

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 src/bhyve/bhyve_command.c       | 15 ++++-----------
 src/bhyve/bhyve_parse_command.c | 10 ++++------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
index d3d790f6b6..219e2b8d9e 100644
--- a/src/bhyve/bhyve_command.c
+++ b/src/bhyve/bhyve_command.c
@@ -57,16 +57,10 @@ bhyveBuildNetArgStr(virConnectPtr conn,
     int ret =3D -1;
     virDomainNetType actualType =3D virDomainNetGetActualType(net);
=20
-    if (!virDomainNetGetModelString(net)) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("NIC model must be specified"));
-        return -1;
-    }
-
-    if (virDomainNetStreqModelString(net, "virtio")) {
+    if (net->model =3D=3D VIR_DOMAIN_NET_MODEL_VIRTIO) {
         if (VIR_STRDUP(nic_model, "virtio-net") < 0)
             return -1;
-    } else if (virDomainNetStreqModelString(net, "e1000")) {
+    } else if (net->model =3D=3D VIR_DOMAIN_NET_MODEL_E1000) {
         if ((bhyveDriverGetCaps(conn) & BHYVE_CAP_NET_E1000) !=3D 0) {
             if (VIR_STRDUP(nic_model, "e1000") < 0)
                 return -1;
@@ -77,9 +71,8 @@ bhyveBuildNetArgStr(virConnectPtr conn,
             return -1;
         }
     } else {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("NIC model '%s' is not supported"),
-                       virDomainNetGetModelString(net));
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("NIC model is not supported"));
         return -1;
     }
=20
diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_comman=
d.c
index 60eb4c5412..490381688c 100644
--- a/src/bhyve/bhyve_parse_command.c
+++ b/src/bhyve/bhyve_parse_command.c
@@ -492,7 +492,7 @@ bhyveParsePCINet(virDomainDefPtr def,
                  unsigned pcislot,
                  unsigned pcibus,
                  unsigned function,
-                 const char *model,
+                 int model,
                  const char *config)
 {
     /* -s slot,virtio-net,tapN[,mac=3Dxx:xx:xx:xx:xx:xx] */
@@ -511,9 +511,7 @@ bhyveParsePCINet(virDomainDefPtr def,
     if (VIR_STRDUP(net->data.bridge.brname, "virbr0") < 0)
         goto error;
=20
-    if (virDomainNetSetModelString(net, model) < 0)
-        goto error;
-
+    net->model =3D model;
     net->info.type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
     net->info.addr.pci.slot =3D pcislot;
     net->info.addr.pci.bus =3D pcibus;
@@ -621,10 +619,10 @@ bhyveParseBhyvePCIArg(virDomainDefPtr def,
                           conf);
     else if (STREQ(emulation, "virtio-net"))
         bhyveParsePCINet(def, xmlopt, caps, pcislot, bus, function,
-                         "virtio", conf);
+                         VIR_DOMAIN_NET_MODEL_VIRTIO, conf);
     else if (STREQ(emulation, "e1000"))
         bhyveParsePCINet(def, xmlopt, caps, pcislot, bus, function,
-                         "e1000", conf);
+                         VIR_DOMAIN_NET_MODEL_E1000, conf);
=20
     VIR_FREE(emulation);
     VIR_FREE(slotdef);
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Fri Apr 19 16:00:11 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1552492301660710.0965055783759;
 Wed, 13 Mar 2019 08:51:41 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 9F62B30583D7;
	Wed, 13 Mar 2019 15:51:37 +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 7171761350;
	Wed, 13 Mar 2019 15:51:37 +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 36AF9181A13B;
	Wed, 13 Mar 2019 15:51:37 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
	[10.5.11.13])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x2DFpZbB001421 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 13 Mar 2019 11:51:35 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 8895F6B8CD; Wed, 13 Mar 2019 15:51:35 +0000 (UTC)
Received: from worklaptop.redhat.com (ovpn-124-40.rdu2.redhat.com
	[10.10.124.40])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 1749A6B8D4;
	Wed, 13 Mar 2019 15:51:33 +0000 (UTC)
From: Cole Robinson <crobinso@redhat.com>
To: libvirt-list@redhat.com
Date: Wed, 13 Mar 2019 11:51:16 -0400
Message-Id: 
 <bc0aa4651091d9bc438c274b40211eec9e1baa52.1552492022.git.crobinso@redhat.com>
In-Reply-To: <cover.1552492022.git.crobinso@redhat.com>
References: <cover.1552492022.git.crobinso@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH v2 07/11] qemu: Partially convert to net model enum
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.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://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]);
 Wed, 13 Mar 2019 15:51:38 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

This converts the qemu driver to the net model enum, for all
the model values that we have hardcoded for various checks,
which adds e1000e, virtio-transitional, virtio-non-transitional,
usb-net, spapr-vlan, lan9118, smc91c111

Because the qemu driver has historically also allowed the raw
model string onto the qemu command line, this isn't a full
conversion. Unwinding that will require more thought. However
for all new driver code we should be adding explicit enum
values for any model name we have special handling for.

Remove the now unused virDomainNetStreqModelString

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 src/conf/domain_conf.c         | 22 ++++++++++------------
 src/conf/domain_conf.h         |  9 +++++++--
 src/libvirt_private.syms       |  1 -
 src/qemu/qemu_command.c        |  6 ++----
 src/qemu/qemu_domain.c         | 29 +++++++++++++----------------
 src/qemu/qemu_domain_address.c | 12 ++++++------
 6 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 854b8eb045..a5882f27d9 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -478,6 +478,13 @@ VIR_ENUM_IMPL(virDomainNetModel, VIR_DOMAIN_NET_MODEL_=
LAST,
               "rtl8139",
               "virtio",
               "e1000",
+              "e1000e",
+              "virtio-transitional",
+              "virtio-non-transitional",
+              "usb-net",
+              "spapr-vlan",
+              "lan9118",
+              "scm91c111",
 );
=20
 VIR_ENUM_IMPL(virDomainNetBackend, VIR_DOMAIN_NET_BACKEND_TYPE_LAST,
@@ -29413,15 +29420,6 @@ virDomainNetSetModelString(virDomainNetDefPtr net,
     return 0;
 }
=20
-int
-virDomainNetStreqModelString(const virDomainNetDef *net,
-                             const char *model)
-{
-    if (net->model)
-        return net->model =3D=3D virDomainNetModelTypeFromString(model);
-    return STREQ_NULLABLE(net->modelstr, model);
-}
-
 int
 virDomainNetStrcaseeqModelString(const virDomainNetDef *net,
                                  const char *model)
@@ -29434,9 +29432,9 @@ virDomainNetStrcaseeqModelString(const virDomainNet=
Def *net,
 bool
 virDomainNetIsVirtioModel(const virDomainNetDef *net)
 {
-    return (virDomainNetStreqModelString(net, "virtio") ||
-            virDomainNetStreqModelString(net, "virtio-transitional") ||
-            virDomainNetStreqModelString(net, "virtio-non-transitional"));
+    return (net->model =3D=3D VIR_DOMAIN_NET_MODEL_VIRTIO ||
+            net->model =3D=3D VIR_DOMAIN_NET_MODEL_VIRTIO_TRANSITIONAL ||
+            net->model =3D=3D VIR_DOMAIN_NET_MODEL_VIRTIO_NON_TRANSITIONAL=
);
 }
=20
=20
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 780f878fd8..ed95deebf1 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -967,6 +967,13 @@ typedef enum {
     VIR_DOMAIN_NET_MODEL_RTL8139,
     VIR_DOMAIN_NET_MODEL_VIRTIO,
     VIR_DOMAIN_NET_MODEL_E1000,
+    VIR_DOMAIN_NET_MODEL_E1000E,
+    VIR_DOMAIN_NET_MODEL_VIRTIO_TRANSITIONAL,
+    VIR_DOMAIN_NET_MODEL_VIRTIO_NON_TRANSITIONAL,
+    VIR_DOMAIN_NET_MODEL_USB_NET,
+    VIR_DOMAIN_NET_MODEL_SPAPR_VLAN,
+    VIR_DOMAIN_NET_MODEL_LAN9118,
+    VIR_DOMAIN_NET_MODEL_SMC91C111,
=20
     VIR_DOMAIN_NET_MODEL_LAST
 } virDomainNetModelType;
@@ -3329,8 +3336,6 @@ bool virDomainNetGetActualTrustGuestRxFilters(virDoma=
inNetDefPtr iface);
 const char *virDomainNetGetModelString(const virDomainNetDef *net);
 int virDomainNetSetModelString(virDomainNetDefPtr et,
                                const char *model);
-int virDomainNetStreqModelString(const virDomainNetDef *net,
-                                 const char *model);
 int virDomainNetStrcaseeqModelString(const virDomainNetDef *net,
                                      const char *model);
 bool virDomainNetIsVirtioModel(const virDomainNetDef *net);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 3a0699d724..2639446720 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -487,7 +487,6 @@ virDomainNetResolveActualType;
 virDomainNetSetDeviceImpl;
 virDomainNetSetModelString;
 virDomainNetStrcaseeqModelString;
-virDomainNetStreqModelString;
 virDomainNetTypeFromString;
 virDomainNetTypeSharesHostView;
 virDomainNetTypeToString;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 0388ebc5af..a5deffbef2 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -479,10 +479,8 @@ qemuBuildVirtioDevStr(virBufferPtr buf,
             break;
=20
         case VIR_DOMAIN_DEVICE_NET:
-            has_tmodel =3D virDomainNetStreqModelString(device.data.net,
-                                                      "virtio-transitional=
");
-            has_ntmodel =3D virDomainNetStreqModelString(device.data.net,
-                                                       "virtio-non-transit=
ional");
+            has_tmodel =3D device.data.net->model =3D=3D VIR_DOMAIN_NET_MO=
DEL_VIRTIO_TRANSITIONAL;
+            has_ntmodel =3D device.data.net->model =3D=3D VIR_DOMAIN_NET_M=
ODEL_VIRTIO_NON_TRANSITIONAL;
             break;
=20
         case VIR_DOMAIN_DEVICE_HOSTDEV:
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 7b001bca52..6718dfbc22 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -6230,49 +6230,49 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDe=
f *dev,
  * is NULL this function may return NULL if the default model depends on t=
he
  * capabilities.
  */
-static const char *
+static int
 qemuDomainDefaultNetModel(const virDomainDef *def,
                           virQEMUCapsPtr qemuCaps)
 {
     if (ARCH_IS_S390(def->os.arch))
-        return "virtio";
+        return VIR_DOMAIN_NET_MODEL_VIRTIO;
=20
     if (def->os.arch =3D=3D VIR_ARCH_ARMV6L ||
         def->os.arch =3D=3D VIR_ARCH_ARMV7L ||
         def->os.arch =3D=3D VIR_ARCH_AARCH64) {
         if (STREQ(def->os.machine, "versatilepb"))
-            return "smc91c111";
+            return VIR_DOMAIN_NET_MODEL_SMC91C111;
=20
         if (qemuDomainIsARMVirt(def))
-            return "virtio";
+            return VIR_DOMAIN_NET_MODEL_VIRTIO;
=20
         /* Incomplete. vexpress (and a few others) use this, but not all
          * arm boards */
-        return "lan9118";
+        return VIR_DOMAIN_NET_MODEL_LAN9118;
     }
=20
     /* virtio is a sensible default for RISC-V virt guests */
     if (qemuDomainIsRISCVVirt(def))
-        return "virtio";
+        return VIR_DOMAIN_NET_MODEL_VIRTIO;
=20
     /* In all other cases the model depends on the capabilities. If they w=
ere
      * not provided don't report any default. */
     if (!qemuCaps)
-        return NULL;
+        return VIR_DOMAIN_NET_MODEL_UNKNOWN;
=20
     /* Try several network devices in turn; each of these devices is
      * less likely be supported out-of-the-box by the guest operating
      * system than the previous one */
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_RTL8139))
-        return "rtl8139";
+        return VIR_DOMAIN_NET_MODEL_RTL8139;
     else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_E1000))
-        return "e1000";
+        return VIR_DOMAIN_NET_MODEL_E1000;
     else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_NET))
-        return "virtio";
+        return VIR_DOMAIN_NET_MODEL_VIRTIO;
=20
     /* We've had no luck detecting support for any network device,
      * but we have to return something: might as well be rtl8139 */
-    return "rtl8139";
+    return VIR_DOMAIN_NET_MODEL_RTL8139;
 }
=20
=20
@@ -6727,11 +6727,8 @@ qemuDomainDeviceNetDefPostParse(virDomainNetDefPtr n=
et,
                                 virQEMUCapsPtr qemuCaps)
 {
     if (net->type !=3D VIR_DOMAIN_NET_TYPE_HOSTDEV &&
-        !virDomainNetGetModelString(net)) {
-        if (virDomainNetSetModelString(net,
-                       qemuDomainDefaultNetModel(def, qemuCaps)) < 0)
-            return -1;
-    }
+        !virDomainNetGetModelString(net))
+        net->model =3D qemuDomainDefaultNetModel(def, qemuCaps);
=20
     return 0;
 }
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 380c5bffcc..976ddaf3e0 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -230,7 +230,7 @@ qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def)
     for (i =3D 0; i < def->nnets; i++) {
         virDomainNetDefPtr net =3D def->nets[i];
=20
-        if (virDomainNetStreqModelString(net, "spapr-vlan"))
+        if (net->model =3D=3D VIR_DOMAIN_NET_MODEL_SPAPR_VLAN)
             net->info.type =3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO;
=20
         if (qemuDomainAssignSpaprVIOAddress(def, &net->info, VIO_ADDR_NET)=
 < 0)
@@ -715,18 +715,18 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDev=
iceDefPtr dev,
          * addresses for other hostdev devices.
          */
         if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_HOSTDEV ||
-            virDomainNetStreqModelString(net, "usb-net")) {
+            net->model =3D=3D VIR_DOMAIN_NET_MODEL_USB_NET) {
             return 0;
         }
=20
-        if (virDomainNetStreqModelString(net, "virtio") ||
-            virDomainNetStreqModelString(net, "virtio-non-transitional"))
+        if (net->model =3D=3D VIR_DOMAIN_NET_MODEL_VIRTIO ||
+            net->model =3D=3D VIR_DOMAIN_NET_MODEL_VIRTIO_NON_TRANSITIONAL)
             return virtioFlags;
=20
-        if (virDomainNetStreqModelString(net, "virtio-transitional"))
+        if (net->model =3D=3D VIR_DOMAIN_NET_MODEL_VIRTIO_TRANSITIONAL)
             return pciFlags;
=20
-        if (virDomainNetStreqModelString(net, "e1000e"))
+        if (net->model =3D=3D VIR_DOMAIN_NET_MODEL_E1000E)
             return pcieFlags;
=20
         return pciFlags;
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Fri Apr 19 16:00:11 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1552492303794793.338648743531;
 Wed, 13 Mar 2019 08:51:43 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com
 [10.5.11.15])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 1B557308CF92;
	Wed, 13 Mar 2019 15:51:41 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id E864E5D763;
	Wed, 13 Mar 2019 15:51:40 +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 9F6D14ED3A;
	Wed, 13 Mar 2019 15:51:40 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
	[10.5.11.13])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x2DFpaLk001433 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 13 Mar 2019 11:51:36 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 2E1A36B8CE; Wed, 13 Mar 2019 15:51:36 +0000 (UTC)
Received: from worklaptop.redhat.com (ovpn-124-40.rdu2.redhat.com
	[10.10.124.40])
	by smtp.corp.redhat.com (Postfix) with ESMTP id B77376B8C8;
	Wed, 13 Mar 2019 15:51:35 +0000 (UTC)
From: Cole Robinson <crobinso@redhat.com>
To: libvirt-list@redhat.com
Date: Wed, 13 Mar 2019 11:51:17 -0400
Message-Id: 
 <2397df40619875bb6e65040ce45880d59a035fca.1552492022.git.crobinso@redhat.com>
In-Reply-To: <cover.1552492022.git.crobinso@redhat.com>
References: <cover.1552492022.git.crobinso@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH v2 08/11] conf: Make net model enum compare case
	insensitive
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.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://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]);
 Wed, 13 Mar 2019 15:51:42 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

vbox and vmx drivers do net case insensitive net model comparisons,
so for example 'VMXNET3' and 'vmxnet3' and 'VmxNeT3' in the XML will
translate to the same driver configuration. To convert these drivers
to use net model enum, we will need to do case insensitive comparisons
as well.

Essentially we implement virEnumToString, but with case insensitive
comparison. XML will always be formatted with the enum model string
we track internally, but we will accept any case insensitive variant.

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 src/conf/domain_conf.c                     | 12 +++++++++---
 tests/qemuxml2argvdata/net-many-models.xml |  3 ++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index a5882f27d9..93b511d9bc 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -29401,14 +29401,20 @@ int
 virDomainNetSetModelString(virDomainNetDefPtr net,
                            const char *model)
 {
-    VIR_FREE(net->modelstr);
-    if ((net->model =3D virDomainNetModelTypeFromString(model)) >=3D 0)
-        return 0;
+    size_t i;
=20
+    VIR_FREE(net->modelstr);
     net->model =3D VIR_DOMAIN_NET_MODEL_UNKNOWN;
     if (!model)
         return 0;
=20
+    for (i =3D 0; i < ARRAY_CARDINALITY(virDomainNetModelTypeList); i++) {
+        if (STRCASEEQ(virDomainNetModelTypeList[i], model)) {
+            net->model =3D i;
+            return 0;
+        }
+    }
+
     if (strspn(model, NET_MODEL_CHARS) < strlen(model)) {
         virReportError(VIR_ERR_INVALID_ARG, "%s",
                        _("Model name contains invalid characters"));
diff --git a/tests/qemuxml2argvdata/net-many-models.xml b/tests/qemuxml2arg=
vdata/net-many-models.xml
index 2b8f9b18eb..40fc5de06c 100644
--- a/tests/qemuxml2argvdata/net-many-models.xml
+++ b/tests/qemuxml2argvdata/net-many-models.xml
@@ -21,7 +21,8 @@
     </interface>
     <interface type=3D'user'>
       <mac address=3D'00:11:22:33:44:58'/>
-      <model type=3D'virtio'/>
+      <!-- explicitly testing case insensitive model compare -->
+      <model type=3D'ViRtIo'/>
     </interface>
     <interface type=3D'user'>
       <mac address=3D'00:11:22:33:44:58'/>
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Fri Apr 19 16:00:11 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 155249230871999.32440646190219;
 Wed, 13 Mar 2019 08:51:48 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
 [10.5.11.12])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id AD043118ED0;
	Wed, 13 Mar 2019 15:51:46 +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 84DEF60F89;
	Wed, 13 Mar 2019 15:51:46 +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 4776E181A268;
	Wed, 13 Mar 2019 15:51:46 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
	[10.5.11.13])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x2DFpajn001444 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 13 Mar 2019 11:51:36 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id DF5336B8CD; Wed, 13 Mar 2019 15:51:36 +0000 (UTC)
Received: from worklaptop.redhat.com (ovpn-124-40.rdu2.redhat.com
	[10.10.124.40])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 760836B8CF;
	Wed, 13 Mar 2019 15:51:36 +0000 (UTC)
From: Cole Robinson <crobinso@redhat.com>
To: libvirt-list@redhat.com
Date: Wed, 13 Mar 2019 11:51:18 -0400
Message-Id: 
 <25414814764f4db9d126521cea4b89b801794e8e.1552492022.git.crobinso@redhat.com>
In-Reply-To: <cover.1552492022.git.crobinso@redhat.com>
References: <cover.1552492022.git.crobinso@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH v2 09/11] vmx: convert to net model enum
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.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://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]);
 Wed, 13 Mar 2019 15:51:47 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Convert the vmware/vmx driver to net model enum, which requires
adding enum values for vlance, vmxnet, vmxnet2, and vmxnet3.

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 src/conf/domain_conf.c |  4 ++++
 src/conf/domain_conf.h |  4 ++++
 src/vmx/vmx.c          | 52 ++++++++++++++++++++++--------------------
 3 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 93b511d9bc..3b5f27300e 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -485,6 +485,10 @@ VIR_ENUM_IMPL(virDomainNetModel, VIR_DOMAIN_NET_MODEL_=
LAST,
               "spapr-vlan",
               "lan9118",
               "scm91c111",
+              "vlance",
+              "vmxnet",
+              "vmxnet2",
+              "vmxnet3",
 );
=20
 VIR_ENUM_IMPL(virDomainNetBackend, VIR_DOMAIN_NET_BACKEND_TYPE_LAST,
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index ed95deebf1..71ab8e5bf4 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -974,6 +974,10 @@ typedef enum {
     VIR_DOMAIN_NET_MODEL_SPAPR_VLAN,
     VIR_DOMAIN_NET_MODEL_LAN9118,
     VIR_DOMAIN_NET_MODEL_SMC91C111,
+    VIR_DOMAIN_NET_MODEL_VLANCE,
+    VIR_DOMAIN_NET_MODEL_VMXNET,
+    VIR_DOMAIN_NET_MODEL_VMXNET2,
+    VIR_DOMAIN_NET_MODEL_VMXNET3,
=20
     VIR_DOMAIN_NET_MODEL_LAST
 } virDomainNetModelType;
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 7a557847ba..eb68c3acc4 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -2546,6 +2546,8 @@ virVMXParseEthernet(virConfPtr conf, int controller, =
virDomainNetDefPtr *def)
     char networkName_name[48] =3D "";
     char *networkName =3D NULL;
=20
+    int netmodel =3D VIR_DOMAIN_NET_MODEL_UNKNOWN;
+
     if (def =3D=3D NULL || *def !=3D NULL) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")=
);
         return -1;
@@ -2630,11 +2632,17 @@ virVMXParseEthernet(virConfPtr conf, int controller=
, virDomainNetDefPtr *def)
     }
=20
     if (virtualDev !=3D NULL) {
-        if (STRCASENEQ(virtualDev, "vlance") &&
-            STRCASENEQ(virtualDev, "vmxnet") &&
-            STRCASENEQ(virtualDev, "vmxnet3") &&
-            STRCASENEQ(virtualDev, "e1000") &&
-            STRCASENEQ(virtualDev, "e1000e")) {
+        if (STRCASEEQ(virtualDev, "vlance")) {
+            netmodel =3D VIR_DOMAIN_NET_MODEL_VLANCE;
+        } else if (STRCASEEQ(virtualDev, "vmxnet")) {
+            netmodel =3D VIR_DOMAIN_NET_MODEL_VMXNET;
+        } else if (STRCASEEQ(virtualDev, "vmxnet3")) {
+            netmodel =3D VIR_DOMAIN_NET_MODEL_VMXNET3;
+        } else if (STRCASEEQ(virtualDev, "e1000")) {
+            netmodel =3D VIR_DOMAIN_NET_MODEL_E1000;
+        } else if (STRCASEEQ(virtualDev, "e1000e")) {
+            netmodel =3D VIR_DOMAIN_NET_MODEL_E1000E;
+        } else {
             virReportError(VIR_ERR_INTERNAL_ERROR,
                            _("Expecting VMX entry '%s' to be 'vlance' or '=
vmxnet' or "
                              "'vmxnet3' or 'e1000' or 'e1000e' but found '=
%s'"),
@@ -2642,12 +2650,8 @@ virVMXParseEthernet(virConfPtr conf, int controller,=
 virDomainNetDefPtr *def)
             goto cleanup;
         }
=20
-        if (STRCASEEQ(virtualDev, "vmxnet") && features =3D=3D 15) {
-            VIR_FREE(virtualDev);
-
-            if (VIR_STRDUP(virtualDev, "vmxnet2") < 0)
-                goto cleanup;
-        }
+        if (netmodel =3D=3D VIR_DOMAIN_NET_MODEL_VMXNET && features =3D=3D=
 15)
+            netmodel =3D VIR_DOMAIN_NET_MODEL_VMXNET2;
     }
=20
     /* vmx:networkName -> def:data.bridge.brname */
@@ -2697,10 +2701,7 @@ virVMXParseEthernet(virConfPtr conf, int controller,=
 virDomainNetDefPtr *def)
         goto cleanup;
     }
=20
-    if (virDomainNetSetModelString((*def), virtualDev) < 0)
-        goto cleanup;
-    VIR_FREE(virtualDev);
-
+    (*def)->model =3D netmodel;
     result =3D 0;
=20
  cleanup:
@@ -3738,29 +3739,30 @@ virVMXFormatEthernet(virDomainNetDefPtr def, int co=
ntroller,
     virBufferAsprintf(buffer, "ethernet%d.present =3D \"true\"\n", control=
ler);
=20
     /* def:model -> vmx:virtualDev, vmx:features */
-    if (virDomainNetGetModelString(def)) {
-        if (!virDomainNetStrcaseeqModelString(def, "vlance") &&
-            !virDomainNetStrcaseeqModelString(def, "vmxnet") &&
-            !virDomainNetStrcaseeqModelString(def, "vmxnet2") &&
-            !virDomainNetStrcaseeqModelString(def, "vmxnet3") &&
-            !virDomainNetStrcaseeqModelString(def, "e1000") &&
-            !virDomainNetStrcaseeqModelString(def, "e1000e")) {
+    if (def->model) {
+        if (def->model !=3D VIR_DOMAIN_NET_MODEL_VLANCE &&
+            def->model !=3D VIR_DOMAIN_NET_MODEL_VMXNET &&
+            def->model !=3D VIR_DOMAIN_NET_MODEL_VMXNET2 &&
+            def->model !=3D VIR_DOMAIN_NET_MODEL_VMXNET3 &&
+            def->model !=3D VIR_DOMAIN_NET_MODEL_E1000 &&
+            def->model !=3D VIR_DOMAIN_NET_MODEL_E1000E) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
                            _("Expecting domain XML entry 'devices/interfac=
e/model' "
                              "to be 'vlance' or 'vmxnet' or 'vmxnet2' or '=
vmxnet3' "
                              "or 'e1000' or 'e1000e' but found '%s'"),
-                            virDomainNetGetModelString(def));
+                            virDomainNetModelTypeToString(def->model));
             return -1;
         }
=20
-        if (virDomainNetStrcaseeqModelString(def, "vmxnet2")) {
+        if (def->model =3D=3D VIR_DOMAIN_NET_MODEL_VMXNET2) {
             virBufferAsprintf(buffer, "ethernet%d.virtualDev =3D \"vmxnet\=
"\n",
                               controller);
             virBufferAsprintf(buffer, "ethernet%d.features =3D \"15\"\n",
                               controller);
         } else {
             virBufferAsprintf(buffer, "ethernet%d.virtualDev =3D \"%s\"\n",
-                              controller, virDomainNetGetModelString(def));
+                              controller,
+                              virDomainNetModelTypeToString(def->model));
         }
     }
=20
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Fri Apr 19 16:00:11 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 155249230685915.063539063451344;
 Wed, 13 Mar 2019 08:51:46 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
 [10.5.11.12])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id BB2CA80E73;
	Wed, 13 Mar 2019 15:51:44 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 8BE7F60F94;
	Wed, 13 Mar 2019 15:51:44 +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 545AA4EDDC;
	Wed, 13 Mar 2019 15:51:44 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
	[10.5.11.13])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x2DFpbtI001457 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 13 Mar 2019 11:51:37 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 91C906A97E; Wed, 13 Mar 2019 15:51:37 +0000 (UTC)
Received: from worklaptop.redhat.com (ovpn-124-40.rdu2.redhat.com
	[10.10.124.40])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 226F56BF63;
	Wed, 13 Mar 2019 15:51:37 +0000 (UTC)
From: Cole Robinson <crobinso@redhat.com>
To: libvirt-list@redhat.com
Date: Wed, 13 Mar 2019 11:51:19 -0400
Message-Id: 
 <9a04cae6cf2dbe3a933c0d4a1c6a77649c69f660.1552492022.git.crobinso@redhat.com>
In-Reply-To: <cover.1552492022.git.crobinso@redhat.com>
References: <cover.1552492022.git.crobinso@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH v2 10/11] vbox: Convert to net enum model
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.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://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]);
 Wed, 13 Mar 2019 15:51:45 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Convert the vbox driver to net model enum, which requires adding
enum values for Am79C970A, Am79C973, 82540EM, 82545EM, 82543GC. We
preserve the same casing that vbox historically used for these model
names.

Remove the now unused virDomainNetStrcaseeqModelString

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 src/conf/domain_conf.c   | 14 +++++---------
 src/conf/domain_conf.h   |  7 +++++--
 src/libvirt_private.syms |  1 -
 src/vbox/vbox_common.c   | 31 ++++++++++++++-----------------
 4 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 3b5f27300e..f58a6d77b9 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -489,6 +489,11 @@ VIR_ENUM_IMPL(virDomainNetModel, VIR_DOMAIN_NET_MODEL_=
LAST,
               "vmxnet",
               "vmxnet2",
               "vmxnet3",
+              "Am79C970A",
+              "Am79C973",
+              "82540EM",
+              "82545EM",
+              "82543GC",
 );
=20
 VIR_ENUM_IMPL(virDomainNetBackend, VIR_DOMAIN_NET_BACKEND_TYPE_LAST,
@@ -29430,15 +29435,6 @@ virDomainNetSetModelString(virDomainNetDefPtr net,
     return 0;
 }
=20
-int
-virDomainNetStrcaseeqModelString(const virDomainNetDef *net,
-                                 const char *model)
-{
-    if (net->model)
-        return STRCASEEQ(virDomainNetModelTypeToString(net->model), model);
-    return net->modelstr && STRCASEEQ(net->modelstr, model);
-}
-
 bool
 virDomainNetIsVirtioModel(const virDomainNetDef *net)
 {
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 71ab8e5bf4..505982ec0e 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -978,6 +978,11 @@ typedef enum {
     VIR_DOMAIN_NET_MODEL_VMXNET,
     VIR_DOMAIN_NET_MODEL_VMXNET2,
     VIR_DOMAIN_NET_MODEL_VMXNET3,
+    VIR_DOMAIN_NET_MODEL_AM79C970A,
+    VIR_DOMAIN_NET_MODEL_AM79C973,
+    VIR_DOMAIN_NET_MODEL_82540EM,
+    VIR_DOMAIN_NET_MODEL_82545EM,
+    VIR_DOMAIN_NET_MODEL_82543GC,
=20
     VIR_DOMAIN_NET_MODEL_LAST
 } virDomainNetModelType;
@@ -3340,8 +3345,6 @@ bool virDomainNetGetActualTrustGuestRxFilters(virDoma=
inNetDefPtr iface);
 const char *virDomainNetGetModelString(const virDomainNetDef *net);
 int virDomainNetSetModelString(virDomainNetDefPtr et,
                                const char *model);
-int virDomainNetStrcaseeqModelString(const virDomainNetDef *net,
-                                     const char *model);
 bool virDomainNetIsVirtioModel(const virDomainNetDef *net);
 int virDomainNetAppendIPAddress(virDomainNetDefPtr def,
                                 const char *address,
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 2639446720..afb8cf92d8 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -486,7 +486,6 @@ virDomainNetRemoveHostdev;
 virDomainNetResolveActualType;
 virDomainNetSetDeviceImpl;
 virDomainNetSetModelString;
-virDomainNetStrcaseeqModelString;
 virDomainNetTypeFromString;
 virDomainNetTypeSharesHostView;
 virDomainNetTypeToString;
diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 8c28bba8ee..4612b1f6bd 100644
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -1309,7 +1309,7 @@ vboxAttachNetwork(virDomainDefPtr def, vboxDriverPtr =
data, IMachine *machine)
         macaddrvbox[VIR_MAC_STRING_BUFLEN - 6] =3D '\0';
=20
         VIR_DEBUG("NIC(%zu): Type:   %d", i, def->nets[i]->type);
-        VIR_DEBUG("NIC(%zu): Model:  %s", i, virDomainNetGetModelString(de=
f->nets[i]));
+        VIR_DEBUG("NIC(%zu): Model:  %s", i, virDomainNetModelTypeToString=
(def->nets[i]->model));
         VIR_DEBUG("NIC(%zu): Mac:    %s", i, macaddr);
         VIR_DEBUG("NIC(%zu): ifname: %s", i, def->nets[i]->ifname);
         if (def->nets[i]->type =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK) {
@@ -1338,19 +1338,19 @@ vboxAttachNetwork(virDomainDefPtr def, vboxDriverPt=
r data, IMachine *machine)
=20
         gVBoxAPI.UINetworkAdapter.SetEnabled(adapter, 1);
=20
-        if (virDomainNetGetModelString(def->nets[i])) {
-            if (virDomainNetStrcaseeqModelString(def->nets[i], "Am79C970A"=
)) {
+        if (def->nets[i]->model) {
+            if (def->nets[i]->model =3D=3D VIR_DOMAIN_NET_MODEL_AM79C970A)=
 {
                 adapterType =3D NetworkAdapterType_Am79C970A;
-            } else if (virDomainNetStrcaseeqModelString(def->nets[i], "Am7=
9C973")) {
+            } else if (def->nets[i]->model =3D=3D VIR_DOMAIN_NET_MODEL_AM7=
9C973) {
                 adapterType =3D NetworkAdapterType_Am79C973;
-            } else if (virDomainNetStrcaseeqModelString(def->nets[i], "825=
40EM")) {
+            } else if (def->nets[i]->model =3D=3D VIR_DOMAIN_NET_MODEL_825=
40EM) {
                 adapterType =3D NetworkAdapterType_I82540EM;
-            } else if (virDomainNetStrcaseeqModelString(def->nets[i], "825=
45EM")) {
+            } else if (def->nets[i]->model =3D=3D VIR_DOMAIN_NET_MODEL_825=
45EM) {
                 adapterType =3D NetworkAdapterType_I82545EM;
-            } else if (virDomainNetStrcaseeqModelString(def->nets[i], "825=
43GC")) {
+            } else if (def->nets[i]->model =3D=3D VIR_DOMAIN_NET_MODEL_825=
43GC) {
                 adapterType =3D NetworkAdapterType_I82543GC;
             } else if (gVBoxAPI.APIVersion >=3D 3000051 &&
-                       virDomainNetStrcaseeqModelString(def->nets[i], "vir=
tio")) {
+                       def->nets[i]->model =3D=3D VIR_DOMAIN_NET_MODEL_VIR=
TIO) {
                 /* Only vbox 3.1 and later support NetworkAdapterType_Virt=
o */
                 adapterType =3D NetworkAdapterType_Virtio;
             }
@@ -3687,7 +3687,6 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter *=
adapter)
 {
     PRUint32 attachmentType =3D NetworkAttachmentType_Null;
     PRUint32 adapterType =3D NetworkAdapterType_Null;
-    const char *model =3D NULL;
     PRUnichar *utf16 =3D NULL;
     char *utf8 =3D NULL;
     virDomainNetDefPtr net =3D NULL;
@@ -3742,28 +3741,26 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter=
 *adapter)
     gVBoxAPI.UINetworkAdapter.GetAdapterType(adapter, &adapterType);
     switch (adapterType) {
     case NetworkAdapterType_Am79C970A:
-        model =3D "Am79C970A";
+        net->model =3D VIR_DOMAIN_NET_MODEL_AM79C970A;
         break;
     case NetworkAdapterType_Am79C973:
-        model =3D "Am79C973";
+        net->model =3D VIR_DOMAIN_NET_MODEL_AM79C973;
         break;
     case NetworkAdapterType_I82540EM:
-        model =3D "82540EM";
+        net->model =3D VIR_DOMAIN_NET_MODEL_82540EM;
         break;
     case NetworkAdapterType_I82545EM:
-        model =3D "82545EM";
+        net->model =3D VIR_DOMAIN_NET_MODEL_82545EM;
         break;
     case NetworkAdapterType_I82543GC:
-        model =3D "82543GC";
+        net->model =3D VIR_DOMAIN_NET_MODEL_82543GC;
         break;
     case NetworkAdapterType_Virtio:
         /* Only vbox 3.1 and later support NetworkAdapterType_Virto */
         if (gVBoxAPI.APIVersion >=3D 3000051)
-            model =3D "virtio";
+            net->model =3D VIR_DOMAIN_NET_MODEL_VIRTIO;
         break;
     }
-    if (virDomainNetSetModelString(net, model) < 0)
-        goto error;
=20
     gVBoxAPI.UINetworkAdapter.GetMACAddress(adapter, &utf16);
     VBOX_UTF16_TO_UTF8(utf16, &utf8);
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Fri Apr 19 16:00:11 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1552492310641900.6977294646437;
 Wed, 13 Mar 2019 08:51:50 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
 [10.5.11.16])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 35D4D30922E8;
	Wed, 13 Mar 2019 15:51:48 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 112E25F9D7;
	Wed, 13 Mar 2019 15:51:48 +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 CBECB4EE06;
	Wed, 13 Mar 2019 15:51:47 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
	[10.5.11.13])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x2DFpcnT001473 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 13 Mar 2019 11:51:38 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 3C3AE6A96F; Wed, 13 Mar 2019 15:51:38 +0000 (UTC)
Received: from worklaptop.redhat.com (ovpn-124-40.rdu2.redhat.com
	[10.10.124.40])
	by smtp.corp.redhat.com (Postfix) with ESMTP id BF6FD6B8CD;
	Wed, 13 Mar 2019 15:51:37 +0000 (UTC)
From: Cole Robinson <crobinso@redhat.com>
To: libvirt-list@redhat.com
Date: Wed, 13 Mar 2019 11:51:20 -0400
Message-Id: 
 <003cb0ea27bfacc658f66dc25daebb32a06c6205.1552492022.git.crobinso@redhat.com>
In-Reply-To: <cover.1552492022.git.crobinso@redhat.com>
References: <cover.1552492022.git.crobinso@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH v2 11/11] conf: Add
	VIR_DOMAIN_DEF_FEATURE_NET_MODEL_STRING
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.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://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]);
 Wed, 13 Mar 2019 15:51:49 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

This requires drivers to opt in to handle the raw modelstr
network model, all others will error if a passed in XML value
is not in the model enum.

Enable this feature for libxl/xen/xm and qemu drivers

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 src/conf/domain_conf.c        | 9 +++++++++
 src/conf/domain_conf.h        | 1 +
 src/libxl/libxl_domain.c      | 1 +
 src/qemu/qemu_domain.c        | 3 ++-
 src/security/virt-aa-helper.c | 3 ++-
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index f58a6d77b9..f06070d740 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5265,6 +5265,15 @@ virDomainDeviceDefPostParseCheckFeatures(virDomainDe=
viceDefPtr dev,
         virDomainDeviceDefCheckUnsupportedMemoryDevice(dev) < 0)
         return -1;
=20
+    if (UNSUPPORTED(VIR_DOMAIN_DEF_FEATURE_NET_MODEL_STRING) &&
+        dev->type =3D=3D VIR_DOMAIN_DEVICE_NET &&
+        dev->data.net->modelstr) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("driver does not support net model '%s'"),
+                       dev->data.net->modelstr);
+        return -1;
+    }
+
     return 0;
 }
 #undef UNSUPPORTED
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 505982ec0e..14b831ffac 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2769,6 +2769,7 @@ typedef enum {
     VIR_DOMAIN_DEF_FEATURE_USER_ALIAS =3D (1 << 5),
     VIR_DOMAIN_DEF_FEATURE_NO_BOOT_ORDER =3D (1 << 6),
     VIR_DOMAIN_DEF_FEATURE_FW_AUTOSELECT =3D (1 << 7),
+    VIR_DOMAIN_DEF_FEATURE_NET_MODEL_STRING =3D (1 << 8),
 } virDomainDefFeatures;
=20
=20
diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index ffafa7967d..dc974dc926 100644
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -424,6 +424,7 @@ virDomainDefParserConfig libxlDomainDefParserConfig =3D=
 {
     .macPrefix =3D { 0x00, 0x16, 0x3e },
     .devicesPostParseCallback =3D libxlDomainDeviceDefPostParse,
     .domainPostParseCallback =3D libxlDomainDefPostParse,
+    .features =3D VIR_DOMAIN_DEF_FEATURE_NET_MODEL_STRING,
 };
=20
=20
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 6718dfbc22..1214e32be4 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -6967,7 +6967,8 @@ virDomainDefParserConfig virQEMUDriverDomainDefParser=
Config =3D {
                 VIR_DOMAIN_DEF_FEATURE_OFFLINE_VCPUPIN |
                 VIR_DOMAIN_DEF_FEATURE_INDIVIDUAL_VCPUS |
                 VIR_DOMAIN_DEF_FEATURE_USER_ALIAS |
-                VIR_DOMAIN_DEF_FEATURE_FW_AUTOSELECT,
+                VIR_DOMAIN_DEF_FEATURE_FW_AUTOSELECT |
+                VIR_DOMAIN_DEF_FEATURE_NET_MODEL_STRING,
 };
=20
=20
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 989dcf1784..c250c61cb6 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -645,7 +645,8 @@ caps_mockup(vahControl * ctl, const char *xmlStr)
 virDomainDefParserConfig virAAHelperDomainDefParserConfig =3D {
     .features =3D VIR_DOMAIN_DEF_FEATURE_MEMORY_HOTPLUG |
                 VIR_DOMAIN_DEF_FEATURE_OFFLINE_VCPUPIN |
-                VIR_DOMAIN_DEF_FEATURE_INDIVIDUAL_VCPUS,
+                VIR_DOMAIN_DEF_FEATURE_INDIVIDUAL_VCPUS |
+                VIR_DOMAIN_DEF_FEATURE_NET_MODEL_STRING,
 };
=20
 static int
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list