From patchwork Fri Jan 18 23:05:19 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Cole Robinson <crobinso@redhat.com>
X-Patchwork-Id: 156097
Delivered-To: patch@linaro.org
Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3796940jaa;
 Fri, 18 Jan 2019 15:05:42 -0800 (PST)
X-Google-Smtp-Source: ALg8bN6tO8Q+k+5j3yAqUsknwIYhi3atjNEYrGwJytiowvlhxWOkauSSmo5UPfAUl/qxYM/Mj5v8
X-Received: by 2002:a0c:d174:: with SMTP id
 c49mr17243714qvh.231.1547852742563; 
 Fri, 18 Jan 2019 15:05:42 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1547852742; cv=none;
 d=google.com; s=arc-20160816;
 b=AObed0M/EA6Yzplh900xrcedWeg4gr2Qg4Y4R8gOGeYY4GK7hZgPun28IDWVEk+46Q
 KceraxS7pjVJ+eQxPF8yBybHCmTONfOZQZ7DU/nWs8BlpiTY7xh3wRH+/2ZwySB18zR6
 JPIMn5Nq3P5xncoX2bWmCPh2YvKKhL0lfW2YiZuTVbfrp5T0AlsS8ctvLukSM3hL2xEX
 2pk/ULj1TJn9xicL8ft1vvD1LsPgXhAqtia4dwKbm3/4QVhvROJbQmlZ1hETo5nc54bY
 vAL2cE/c5i4M3GfjZaN3LY8Z2+jONtCjtoRKz4Rpy5mL1jKnRvUGdSjYW6TalQORYcxB
 fF2Q==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
 s=arc-20160816; 
 h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help
 :list-post:list-archive:list-unsubscribe:list-id:precedence:subject
 :mime-version:references:in-reply-to:message-id:date:to:from
 :delivered-to;
 bh=5BgueRyDGwbHP7CLn09IZHySGv4S7iqoYkcEeCON9hM=;
 b=WqXCe3nLO//u1nQ2N64msPdvwES1nBTeIFzhA24ghcPJT9O6Jp9VsgfFuvC5ewBqJn
 TLfJml5hp1AAPm+7QCZDqmJMTWMPxRw8k2k6KTcaAECWwv6xZAmpD4OZuSdgZ6GA+YUo
 iAbO4L2amSWSGSG4HyZe7JIN1yvVCrAmg6ic85AN27QV3QWwJpm2FWtaCsVXBlYlajax
 ayeFexUZzckyx3lsXN9zqZ3VyrWba0nwPmLAwqtA536Xe6QOm9rOFVpYgdcUEdjWQxOd
 HxRZcNhkwBTbu1bJoshhhCDualDRRIZ+khtFTB58mniqHd4JZgIRLdmlD9ad73m0dObZ
 2YYw==
ARC-Authentication-Results: i=1; mx.google.com;
 spf=pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 smtp.mailfrom=libvir-list-bounces@redhat.com; 
 dmarc=pass (p=NONE sp=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.google.com with ESMTPS id
 t24si2182501qtr.128.2019.01.18.15.05.42
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Fri, 18 Jan 2019 15:05:42 -0800 (PST)
Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 client-ip=209.132.183.28; 
Authentication-Results: mx.google.com;
 spf=pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 smtp.mailfrom=libvir-list-bounces@redhat.com; 
 dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com
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 505ED7266E;
 Fri, 18 Jan 2019 23:05:40 +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 B4CB6608E2;
 Fri, 18 Jan 2019 23:05:39 +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 3E17B18005AD;
 Fri, 18 Jan 2019 23:05:35 +0000 (UTC)
Received: from smtp.corp.redhat.com
 (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
 by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with
 ESMTP
 id x0IN5XiS008627 for <libvir-list@listman.util.phx.redhat.com>;
 Fri, 18 Jan 2019 18:05:33 -0500
Received: by smtp.corp.redhat.com (Postfix)
 id 946E06012D; Fri, 18 Jan 2019 23:05:33 +0000 (UTC)
Delivered-To: libvirt-list@redhat.com
Received: from worklaptop.redhat.com (ovpn-125-139.rdu2.redhat.com
 [10.10.125.139])
 by smtp.corp.redhat.com (Postfix) with ESMTP id 1148E600CC;
 Fri, 18 Jan 2019 23:05:32 +0000 (UTC)
From: Cole Robinson <crobinso@redhat.com>
To: libvirt-list@redhat.com
Date: Fri, 18 Jan 2019 18:05:19 -0500
Message-Id: <ea2928c5af4dc7edcfd3f946eba8edb381b58f6c.1547851897.git.crobinso@redhat.com>
In-Reply-To: <cover.1547851897.git.crobinso@redhat.com>
References: <cover.1547851897.git.crobinso@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 01/10] 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>
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.39]);
 Fri, 18 Jan 2019 23:05:41 +0000 (UTC)

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

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/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 +
 13 files changed, 253 insertions(+)
 create mode 100644 tests/qemuxml2argvdata/net-many-models.args
 create mode 100644 tests/qemuxml2argvdata/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

-- 
2.20.1

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

diff --git a/tests/qemuxml2argvdata/net-many-models.args b/tests/qemuxml2argvdata/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=C \
+PATH=/bin \
+HOME=/home/test \
+USER=test \
+LOGNAME=test \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-i686 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
+-m 214 \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
+server,nowait \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-netdev user,id=hostnet0 \
+-device idontexist,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,\
+addr=0x3 \
+-netdev user,id=hostnet1 \
+-device vmxnet3,netdev=hostnet1,id=net1,mac=00:11:22:33:44:56,bus=pci.0,\
+addr=0x4 \
+-netdev user,id=hostnet2 \
+-device netfront,netdev=hostnet2,id=net2,mac=00:11:22:33:44:57,bus=pci.0,\
+addr=0x5 \
+-netdev user,id=hostnet3 \
+-device virtio-net-pci,netdev=hostnet3,id=net3,mac=00:11:22:33:44:58,bus=pci.0,\
+addr=0x6 \
+-netdev user,id=hostnet4 \
+-device ne2k_pci,netdev=hostnet4,id=net4,mac=00:11:22:33:44:58,bus=pci.0,\
+addr=0x7 \
+-netdev user,id=hostnet5 \
+-device pcnet,netdev=hostnet5,id=net5,mac=00:11:22:33:44:58,bus=pci.0,addr=0x8
diff --git a/tests/qemuxml2argvdata/net-many-models.xml b/tests/qemuxml2argvdata/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='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219136</memory>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <devices>
+    <interface type='user'>
+      <mac address='00:11:22:33:44:55'/>
+      <model type='idontexist'/>
+    </interface>
+    <interface type='user'>
+      <mac address='00:11:22:33:44:56'/>
+      <model type='vmxnet3'/>
+    </interface>
+    <interface type='user'>
+      <mac address='00:11:22:33:44:57'/>
+      <model type='netfront'/>
+    </interface>
+    <interface type='user'>
+      <mac address='00:11:22:33:44:58'/>
+      <model type='virtio'/>
+    </interface>
+    <interface type='user'>
+      <mac address='00:11:22:33:44:58'/>
+      <model type='ne2k_pci'/>
+    </interface>
+    <interface type='user'>
+      <mac address='00:11:22:33:44:58'/>
+      <model type='pcnet'/>
+    </interface>
+    <controller type='usb' index='0' model='none'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 8da99fc390..e4a9eba575 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1401,6 +1401,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/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 = "XenGuest2"
+uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
+maxmem = 579
+memory = 394
+vcpus = 1
+pae = 1
+acpi = 1
+apic = 1
+viridian = 0
+rtc_timeoffset = 0
+localtime = 0
+on_poweroff = "destroy"
+on_reboot = "restart"
+on_crash = "restart"
+device_model = "/usr/lib/xen/bin/qemu-system-i386"
+sdl = 0
+vnc = 1
+vncunused = 1
+vnclisten = "127.0.0.1"
+vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=fakemodel" ]
+parallel = "none"
+serial = "none"
+builder = "hvm"
+boot = "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='xen'>
+  <name>XenGuest2</name>
+  <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>592896</memory>
+  <currentMemory unit='KiB'>403456</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='x86_64' machine='xenfv'>hvm</type>
+    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
+    <boot dev='cdrom'/>
+  </os>
+  <features>
+    <acpi/>
+    <apic/>
+    <pae/>
+  </features>
+  <clock offset='variable' adjustment='0' basis='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='bridge'>
+      <mac address='00:16:3e:66:92:9c'/>
+      <source bridge='xenbr1'/>
+      <script path='vif-bridge'/>
+      <model type='fakemodel'/>
+    </interface>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'>
+      <listen type='address' address='127.0.0.1'/>
+    </graphics>
+    <video>
+      <model type='cirrus' vram='8192' heads='1' primary='yes'/>
+    </video>
+    <memballoon model='xen'/>
+  </devices>
+</domain>
diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c
index b1eb8a0614..ab3872337e 100644
--- a/tests/xlconfigtest.c
+++ b/tests/xlconfigtest.c
@@ -258,6 +258,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/xmconfigdata/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 = "XenGuest1"
+uuid = "c7a5fdb0-cdaf-9455-926a-d65c16db1809"
+maxmem = 579
+memory = 394
+vcpus = 1
+localtime = 0
+on_poweroff = "destroy"
+on_reboot = "restart"
+on_crash = "restart"
+vfb = [ "type=vnc,vncunused=1,vnclisten=127.0.0.1,vncpasswd=123poi" ]
+vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge,model=fakemodel" ]
+bootloader = "/usr/bin/pygrub"
+disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ]
diff --git a/tests/xmconfigdata/test-paravirt-net-fakemodel.xml b/tests/xmconfigdata/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='xen'>
+  <name>XenGuest1</name>
+  <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>592896</memory>
+  <currentMemory unit='KiB'>403456</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <bootloader>/usr/bin/pygrub</bootloader>
+  <os>
+    <type arch='x86_64' machine='xenpv'>linux</type>
+  </os>
+  <clock offset='utc' adjustment='reset'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>restart</on_crash>
+  <devices>
+    <disk type='block' device='disk'>
+      <driver name='phy' type='raw'/>
+      <source dev='/dev/HostVG/XenGuest1'/>
+      <target dev='xvda' bus='xen'/>
+    </disk>
+    <interface type='bridge'>
+      <mac address='00:16:3e:66:94:9c'/>
+      <source bridge='br0'/>
+      <script path='vif-bridge'/>
+      <model type='fakemodel'/>
+    </interface>
+    <console type='pty'>
+      <target type='xen' port='0'/>
+    </console>
+    <input type='mouse' bus='xen'/>
+    <input type='keyboard' bus='xen'/>
+    <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' passwd='123poi'>
+      <listen type='address' address='127.0.0.1'/>
+    </graphics>
+    <video>
+      <model type='xen' vram='4096' heads='1' primary='yes'/>
+    </video>
+    <memballoon model='xen'/>
+  </devices>
+</domain>
diff --git a/tests/xmconfigdata/test-paravirt-net-modelstr.cfg b/tests/xmconfigdata/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 = "XenGuest1"
+uuid = "c7a5fdb0-cdaf-9455-926a-d65c16db1809"
+maxmem = 579
+memory = 394
+vcpus = 1
+localtime = 0
+on_poweroff = "destroy"
+on_reboot = "restart"
+on_crash = "restart"
+vfb = [ "type=vnc,vncunused=1,vnclisten=127.0.0.1,vncpasswd=123poi" ]
+vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge,model=fakemodel" ]
+bootloader = "/usr/bin/pygrub"
+disk = [ "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-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')(on_reboot 'restart')(on_crash 'destroy')(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot 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 (mac '00:11:22:33:44:55')(bridge 'xenbr0')(script 'vif-bridge')(model 'idontexist')))(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:33:44:58')(bridge 'xenbr0')(script 'vif-bridge')(model 'virtio')))(device (vif (mac '00:11:22:33:44:58')(bridge 'xenbr0')(script 'vif-bridge')(model 'ne2k_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/xml2sexprdata/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='xen'>
+  <name>fvtest</name>
+  <uuid>b5d70dd275cdaca517769660b059d8bc</uuid>
+  <memory unit='KiB'>409600</memory>
+  <os>
+    <type>hvm</type>
+    <loader>/usr/lib/xen/boot/hvmloader</loader>
+    <boot dev='hd'/>
+  </os>
+  <devices>
+    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+    <interface type='bridge'>
+      <source bridge='xenbr0'/>
+      <mac address='00:11:22:33:44:55'/>
+      <model type='idontexist'/>
+    </interface>
+    <interface type='bridge'>
+      <source bridge='xenbr0'/>
+      <mac address='00:11:22:33:44:56'/>
+      <model type='vmxnet3'/>
+    </interface>
+    <interface type='bridge'>
+      <source bridge='xenbr0'/>
+      <mac address='00:11:22:33:44:57'/>
+      <model type='netfront'/>
+    </interface>
+    <interface type='bridge'>
+      <source bridge='xenbr0'/>
+      <mac address='00:11:22:33:44:58'/>
+      <model type='virtio'/>
+    </interface>
+    <interface type='bridge'>
+      <source bridge='xenbr0'/>
+      <mac address='00:11:22:33:44:58'/>
+      <model type='ne2k_pci'/>
+    </interface>
+    <interface type='bridge'>
+      <source bridge='xenbr0'/>
+      <mac address='00:11:22:33:44:58'/>
+      <model type='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)
 
     DO_TEST("fv-sound", "fv-sound", "fvtest");
 
+    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");
 

From patchwork Fri Jan 18 23:05:20 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Cole Robinson <crobinso@redhat.com>
X-Patchwork-Id: 156102
Delivered-To: patch@linaro.org
Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3797261jaa;
 Fri, 18 Jan 2019 15:06:00 -0800 (PST)
X-Google-Smtp-Source: ALg8bN76gD+vMNK4iF0cqfcGa3gDPnW1JJjwxAjCPj0quSoh+AeJ24JpG/fnirUKbM0AZYFxG0el
X-Received: by 2002:a37:781:: with SMTP id 123mr16780992qkh.231.1547852760612; 
 Fri, 18 Jan 2019 15:06:00 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1547852760; cv=none;
 d=google.com; s=arc-20160816;
 b=iREvzrB375zKvFQ8ZnpD8hTcV0nOJcmMFsE+iA+ehSojay13c6EPJtxyBCVj0jzuMn
 7jw3JApLgSutUo+Pl1/xmXXXav6vf4wLCSS1+af+ddTfZfPu6FaquKBjSXI6iPsVn+Gj
 byglqBwajHo1LN0NesIqmNRd/2jZDUEAAPOAwT8xiSnnxTLu07xujMF6nKZ+P5PcU+YL
 Fd7C/ObExgpGQ5DGvANbzj4CX2WYdDb3RoWo80Q7T33Rmi+Aa50YLiVWKHFKvrofp0Lg
 wVapT0qkpnMoruSvwsOfHKmif+jzoQs6JVSr1SIoyQf0GYzoDDNYyGG4v9kVrwawgFNW
 96LA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
 s=arc-20160816; 
 h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help
 :list-post:list-archive:list-unsubscribe:list-id:precedence:subject
 :mime-version:references:in-reply-to:message-id:date:to:from
 :delivered-to;
 bh=J8++XsZqujL7rwWm5ouN63CPcUv7YIg8QndB4AhvfTw=;
 b=BD4iab6o//MLFO4dvTstEbi39mvxXqwuj9kxJOsAUhoy9Rzy9f6djwUzQ/d5FuoTON
 jAWE3ivpvA4yWMUC9vhpV5juxW7l2VfLgAQ/TrvbHRG0WSlFZKfmXV0AstnF2OL30Xtw
 bugI9oTn+fMFHPRe0oSoYZb0L0VDtUwe7qS/6DdMlNejhi8E6W44sz7gpeSHIk7Tg+AF
 5L3L7dXhbdjZgRSY/t3jEBZ/LCv/wHtrGZk0WxvL/DiIkwTibHoyFjtqlQOU4Oq8Ngl7
 Pus9TgSsUuXPJHwplsSqjzwf9L4+3fDu6wKRHlf/0d6QAJIE9a3yaeHS6y06DjVn/coI
 pQ/g==
ARC-Authentication-Results: i=1; mx.google.com;
 spf=pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 smtp.mailfrom=libvir-list-bounces@redhat.com; 
 dmarc=pass (p=NONE sp=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.google.com with ESMTPS id y188si85420qke.85.2019.01.18.15.06.00
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Fri, 18 Jan 2019 15:06:00 -0800 (PST)
Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 client-ip=209.132.183.28; 
Authentication-Results: mx.google.com;
 spf=pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 smtp.mailfrom=libvir-list-bounces@redhat.com; 
 dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com
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 2A32E7DD26;
 Fri, 18 Jan 2019 23:05:59 +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 E3FDB600CC;
 Fri, 18 Jan 2019 23:05:58 +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 9BA26180339C;
 Fri, 18 Jan 2019 23:05:58 +0000 (UTC)
Received: from smtp.corp.redhat.com
 (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
 by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with
 ESMTP
 id x0IN5YC6008635 for <libvir-list@listman.util.phx.redhat.com>;
 Fri, 18 Jan 2019 18:05:34 -0500
Received: by smtp.corp.redhat.com (Postfix)
 id 52E41600D7; Fri, 18 Jan 2019 23:05:34 +0000 (UTC)
Delivered-To: libvirt-list@redhat.com
Received: from worklaptop.redhat.com (ovpn-125-139.rdu2.redhat.com
 [10.10.125.139])
 by smtp.corp.redhat.com (Postfix) with ESMTP id C4B53600CC;
 Fri, 18 Jan 2019 23:05:33 +0000 (UTC)
From: Cole Robinson <crobinso@redhat.com>
To: libvirt-list@redhat.com
Date: Fri, 18 Jan 2019 18:05:20 -0500
Message-Id: <dd46e2465cf946c3463a64d8225620ad3ddda209.1547851897.git.crobinso@redhat.com>
In-Reply-To: <cover.1547851897.git.crobinso@redhat.com>
References: <cover.1547851897.git.crobinso@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 02/10] 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>
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.26]);
 Fri, 18 Jan 2019 23:05:59 +0000 (UTC)

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         | 11 +++++-----
 src/qemu/qemu_domain.c          |  4 ++--
 src/qemu/qemu_domain_address.c  | 14 ++++++-------
 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, 138 insertions(+), 91 deletions(-)

-- 
2.20.1

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

diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
index 84fda08943..78f8a88290 100644
--- a/src/bhyve/bhyve_command.c
+++ b/src/bhyve/bhyve_command.c
@@ -56,16 +56,16 @@ bhyveBuildNetArgStr(virConnectPtr conn,
     int ret = -1;
     virDomainNetType actualType = virDomainNetGetActualType(net);
 
-    if (net->model == NULL) {
+    if (!virDomainNetGetModelString(net)) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("NIC model must be specified"));
         return -1;
     }
 
-    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) != 0) {
             if (VIR_STRDUP(nic_model, "e1000") < 0)
                 return -1;
@@ -78,7 +78,7 @@ bhyveBuildNetArgStr(virConnectPtr conn,
     } else {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("NIC model '%s' is not supported"),
-                       net->model);
+                       virDomainNetGetModelString(net));
         return -1;
     }
 
diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c
index 1c9191fb96..cf0b2db30a 100644
--- a/src/bhyve/bhyve_parse_command.c
+++ b/src/bhyve/bhyve_parse_command.c
@@ -513,7 +513,7 @@ bhyveParsePCINet(virDomainDefPtr def,
     if (VIR_STRDUP(net->data.bridge.brname, "virbr0") < 0)
         goto error;
 
-    if (VIR_STRDUP(net->model, model) < 0)
+    if (virDomainNetSetModelString(net, model) < 0)
         goto error;
 
     net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 46fbc0befc..778b842979 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -25565,9 +25565,9 @@ virDomainNetDefFormat(virBufferPtr buf,
             virBufferEscapeString(buf, " actual='%s'", def->ifname_guest_actual);
         virBufferAddLit(buf, "/>\n");
     }
-    if (def->model) {
+    if (virDomainNetGetModelString(def)) {
         virBufferEscapeString(buf, "<model type='%s'/>\n",
-                              def->model);
+                              virDomainNetGetModelString(def));
         if (virDomainNetHasVirtioModel(def)) {
             char *str = NULL, *gueststr = NULL, *hoststr = NULL;
             int rc = 0;
@@ -29838,13 +29838,39 @@ virDomainNetGetActualTrustGuestRxFilters(virDomainNetDefPtr iface)
     return iface->trustGuestRxFilters == VIR_TRISTATE_BOOL_YES;
 }
 
+const char *
+virDomainNetGetModelString(const virDomainNetDef *iface)
+{
+    return iface->model;
+}
+
+int
+virDomainNetSetModelString(virDomainNetDefPtr iface,
+                           const char *model)
+{
+    return VIR_STRDUP(iface->model, model);
+}
+
+int
+virDomainNetStreqModelString(const virDomainNetDef *iface,
+                             const char *model)
+{
+    return STREQ_NULLABLE(iface->model, model);
+}
+
+int
+virDomainNetStrcaseeqModelString(const virDomainNetDef *iface,
+                                 const char *model)
+{
+    return iface->model && STRCASEEQ(iface->model, model);
+}
 
 bool
 virDomainNetHasVirtioModel(const virDomainNetDef *iface)
 {
-    return (STREQ_NULLABLE(iface->model, "virtio") ||
-            STREQ_NULLABLE(iface->model, "virtio-transitional") ||
-            STREQ_NULLABLE(iface->model, "virtio-non-transitional"));
+    return (virDomainNetStreqModelString(iface, "virtio") ||
+            virDomainNetStreqModelString(iface, "virtio-transitional") ||
+            virDomainNetStreqModelString(iface, "virtio-non-transitional"));
 }
 
 
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 0d801b0d6d..8f856c2d14 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3271,6 +3271,13 @@ virNetDevBandwidthPtr
 virDomainNetGetActualBandwidth(virDomainNetDefPtr iface);
 virNetDevVlanPtr virDomainNetGetActualVlan(virDomainNetDefPtr iface);
 bool virDomainNetGetActualTrustGuestRxFilters(virDomainNetDefPtr iface);
+const char *virDomainNetGetModelString(const virDomainNetDef *iface);
+int virDomainNetSetModelString(virDomainNetDefPtr iface,
+                               const char *model);
+int virDomainNetStreqModelString(const virDomainNetDef *iface,
+                                 const char *model);
+int virDomainNetStrcaseeqModelString(const virDomainNetDef *iface,
+                                     const char *model);
 bool virDomainNetHasVirtioModel(const virDomainNetDef *iface);
 int virDomainNetAppendIPAddress(virDomainNetDefPtr def,
                                 const char *address,
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 60a193450b..afb5975352 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -472,6 +472,7 @@ virDomainNetGetActualTrustGuestRxFilters;
 virDomainNetGetActualType;
 virDomainNetGetActualVirtPortProfile;
 virDomainNetGetActualVlan;
+virDomainNetGetModelString;
 virDomainNetHasVirtioModel;
 virDomainNetInsert;
 virDomainNetNotifyActualDevice;
@@ -480,6 +481,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 4102a940b9..29aa04583c 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 == VIR_DOMAIN_OSTYPE_XEN ||
             def->os.type == 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 = LIBXL_NIC_TYPE_VIF;
         else
             x_nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 940d55b1b1..83222dd0be 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3779,13 +3779,14 @@ qemuBuildLegacyNicStr(virDomainNetDefPtr net)
 {
     char *str;
     char macaddr[VIR_MAC_STRING_BUFLEN];
+    const char *netmodel = virDomainNetGetModelString(net);
 
     ignore_value(virAsprintf(&str,
                              "nic,macaddr=%s,netdev=host%s%s%s%s%s",
                              virMacAddrFormat(&net->mac, macaddr),
                              net->info.alias,
-                             (net->model ? ",model=" : ""),
-                             (net->model ? net->model : ""),
+                             (netmodel ? ",model=" : ""),
+                             (netmodel ? netmodel : ""),
                              (net->info.alias ? ",id=" : ""),
                              (net->info.alias ? net->info.alias : "")));
     return str;
@@ -3805,14 +3806,14 @@ qemuBuildNicDevStr(virDomainDefPtr def,
 
     if (virDomainNetHasVirtioModel(net)) {
         if (qemuBuildVirtioTransitional(&buf, "virtio-net", qemuCaps,
-                                        net->info.type,
-                                        0, net->model,
+                                        net->info.type, 0,
+                                        virDomainNetGetModelString(net),
                                         VIR_DOMAIN_DEVICE_NET) < 0)
             goto error;
 
         usingVirtio = true;
     } else {
-        virBufferAddStr(&buf, net->model);
+        virBufferAddStr(&buf, virDomainNetGetModelString(net));
     }
 
     if (usingVirtio && net->driver.virtio.txmode) {
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 85f7b6a4c8..38e86b8ad1 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -6565,8 +6565,8 @@ qemuDomainDeviceNetDefPostParse(virDomainNetDefPtr net,
                                 virQEMUCapsPtr qemuCaps)
 {
     if (net->type != 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 50cc47b7b3..c0843bdad6 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -230,10 +230,8 @@ qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def)
     for (i = 0; i < def->nnets; i++) {
         virDomainNetDefPtr net = def->nets[i];
 
-        if (net->model &&
-            STREQ(net->model, "spapr-vlan")) {
+        if (virDomainNetStreqModelString(net, "spapr-vlan"))
             net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO;
-        }
 
         if (qemuDomainAssignSpaprVIOAddress(def, &net->info, VIO_ADDR_NET) < 0)
             goto cleanup;
@@ -696,18 +694,18 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev,
          * addresses for other hostdev devices.
          */
         if (net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV ||
-            STREQ(net->model, "usb-net")) {
+            virDomainNetStreqModelString(net, "usb-net")) {
             return 0;
         }
 
-        if (STREQ(net->model, "virtio") ||
-            STREQ(net->model, "virtio-non-transitional"))
+        if (virDomainNetStreqModelString(net, "virtio") ||
+            virDomainNetStreqModelString(net, "virtio-non-transitional"))
             return virtioFlags;
 
-        if (STREQ(net->model, "virtio-transitional"))
+        if (virDomainNetStreqModelString(net, "virtio-transitional"))
             return pciFlags;
 
-        if (STREQ(net->model, "e1000e"))
+        if (virDomainNetStreqModelString(net, "e1000e"))
             return pcieFlags;
 
         return pciFlags;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 949c09aba4..ba8b7d13a8 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7449,20 +7449,28 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
     for (i = 0; i < vm->def->nnets; i++) {
         virDomainNetDefPtr net = vm->def->nets[i];
         unsigned int bootIndex = net->info.bootIndex;
-        char *model = net->model;
+        char *model;
         virMacAddr mac = net->mac;
         char *script = net->script;
 
-        net->model = NULL;
+        if (virDomainNetGetModelString(net) &&
+            VIR_STRDUP(model, virDomainNetGetModelString(net)) < 0)
+            goto cleanup;
+
         net->script = NULL;
 
         virDomainNetDefClear(net);
 
         net->type = VIR_DOMAIN_NET_TYPE_ETHERNET;
         net->info.bootIndex = bootIndex;
-        net->model = model;
         net->mac = mac;
         net->script = script;
+
+        if (model && virDomainNetSetModelString(net, model) < 0) {
+            VIR_FREE(model);
+            goto cleanup;
+        }
+        VIR_FREE(model);
     }
 
     if (!(cmd = qemuProcessCreatePretendCmd(driver, vm, NULL,
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 2fdc71d07b..b0a99ed853 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -3702,11 +3702,12 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
         goto cleanup;
     }
 
-    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;
     }
 
diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c
index c4650f01e0..0a080f3ece 100644
--- a/src/qemu/qemu_parse_command.c
+++ b/src/qemu/qemu_parse_command.c
@@ -1111,8 +1111,9 @@ qemuParseCommandLineNet(virDomainXMLOptionPtr xmlopt,
                 goto error;
             }
         } else if (STREQ(keywords[i], "model")) {
-            def->model = values[i];
-            values[i] = NULL;
+            if (virDomainNetSetModelString(def, values[i]) < 0)
+                goto error;
+            VIR_FREE(values[i]);
         } else if (STREQ(keywords[i], "vhost")) {
             if ((values[i] == NULL) || STREQ(values[i], "on")) {
                 def->driver.virtio.name = VIR_DOMAIN_NET_BACKEND_TYPE_VHOST;
diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 00d43d9a83..fa8d899fec 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] = '\0';
 
         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(def->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 == VIR_DOMAIN_NET_TYPE_NETWORK) {
@@ -1338,19 +1338,19 @@ vboxAttachNetwork(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine)
 
         gVBoxAPI.UINetworkAdapter.SetEnabled(adapter, 1);
 
-        if (def->nets[i]->model) {
-            if (STRCASEEQ(def->nets[i]->model, "Am79C970A")) {
+        if (virDomainNetGetModelString(def->nets[i])) {
+            if (virDomainNetStrcaseeqModelString(def->nets[i], "Am79C970A")) {
                 adapterType = NetworkAdapterType_Am79C970A;
-            } else if (STRCASEEQ(def->nets[i]->model, "Am79C973")) {
+            } else if (virDomainNetStrcaseeqModelString(def->nets[i], "Am79C973")) {
                 adapterType = NetworkAdapterType_Am79C973;
-            } else if (STRCASEEQ(def->nets[i]->model, "82540EM")) {
+            } else if (virDomainNetStrcaseeqModelString(def->nets[i], "82540EM")) {
                 adapterType = NetworkAdapterType_I82540EM;
-            } else if (STRCASEEQ(def->nets[i]->model, "82545EM")) {
+            } else if (virDomainNetStrcaseeqModelString(def->nets[i], "82545EM")) {
                 adapterType = NetworkAdapterType_I82545EM;
-            } else if (STRCASEEQ(def->nets[i]->model, "82543GC")) {
+            } else if (virDomainNetStrcaseeqModelString(def->nets[i], "82543GC")) {
                 adapterType = NetworkAdapterType_I82543GC;
             } else if (gVBoxAPI.APIVersion >= 3000051 &&
-                       STRCASEEQ(def->nets[i]->model, "virtio")) {
+                       virDomainNetStrcaseeqModelString(def->nets[i], "virtio")) {
                 /* Only vbox 3.1 and later support NetworkAdapterType_Virto */
                 adapterType = NetworkAdapterType_Virtio;
             }
@@ -3762,7 +3762,7 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter *adapter)
             model = "virtio";
         break;
     }
-    if (VIR_STRDUP(net->model, model) < 0)
+    if (virDomainNetSetModelString(net, model) < 0)
         goto error;
 
     gVBoxAPI.UINetworkAdapter.GetMACAddress(adapter, &utf16);
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index a853c05e86..7f8357211c 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -2670,10 +2670,8 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def)
     /* Setup virDomainNetDef */
     if (connectionType == NULL || STRCASEEQ(connectionType, "bridged")) {
         (*def)->type = VIR_DOMAIN_NET_TYPE_BRIDGE;
-        (*def)->model = virtualDev;
         (*def)->data.bridge.brname = networkName;
 
-        virtualDev = NULL;
         networkName = NULL;
     } else if (STRCASEEQ(connectionType, "hostonly")) {
         /* FIXME */
@@ -2683,16 +2681,12 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def)
         goto cleanup;
     } else if (STRCASEEQ(connectionType, "nat")) {
         (*def)->type = VIR_DOMAIN_NET_TYPE_USER;
-        (*def)->model = virtualDev;
 
-        virtualDev = NULL;
     } else if (STRCASEEQ(connectionType, "custom")) {
         (*def)->type = VIR_DOMAIN_NET_TYPE_BRIDGE;
-        (*def)->model = virtualDev;
         (*def)->data.bridge.brname = networkName;
         (*def)->ifname = vnet;
 
-        virtualDev = NULL;
         networkName = NULL;
         vnet = NULL;
     } else {
@@ -2702,6 +2696,10 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def)
         goto cleanup;
     }
 
+    if (virDomainNetSetModelString((*def), virtualDev) < 0)
+        goto cleanup;
+    VIR_FREE(virtualDev);
+
     result = 0;
 
  cleanup:
@@ -3739,28 +3737,29 @@ virVMXFormatEthernet(virDomainNetDefPtr def, int controller,
     virBufferAsprintf(buffer, "ethernet%d.present = \"true\"\n", controller);
 
     /* def:model -> vmx:virtualDev, vmx:features */
-    if (def->model != 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/interface/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;
         }
 
-        if (STRCASEEQ(def->model, "vmxnet2")) {
+        if (virDomainNetStrcaseeqModelString(def, "vmxnet2")) {
             virBufferAsprintf(buffer, "ethernet%d.virtualDev = \"vmxnet\"\n",
                               controller);
             virBufferAsprintf(buffer, "ethernet%d.features = \"15\"\n",
                               controller);
         } else {
             virBufferAsprintf(buffer, "ethernet%d.virtualDev = \"%s\"\n",
-                              controller, def->model);
+                              controller, virDomainNetGetModelString(def));
         }
     }
 
diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 7e9ef932dc..eab2953759 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -269,9 +269,9 @@ vzDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
     if (dev->type == VIR_DOMAIN_DEVICE_NET &&
         (dev->data.net->type == VIR_DOMAIN_NET_TYPE_NETWORK ||
          dev->data.net->type == VIR_DOMAIN_NET_TYPE_BRIDGE) &&
-        !dev->data.net->model &&
+        !virDomainNetGetModelString(dev->data.net) &&
         def->os.type == VIR_DOMAIN_OSTYPE_HVM &&
-        VIR_STRDUP(dev->data.net->model, "e1000") < 0)
+        virDomainNetSetModelString(dev->data.net, "e1000") < 0)
         return -1;
 
     return 0;
diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index 63d013deac..60681591c6 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -1105,15 +1105,15 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool isCt)
 
         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:
@@ -3378,15 +3378,15 @@ static int prlsdkConfigureNet(vzDriverPtr driver ATTRIBUTE_UNUSED,
         goto cleanup;
 
     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 = PrlVmDevNet_SetAdapterType(sdknet, PNT_RTL);
-        } else if (STREQ(net->model, "e1000")) {
+        } else if (virDomainNetStreqModelString(net, "e1000")) {
             pret = PrlVmDevNet_SetAdapterType(sdknet, PNT_E1000);
-        } else if (STREQ(net->model, "virtio")) {
+        } else if (virDomainNetStreqModelString(net, "virtio")) {
             pret = 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 94e0703cf3..74ce8dcc69 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;
 
     if (model[0] &&
-        VIR_STRDUP(net->model, model) < 0)
+        virDomainNetSetModelString(net, model) < 0)
         goto cleanup;
 
     if (!model[0] && type[0] && STREQ(type, vif_typename) &&
-        VIR_STRDUP(net->model, "netfront") < 0)
+        virDomainNetSetModelString(net, "netfront") < 0)
         goto cleanup;
 
     if (vifname[0] &&
@@ -1422,15 +1422,16 @@ xenFormatNet(virConnectPtr conn,
         goto cleanup;
     }
 
-    if (!hvm) {
-        if (net->model != NULL)
-            virBufferAsprintf(&buf, ",model=%s", net->model);
-    } else {
-        if (net->model != NULL && STREQ(net->model, "netfront")) {
-            virBufferAsprintf(&buf, ",type=%s", vif_typename);
+    if (virDomainNetGetModelString(net)) {
+        if (!hvm) {
+            virBufferAsprintf(&buf, ",model=%s",
+                              virDomainNetGetModelString(net));
         } else {
-            if (net->model != NULL)
-                virBufferAsprintf(&buf, ",model=%s", net->model);
+            if (virDomainNetStreqModelString(net, "netfront"))
+                virBufferAsprintf(&buf, ",type=%s", vif_typename);
+            else
+                virBufferAsprintf(&buf, ",model=%s",
+                                  virDomainNetGetModelString(net));
         }
     }
 
diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index 11af3e747a..b3bbce4e86 100644
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -642,11 +642,11 @@ xenParseSxprNets(virDomainDefPtr def,
                 }
             }
 
-            if (VIR_STRDUP(net->model, model) < 0)
+            if (virDomainNetSetModelString(net, model) < 0)
                 goto cleanup;
 
             if (!model && type && STREQ(type, "netfront") &&
-                VIR_STRDUP(net->model, "netfront") < 0)
+                virDomainNetSetModelString(net, "netfront") < 0)
                 goto cleanup;
 
             tmp = sexpr_node(node, "device/vif/rate");
@@ -1935,15 +1935,16 @@ xenFormatSxprNet(virConnectPtr conn,
         !STRPREFIX(def->ifname, "vif"))
         virBufferEscapeSexpr(buf, "(vifname '%s')", def->ifname);
 
-    if (!hvm) {
-        if (def->model != NULL)
-            virBufferEscapeSexpr(buf, "(model '%s')", def->model);
-    } else {
-        if (def->model != NULL && STREQ(def->model, "netfront")) {
-            virBufferAddLit(buf, "(type netfront)");
+    if (virDomainNetGetModelString(def)) {
+        if (!hvm) {
+            virBufferEscapeSexpr(buf, "(model '%s')",
+                                 virDomainNetGetModelString(def));
         } else {
-            if (def->model != NULL)
-                virBufferEscapeSexpr(buf, "(model '%s')", def->model);
+            if (virDomainNetStreqModelString(def, "netfront"))
+                virBufferAddLit(buf, "(type netfront)");
+            else
+                virBufferEscapeSexpr(buf, "(model '%s')",
+                                     virDomainNetGetModelString(def));
         }
     }
 

From patchwork Fri Jan 18 23:05:21 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Cole Robinson <crobinso@redhat.com>
X-Patchwork-Id: 156104
Delivered-To: patch@linaro.org
Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3797370jaa;
 Fri, 18 Jan 2019 15:06:05 -0800 (PST)
X-Google-Smtp-Source: ALg8bN7PcjVWi3GjvQlfuejqpQpFK7C97/syFAKgoHsYHazIHY4rMflD6hBEknUZl74i+ReNw6Cj
X-Received: by 2002:ac8:4611:: with SMTP id
 p17mr18428684qtn.263.1547852765772; 
 Fri, 18 Jan 2019 15:06:05 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1547852765; cv=none;
 d=google.com; s=arc-20160816;
 b=mF1vWPoahhlssK8Kygdq5gygwZAXpvlcmTmezRUK7WbhC6afXd0mmlM4hI8vKeY/uP
 /YcJOYUNslbeq3AP4fK3JYaYlP/vumIRjWDlnh3gNxAS0fQQ+JmuG3JWKfc1Y2nyM7cZ
 E7+SvH0RRt3wlYtpjxsNs0uo1Y/i4FjT+gUm2TAvxaNPzBL2ztU2zhk6zbtCsJhFbJ8r
 BVLJWQnT11KQ+KSue4zpZg1wu7r5HwWg5RwHPaKrpNkT9IWGtoGdv2fHNhQbX8okvnXw
 AqNRw92EGPCTjU8VlT5rJ3XRY1jhmtpQ2czYhLmhRoV1FQv31xG/AgTpJNWwcJ+rDtga
 7UEQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
 s=arc-20160816; 
 h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help
 :list-post:list-archive:list-unsubscribe:list-id:precedence:subject
 :mime-version:references:in-reply-to:message-id:date:to:from
 :delivered-to;
 bh=Mm9AiM2Fyk+e1kYq2dIHhpV6KjopZsXCMjRsElB3n1U=;
 b=rTGkgJa6fFWBXduRdFNHw+CUtnBT6hRcYPc6+n9rfSB+i/iEIxZq0G9Hz51IJ9Q/UT
 olg8Ez5tjeAfSIRf+MmiRNuLaF+8zoBHk+heBceLZlon9RNk8+V2AuE8dgCMgPJawMrI
 pqkkmi6sfy450bYZlUIntzazyySiyo+uj7Nro9+6aQE7I/GiwtRHbCUWypQO/poljpxx
 Q/Kfed+nxt06ETrK0D3t4F8bgAL1U7TQHV8eEpcMRl8dU3T7rFsXlo4qV95xw6Ue3OUE
 tGOT1lwjq51P4kzCR/FxksL7lanuGGRfdqX09Y7Gk0SqNVSmF5kkgb5aHBW+aahUV6fs
 zaGg==
ARC-Authentication-Results: i=1; mx.google.com;
 spf=pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 smtp.mailfrom=libvir-list-bounces@redhat.com; 
 dmarc=pass (p=NONE sp=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.google.com with ESMTPS id t3si364314qto.355.2019.01.18.15.06.05
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Fri, 18 Jan 2019 15:06:05 -0800 (PST)
Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 client-ip=209.132.183.28; 
Authentication-Results: mx.google.com;
 spf=pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 smtp.mailfrom=libvir-list-bounces@redhat.com; 
 dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com
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 078E67D0D3;
 Fri, 18 Jan 2019 23:06:04 +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 BBF9E5D757;
 Fri, 18 Jan 2019 23:06:03 +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 33C553F606;
 Fri, 18 Jan 2019 23:06:03 +0000 (UTC)
Received: from smtp.corp.redhat.com
 (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
 by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with
 ESMTP
 id x0IN5Z6A008645 for <libvir-list@listman.util.phx.redhat.com>;
 Fri, 18 Jan 2019 18:05:35 -0500
Received: by smtp.corp.redhat.com (Postfix)
 id 071DC600CC; Fri, 18 Jan 2019 23:05:35 +0000 (UTC)
Delivered-To: libvirt-list@redhat.com
Received: from worklaptop.redhat.com (ovpn-125-139.rdu2.redhat.com
 [10.10.125.139])
 by smtp.corp.redhat.com (Postfix) with ESMTP id 81BC5600D6;
 Fri, 18 Jan 2019 23:05:34 +0000 (UTC)
From: Cole Robinson <crobinso@redhat.com>
To: libvirt-list@redhat.com
Date: Fri, 18 Jan 2019 18:05:21 -0500
Message-Id: <fa57bb74aeb30bc368d6d3780b1205c6ed1160bd.1547851897.git.crobinso@redhat.com>
In-Reply-To: <cover.1547851897.git.crobinso@redhat.com>
References: <cover.1547851897.git.crobinso@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 03/10] 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>
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.26]);
 Fri, 18 Jan 2019 23:06:05 +0000 (UTC)

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(-)

-- 
2.20.1

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

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 778b842979..25fbf6f64b 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2120,7 +2120,7 @@ virDomainNetDefClear(virDomainNetDefPtr def)
     if (!def)
         return;
 
-    VIR_FREE(def->model);
+    VIR_FREE(def->modelstr);
 
     switch (def->type) {
     case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
@@ -11402,7 +11402,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
                            _("Model name contains invalid characters"));
             goto error;
         }
-        def->model = model;
+        def->modelstr = model;
         model = NULL;
     }
 
@@ -21971,10 +21971,10 @@ virDomainNetDefCheckABIStability(virDomainNetDefPtr src,
         return false;
     }
 
-    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 source %s"),
-                       NULLSTR(dst->model), NULLSTR(src->model));
+                       NULLSTR(dst->modelstr), NULLSTR(src->modelstr));
         return false;
     }
 
@@ -29841,28 +29841,28 @@ virDomainNetGetActualTrustGuestRxFilters(virDomainNetDefPtr iface)
 const char *
 virDomainNetGetModelString(const virDomainNetDef *iface)
 {
-    return iface->model;
+    return iface->modelstr;
 }
 
 int
 virDomainNetSetModelString(virDomainNetDefPtr iface,
                            const char *model)
 {
-    return VIR_STRDUP(iface->model, model);
+    return VIR_STRDUP(iface->modelstr, model);
 }
 
 int
 virDomainNetStreqModelString(const virDomainNetDef *iface,
                              const char *model)
 {
-    return STREQ_NULLABLE(iface->model, model);
+    return STREQ_NULLABLE(iface->modelstr, model);
 }
 
 int
 virDomainNetStrcaseeqModelString(const virDomainNetDef *iface,
                                  const char *model)
 {
-    return iface->model && STRCASEEQ(iface->model, model);
+    return iface->modelstr && STRCASEEQ(iface->modelstr, model);
 }
 
 bool
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 8f856c2d14..5400deda4c 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 libvirt */
-    char *model;
+    char *modelstr;
     union {
         struct {
             virDomainNetBackendType name; /* which driver backend to use */

From patchwork Fri Jan 18 23:05:22 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Cole Robinson <crobinso@redhat.com>
X-Patchwork-Id: 156101
Delivered-To: patch@linaro.org
Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3797270jaa;
 Fri, 18 Jan 2019 15:06:00 -0800 (PST)
X-Google-Smtp-Source: ALg8bN7fvU28I3xtSUI6QpjH2uQ6O8y60yVgWlRFzUajqAsR/j9TISZdixTXF0TQy4HQz2+Mx74M
X-Received: by 2002:ac8:44d4:: with SMTP id
 b20mr17712322qto.340.1547852760909; 
 Fri, 18 Jan 2019 15:06:00 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1547852760; cv=none;
 d=google.com; s=arc-20160816;
 b=g3DIupiJ2bokTYVuIL7rUp67j8SaUiaU4G7VcG5F85v2Ixg+WtbugiAstrLnyVCNMs
 t9CrUSkn1bD35Sim6RU7CGhaudo+mhRuPe+ivhPRfeh4Ml+UKTMLjH32Q4h/n7wi0gEX
 Z3oC88ZQA0HSZFG9650KVLksNlJxYA4Jyo4xtLVyLTreov4nQZcSanjrRKJHVn//b79z
 HWXsFflSzKBU3EZ8EzAvr5/4TgYfT5/5/tcgm5TEtnRR1gTsEjqxrFZ9V/qS3+7vWB2M
 JfDEi0MUBiAypsB02QKhhEnRoxZtV4ftgKQWrYEmvERjBcNExXsRG8h8JamkHTiUqhjJ
 Eu+A==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
 s=arc-20160816; 
 h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help
 :list-post:list-archive:list-unsubscribe:list-id:precedence:subject
 :mime-version:references:in-reply-to:message-id:date:to:from
 :delivered-to;
 bh=iGujm7VhDDZPC251SBXYTb32hRqG63WPvSvnygp1OXs=;
 b=ZqDlALn05cjTUGAwfeGga3YjfX8ci+ASbGtktNLIH8x+BHcDfRJ4uFiX+1XFusSeml
 lkj1UJUGtWWiwl22iQDZJrXARfbyEbF/v9sjjUZrN6GyuT9f9bs41ebHNg0zLQ1aZKD6
 Fd2F44DOq7YYkclKjCJitJxDhLwQLZFErXA55k+qmgfQc9ESqpDXZGbtPhIQVhhMzyD3
 wQlMGHnBkDMgTmW3ZEKx23Y1MzSC80sUrifhMHBRqMdWVTH0WwH4JVBQks1Y2+bmdXFt
 R4kjD9louI/pV6oLPowYQjFQ+bPu0Ax1z2oNpqVrBYG/akcKfGc30dP2/EvjdSID2HWd
 48gw==
ARC-Authentication-Results: i=1; mx.google.com;
 spf=pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 smtp.mailfrom=libvir-list-bounces@redhat.com; 
 dmarc=pass (p=NONE sp=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.google.com with ESMTPS id
 f35si4962886qtd.85.2019.01.18.15.06.00
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Fri, 18 Jan 2019 15:06:00 -0800 (PST)
Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 client-ip=209.132.183.28; 
Authentication-Results: mx.google.com;
 spf=pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 smtp.mailfrom=libvir-list-bounces@redhat.com; 
 dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com
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 2B6A983F44;
 Fri, 18 Jan 2019 23:05:59 +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 E1C15508E2;
 Fri, 18 Jan 2019 23:05:58 +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 990443F603;
 Fri, 18 Jan 2019 23:05:58 +0000 (UTC)
Received: from smtp.corp.redhat.com
 (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
 by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with
 ESMTP
 id x0IN5ZCU008652 for <libvir-list@listman.util.phx.redhat.com>;
 Fri, 18 Jan 2019 18:05:35 -0500
Received: by smtp.corp.redhat.com (Postfix)
 id A049D600D6; Fri, 18 Jan 2019 23:05:35 +0000 (UTC)
Delivered-To: libvirt-list@redhat.com
Received: from worklaptop.redhat.com (ovpn-125-139.rdu2.redhat.com
 [10.10.125.139])
 by smtp.corp.redhat.com (Postfix) with ESMTP id 35F74600C2;
 Fri, 18 Jan 2019 23:05:35 +0000 (UTC)
From: Cole Robinson <crobinso@redhat.com>
To: libvirt-list@redhat.com
Date: Fri, 18 Jan 2019 18:05:22 -0500
Message-Id: <f610931085b1f22a7ccc6a988d27a1a66694fe82.1547851897.git.crobinso@redhat.com>
In-Reply-To: <cover.1547851897.git.crobinso@redhat.com>
References: <cover.1547851897.git.crobinso@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 04/10] 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>
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.27]);
 Fri, 18 Jan 2019 23:06:00 +0000 (UTC)

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     | 56 +++++++++++++++++++++++++++-----------
 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(+), 33 deletions(-)

-- 
2.20.1

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

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 25fbf6f64b..129e16bd0b 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -436,6 +436,10 @@ VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST,
               "hostdev",
               "udp")
 
+VIR_ENUM_IMPL(virDomainNetModel, VIR_DOMAIN_NET_MODEL_LAST,
+              "unknown",
+              "netfront")
+
 VIR_ENUM_IMPL(virDomainNetBackend, VIR_DOMAIN_NET_BACKEND_TYPE_LAST,
               "default",
               "qemu",
@@ -2121,6 +2125,7 @@ virDomainNetDefClear(virDomainNetDefPtr def)
         return;
 
     VIR_FREE(def->modelstr);
+    def->model = VIR_DOMAIN_NET_MODEL_UNKNOWN;
 
     switch (def->type) {
     case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
@@ -11390,21 +11395,9 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
             goto error;
     }
 
-    /* NIC model (see -net nic,model=?).  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 != NULL) {
-        if (strspn(model, NET_MODEL_CHARS) < strlen(model)) {
-            virReportError(VIR_ERR_INVALID_ARG, "%s",
-                           _("Model name contains invalid characters"));
-            goto error;
-        }
-        def->modelstr = model;
-        model = NULL;
-    }
+    if (model != NULL &&
+        virDomainNetSetModelString(def, model) < 0)
+        goto error;
 
     switch (def->type) {
     case VIR_DOMAIN_NET_TYPE_NETWORK:
@@ -21978,6 +21971,14 @@ virDomainNetDefCheckABIStability(virDomainNetDefPtr src,
         return false;
     }
 
+    if (src->model != dst->model) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("Target network card model %s does not match source %s"),
+                       virDomainNetModelTypeToString(dst->model),
+                       virDomainNetModelTypeToString(src->model));
+        return false;
+    }
+
     if (src->mtu != dst->mtu) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("Target network card MTU %d does not match source %d"),
@@ -29841,6 +29842,8 @@ virDomainNetGetActualTrustGuestRxFilters(virDomainNetDefPtr iface)
 const char *
 virDomainNetGetModelString(const virDomainNetDef *iface)
 {
+    if (iface->model)
+        return virDomainNetModelTypeToString(iface->model);
     return iface->modelstr;
 }
 
@@ -29848,13 +29851,31 @@ int
 virDomainNetSetModelString(virDomainNetDefPtr iface,
                            const char *model)
 {
-    return VIR_STRDUP(iface->modelstr, model);
+    VIR_FREE(iface->modelstr);
+    if ((iface->model = virDomainNetModelTypeFromString(model)) >= 0)
+        return 0;
+
+    iface->model = 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(iface->modelstr, model) < 0)
+        return -1;
+    return 0;
 }
 
 int
 virDomainNetStreqModelString(const virDomainNetDef *iface,
                              const char *model)
 {
+    if (iface->model)
+        return iface->model == virDomainNetModelTypeFromString(model);
     return STREQ_NULLABLE(iface->modelstr, model);
 }
 
@@ -29862,6 +29883,9 @@ int
 virDomainNetStrcaseeqModelString(const virDomainNetDef *iface,
                                  const char *model)
 {
+    if (iface->model)
+        return STRCASEEQ(virDomainNetModelTypeToString(iface->model),
+                         model);
     return iface->modelstr && STRCASEEQ(iface->modelstr, model);
 }
 
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 5400deda4c..e26b885508 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;
 
+/* 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 user */
@@ -1021,6 +1029,7 @@ struct _virDomainNetDef {
     virDomainNetType type;
     virMacAddr mac;
     bool mac_generated; /* true if mac was *just now* auto-generated by libvirt */
+    int model; /* virDomainNetModelType */
     char *modelstr;
     union {
         struct {
@@ -3493,6 +3502,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 afb5975352..d802535fa0 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -475,6 +475,8 @@ virDomainNetGetActualVlan;
 virDomainNetGetModelString;
 virDomainNetHasVirtioModel;
 virDomainNetInsert;
+virDomainNetModelTypeFromString;
+virDomainNetModelTypeToString;
 virDomainNetNotifyActualDevice;
 virDomainNetReleaseActualDevice;
 virDomainNetRemove;
diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 29aa04583c..ebb38ba7e8 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 == VIR_DOMAIN_OSTYPE_XEN ||
             def->os.type == VIR_DOMAIN_OSTYPE_XENPVH) &&
-            !virDomainNetStreqModelString(l_nic, "netfront")) {
+            l_nic->model != 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 == VIR_DOMAIN_NET_MODEL_NETFRONT)
             x_nic->nictype = LIBXL_NIC_TYPE_VIF;
         else
             x_nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU;
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index b0a99ed853..168b391f0e 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -3711,6 +3711,14 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
         goto cleanup;
     }
 
+    if (olddev->model != 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 (virDomainNetHasVirtioModel(olddev) &&
         (olddev->driver.virtio.name != newdev->driver.virtio.name ||
          olddev->driver.virtio.txmode != newdev->driver.virtio.txmode ||
diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c
index 74ce8dcc69..dfe240a949 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;
 
-    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 = VIR_DOMAIN_NET_MODEL_NETFRONT;
+    }
 
     if (vifname[0] &&
         VIR_STRDUP(net->ifname, vifname) < 0)
@@ -1427,7 +1427,7 @@ xenFormatNet(virConnectPtr conn,
             virBufferAsprintf(&buf, ",model=%s",
                               virDomainNetGetModelString(net));
         } else {
-            if (virDomainNetStreqModelString(net, "netfront"))
+            if (net->model == VIR_DOMAIN_NET_MODEL_NETFRONT)
                 virBufferAsprintf(&buf, ",type=%s", vif_typename);
             else
                 virBufferAsprintf(&buf, ",model=%s",
diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c
index b3bbce4e86..071949bff5 100644
--- a/src/xenconfig/xen_sxpr.c
+++ b/src/xenconfig/xen_sxpr.c
@@ -642,12 +642,13 @@ xenParseSxprNets(virDomainDefPtr def,
                 }
             }
 
-            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 = VIR_DOMAIN_NET_MODEL_NETFRONT;
+            }
 
             tmp = sexpr_node(node, "device/vif/rate");
             if (tmp) {
@@ -1940,7 +1941,7 @@ xenFormatSxprNet(virConnectPtr conn,
             virBufferEscapeSexpr(buf, "(model '%s')",
                                  virDomainNetGetModelString(def));
         } else {
-            if (virDomainNetStreqModelString(def, "netfront"))
+            if (def->model == VIR_DOMAIN_NET_MODEL_NETFRONT)
                 virBufferAddLit(buf, "(type netfront)");
             else
                 virBufferEscapeSexpr(buf, "(model '%s')",

From patchwork Fri Jan 18 23:05:23 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Cole Robinson <crobinso@redhat.com>
X-Patchwork-Id: 156103
Delivered-To: patch@linaro.org
Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3797363jaa;
 Fri, 18 Jan 2019 15:06:05 -0800 (PST)
X-Google-Smtp-Source: ALg8bN6oWjfxItXc6yZlJRg8gdIW2Fv2u0pkBI0zQu/9iD5EuihBkQvj1DPRwxsnOwlpbTXgPjCs
X-Received: by 2002:a0c:88a8:: with SMTP id 37mr17013846qvn.63.1547852765491; 
 Fri, 18 Jan 2019 15:06:05 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1547852765; cv=none;
 d=google.com; s=arc-20160816;
 b=qz/xDBBP1VrIztPEGiRdTGrI0mJiXDTts5hX2qY5Ze7y+h05g9rBD305LR1qPnwfr4
 aDXoavCtZI67PI0x/UaJg6AlGgNRCVAomdWd4U/SMdPEu5k85X3bZnWzPGLqUB0RX/QC
 GOW6OgqL+GdRzbIxAyN9uKV1XkvQzP2ePVEvLTXoALhdDyH/assyHFUbBOZ9m8gHsbZ0
 4jmGJKMwsVqd8Gl17iWAIk0opZuQj5HfIiQBlAFUgIDQBCEdlU8+ZNeFCbeBgvshCwWB
 BEmfmWqrXOFtsQ6VD6dwUdH732d5aQYZ9KxXiDkROm/WToUmWe/e3uX91W6CpwrWqphm
 dTqw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
 s=arc-20160816; 
 h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help
 :list-post:list-archive:list-unsubscribe:list-id:precedence:subject
 :mime-version:references:in-reply-to:message-id:date:to:from
 :delivered-to;
 bh=pQ1rRYMlUpwMUhnX+JSS8FrSxVwEkXb5O35Hr42DmJw=;
 b=dlNjusUAamzjNfL/UjCnlGjpemeIGRI0xGw9kyc8G//LYMl87JeDKc59i8E4qLpmLO
 lZV9H8k82cKCgNlM+VlGzxuyQiOEFysE36QzRWI7WyqLHhm3J301/Q6SmYdxDEy/MNH4
 7F390w43FF7wlnH0/Eyc835TkeRlKJQ2Cu9IAQfsaW6cVLfrXnwzxrsNDB3+GCbMkQrs
 9FEu3va+AYAAgQ/e7KtL33upyaJc1MDnuH8Sr6VnndBM5oBYs+CeIABP/o0n7NDyWV19
 5sDCAgtjaSCLqfDHf0kVXV8xaUC3zBNgqxRhv4RTeusr0JyRlvAN7tnIhbvls36brDb/
 EYuA==
ARC-Authentication-Results: i=1; mx.google.com;
 spf=pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 smtp.mailfrom=libvir-list-bounces@redhat.com; 
 dmarc=pass (p=NONE sp=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.google.com with ESMTPS id
 h4si2742934qtm.381.2019.01.18.15.06.05
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Fri, 18 Jan 2019 15:06:05 -0800 (PST)
Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 client-ip=209.132.183.28; 
Authentication-Results: mx.google.com;
 spf=pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 smtp.mailfrom=libvir-list-bounces@redhat.com; 
 dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com
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 03BC596E9;
 Fri, 18 Jan 2019 23:06:04 +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 ABC0761D1A;
 Fri, 18 Jan 2019 23:06:03 +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 240CB18033CA;
 Fri, 18 Jan 2019 23:06:03 +0000 (UTC)
Received: from smtp.corp.redhat.com
 (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
 by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with
 ESMTP
 id x0IN5anc008658 for <libvir-list@listman.util.phx.redhat.com>;
 Fri, 18 Jan 2019 18:05:36 -0500
Received: by smtp.corp.redhat.com (Postfix)
 id 46BE1600D6; Fri, 18 Jan 2019 23:05:36 +0000 (UTC)
Delivered-To: libvirt-list@redhat.com
Received: from worklaptop.redhat.com (ovpn-125-139.rdu2.redhat.com
 [10.10.125.139])
 by smtp.corp.redhat.com (Postfix) with ESMTP id CF3F5600C2;
 Fri, 18 Jan 2019 23:05:35 +0000 (UTC)
From: Cole Robinson <crobinso@redhat.com>
To: libvirt-list@redhat.com
Date: Fri, 18 Jan 2019 18:05:23 -0500
Message-Id: <8f79ddeb607669441bc0d93325ddf1b27ded8b2d.1547851897.git.crobinso@redhat.com>
In-Reply-To: <cover.1547851897.git.crobinso@redhat.com>
References: <cover.1547851897.git.crobinso@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 05/10] 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>
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.28]);
 Fri, 18 Jan 2019 23:06:04 +0000 (UTC)

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 |  5 ++++-
 src/conf/domain_conf.h |  3 +++
 src/vz/vz_driver.c     |  7 +++----
 src/vz/vz_sdk.c        | 17 +++++++----------
 4 files changed, 17 insertions(+), 15 deletions(-)

-- 
2.20.1

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

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 129e16bd0b..9b651d06b6 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -438,7 +438,10 @@ VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST,
 
 VIR_ENUM_IMPL(virDomainNetModel, VIR_DOMAIN_NET_MODEL_LAST,
               "unknown",
-              "netfront")
+              "netfront",
+              "rtl8139",
+              "virtio",
+              "e1000")
 
 VIR_ENUM_IMPL(virDomainNetBackend, VIR_DOMAIN_NET_BACKEND_TYPE_LAST,
               "default",
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index e26b885508..2e1235a993 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,
 
     VIR_DOMAIN_NET_MODEL_LAST
 } virDomainNetModelType;
diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index eab2953759..10fba0efb7 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -269,10 +269,9 @@ vzDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
     if (dev->type == VIR_DOMAIN_DEVICE_NET &&
         (dev->data.net->type == VIR_DOMAIN_NET_TYPE_NETWORK ||
          dev->data.net->type == VIR_DOMAIN_NET_TYPE_BRIDGE) &&
-        !virDomainNetGetModelString(dev->data.net) &&
-        def->os.type == VIR_DOMAIN_OSTYPE_HVM &&
-        virDomainNetSetModelString(dev->data.net, "e1000") < 0)
-        return -1;
+        dev->data.net->model == VIR_DOMAIN_NET_MODEL_UNKNOWN &&
+        def->os.type == VIR_DOMAIN_OSTYPE_HVM)
+        dev->data.net->model = VIR_DOMAIN_NET_MODEL_E1000;
 
     return 0;
 }
diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index 60681591c6..13f18cbc19 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -1105,16 +1105,13 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool isCt)
 
         switch ((int)type) {
         case PNT_RTL:
-            if (virDomainNetSetModelString(net, "rtl8139") < 0)
-                goto cleanup;
+            net->model = VIR_DOMAIN_NET_MODEL_RTL8139;
             break;
         case PNT_E1000:
-            if (virDomainNetSetModelString(net, "e1000") < 0)
-                goto cleanup;
+            net->model = VIR_DOMAIN_NET_MODEL_E1000;
             break;
         case PNT_VIRTIO:
-            if (virDomainNetSetModelString(net, "virtio") < 0)
-                goto cleanup;
+            net->model = VIR_DOMAIN_NET_MODEL_VIRTIO;
             break;
         default:
             virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -3378,15 +3375,15 @@ static int prlsdkConfigureNet(vzDriverPtr driver ATTRIBUTE_UNUSED,
         goto cleanup;
 
     if (isCt) {
-        if (virDomainNetGetModelString(net))
+        if (net->model != 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 == VIR_DOMAIN_NET_MODEL_RTL8139) {
             pret = PrlVmDevNet_SetAdapterType(sdknet, PNT_RTL);
-        } else if (virDomainNetStreqModelString(net, "e1000")) {
+        } else if (net->model == VIR_DOMAIN_NET_MODEL_E1000) {
             pret = PrlVmDevNet_SetAdapterType(sdknet, PNT_E1000);
-        } else if (virDomainNetStreqModelString(net, "virtio")) {
+        } else if (net->model == VIR_DOMAIN_NET_MODEL_VIRTIO) {
             pret = PrlVmDevNet_SetAdapterType(sdknet, PNT_VIRTIO);
         } else {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",

From patchwork Fri Jan 18 23:05:24 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Cole Robinson <crobinso@redhat.com>
X-Patchwork-Id: 156098
Delivered-To: patch@linaro.org
Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3796952jaa;
 Fri, 18 Jan 2019 15:05:43 -0800 (PST)
X-Google-Smtp-Source: ALg8bN4JBAL9uIErc3pU39Ud2Bn9KMr6aZGVs6XnXhEVd4HrQJYChQDmUSJXESaBwfWUBhUn4JWv
X-Received: by 2002:ac8:36ba:: with SMTP id
 a55mr17663181qtc.236.1547852743311; 
 Fri, 18 Jan 2019 15:05:43 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1547852743; cv=none;
 d=google.com; s=arc-20160816;
 b=v3RY8Syg/gFnTmo06O37hYc56HPF+HzgvQoOKzpByJ8uxBvH6o5HbK2P0PFKlrvYlW
 7ee6HLanlBQJfqtdZef62O4Ee2lL9CR27C0faGktrRDSZ0TUVgt0NGMgBdC4hjjyPwbr
 unVXBMDrjwoKwCskkTsPdXtH+b3YOwUa8COZzqGjU3I1zmFgxu2mT3l72kG93ao0wU/G
 K7szWnV8MyEKwlMZKMn55VA3m8aDEUxzFryO7Uq6WIzS7piNlNOAvA31suk99Qd3T5W9
 tScTWSRK0wy/h4kXCImhr8N94QGC2exdfKDhdegKxkEjJ/3/PGU+AQsI8ZtMhWIICzAV
 13FQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
 s=arc-20160816; 
 h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help
 :list-post:list-archive:list-unsubscribe:list-id:precedence:subject
 :mime-version:references:in-reply-to:message-id:date:to:from
 :delivered-to;
 bh=AvEMj60CYEMnUMFC7kac3MhgM3ZKZnJxBeLGwDsdy9I=;
 b=KtAutG2+p+L3Xtcv2OLENfZ2yPHryzv2gbiSEXTboAk49rgxf825Zpdyr4mdjLiTQJ
 38xDERcRSHcchlLkdts50rkI+etF4tGq7SQ5bdJLL2movXS5Otlxs036UkjqFPcHbWCY
 LfX75mqcW3Gu/v8R3aSYygPmiTB5PPnmNPE0mJrLtr7OAoSNaK+r8oFG9qOK47xqB8j5
 jDsxBoK1EUQ3ttoQ+nHxavWXljT6LGgEOeKJFd7N6AjmEFsrLJAipWhU8eVVpvPk1O3F
 9w75yLYwO+jpO2iVSOnfb6bx1AduAOZ6PTZ1372VvHKKllx1wgK/vuYO9k2rGCwdDkwS
 tWxQ==
ARC-Authentication-Results: i=1; mx.google.com;
 spf=pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 smtp.mailfrom=libvir-list-bounces@redhat.com; 
 dmarc=pass (p=NONE sp=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.google.com with ESMTPS id
 m10si503701qtk.397.2019.01.18.15.05.43
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Fri, 18 Jan 2019 15:05:43 -0800 (PST)
Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 client-ip=209.132.183.28; 
Authentication-Results: mx.google.com;
 spf=pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 smtp.mailfrom=libvir-list-bounces@redhat.com; 
 dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com
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 AFC6263647;
 Fri, 18 Jan 2019 23:05: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 73E34600C2;
 Fri, 18 Jan 2019 23:05: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 037153F7D0;
 Fri, 18 Jan 2019 23:05:41 +0000 (UTC)
Received: from smtp.corp.redhat.com
 (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
 by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with
 ESMTP
 id x0IN5a7X008670 for <libvir-list@listman.util.phx.redhat.com>;
 Fri, 18 Jan 2019 18:05:36 -0500
Received: by smtp.corp.redhat.com (Postfix)
 id E6558600D6; Fri, 18 Jan 2019 23:05:36 +0000 (UTC)
Delivered-To: libvirt-list@redhat.com
Received: from worklaptop.redhat.com (ovpn-125-139.rdu2.redhat.com
 [10.10.125.139])
 by smtp.corp.redhat.com (Postfix) with ESMTP id 73F46600C2;
 Fri, 18 Jan 2019 23:05:36 +0000 (UTC)
From: Cole Robinson <crobinso@redhat.com>
To: libvirt-list@redhat.com
Date: Fri, 18 Jan 2019 18:05:24 -0500
Message-Id: <757fb473a128f24efaaa19e9b5c25f08a4b77a0b.1547851897.git.crobinso@redhat.com>
In-Reply-To: <cover.1547851897.git.crobinso@redhat.com>
References: <cover.1547851897.git.crobinso@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 06/10] 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>
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.28]);
 Fri, 18 Jan 2019 23:05:42 +0000 (UTC)

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(-)

-- 
2.20.1

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

diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
index 78f8a88290..ccbd7cd2aa 100644
--- a/src/bhyve/bhyve_command.c
+++ b/src/bhyve/bhyve_command.c
@@ -56,16 +56,10 @@ bhyveBuildNetArgStr(virConnectPtr conn,
     int ret = -1;
     virDomainNetType actualType = virDomainNetGetActualType(net);
 
-    if (!virDomainNetGetModelString(net)) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("NIC model must be specified"));
-        return -1;
-    }
-
-    if (virDomainNetStreqModelString(net, "virtio")) {
+    if (net->model == VIR_DOMAIN_NET_MODEL_VIRTIO) {
         if (VIR_STRDUP(nic_model, "virtio-net") < 0)
             return -1;
-    } else if (virDomainNetStreqModelString(net, "e1000")) {
+    } else if (net->model == VIR_DOMAIN_NET_MODEL_E1000) {
         if ((bhyveDriverGetCaps(conn) & BHYVE_CAP_NET_E1000) != 0) {
             if (VIR_STRDUP(nic_model, "e1000") < 0)
                 return -1;
@@ -76,9 +70,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;
     }
 
diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c
index cf0b2db30a..ba1e3f2cb7 100644
--- a/src/bhyve/bhyve_parse_command.c
+++ b/src/bhyve/bhyve_parse_command.c
@@ -494,7 +494,7 @@ bhyveParsePCINet(virDomainDefPtr def,
                  unsigned pcislot,
                  unsigned pcibus,
                  unsigned function,
-                 const char *model,
+                 int model,
                  const char *config)
 {
     /* -s slot,virtio-net,tapN[,mac=xx:xx:xx:xx:xx:xx] */
@@ -513,9 +513,7 @@ bhyveParsePCINet(virDomainDefPtr def,
     if (VIR_STRDUP(net->data.bridge.brname, "virbr0") < 0)
         goto error;
 
-    if (virDomainNetSetModelString(net, model) < 0)
-        goto error;
-
+    net->model = mode;
     net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
     net->info.addr.pci.slot = pcislot;
     net->info.addr.pci.bus = pcibus;
@@ -623,10 +621,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);
 
     VIR_FREE(emulation);
     VIR_FREE(slotdef);

From patchwork Fri Jan 18 23:05:25 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Cole Robinson <crobinso@redhat.com>
X-Patchwork-Id: 156100
Delivered-To: patch@linaro.org
Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3797260jaa;
 Fri, 18 Jan 2019 15:06:00 -0800 (PST)
X-Google-Smtp-Source: ALg8bN6lwy8AxKOPLb+jpx+k+q82UF1557Tjxe7wJGRbi+ztDuSTD5ZR992KTyx5ygc8fR0CVlMd
X-Received: by 2002:a05:620a:9:: with SMTP id
 j9mr16954672qki.144.1547852760628; 
 Fri, 18 Jan 2019 15:06:00 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1547852760; cv=none;
 d=google.com; s=arc-20160816;
 b=dt4VqBLA1mnjg8CD6E2lcwvLNViWWD3dAJCOd4zx311Sgk50ol+7vZS7TJNH020Bbx
 AnRxJ6jYBWaAOb+blk3UZjGWg/E/vmlKf0kHe0RumJkZBCWoRI14eryOx39lm6zpXe65
 W6HP4HCbJoExupdKD3JROC9PoeYwvKggZ/k+yXBz7YelkrJnhFlglJW6h0RWQmZfsKW4
 G/d14LrISTrwNHIUSIhCGN4S0QMwur+z3gL9VC/Fz2i1Ppj4yaDOIMKqUd/dTYpqAgwo
 cGgxozdwClyU5vk7gAqAiUDTua70dOLbH+dyjCeGnG+mocgjzFzGaNUwlAWTdF8lTwS8
 hUfg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
 s=arc-20160816; 
 h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help
 :list-post:list-archive:list-unsubscribe:list-id:precedence:subject
 :mime-version:references:in-reply-to:message-id:date:to:from
 :delivered-to;
 bh=zgj8u1879UxJxs9z2lgl4gECNzwwbhvDPkMSXIPiKxg=;
 b=h6hfInrpYP3cbOJs/PD1ZS7ZYFzC/1cVvphsteam8qO+xASJspslLtN3bJZNo9LMpo
 lr/JZNVePL6E6bOdJcqv/qIHO1HW6iOmynk0RziL4XIOxfRBv1XaVerwY4S4/yOwMcsJ
 JEU72zwcD1XO6Gb4PKIAqsni6H9QNvxEknsEpTGt45Wv3xY0yMkIc/gkVMQK/huJcBVr
 fcEIs2+vuPPhnrHauFqfc7ZiGTHAee+22PtTppexAaiGAGnuZyRVyiHgDo2ldN4edrPE
 s/V+PglOX8lDHhkW9HW3tL+dy9m4DrZ6uOSYRtzv3lKticgCVxt6CIqdeUUcNBePwiZW
 Kwnw==
ARC-Authentication-Results: i=1; mx.google.com;
 spf=pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 smtp.mailfrom=libvir-list-bounces@redhat.com; 
 dmarc=pass (p=NONE sp=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.google.com with ESMTPS id
 c69si4410907qkg.91.2019.01.18.15.06.00
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Fri, 18 Jan 2019 15:06:00 -0800 (PST)
Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 client-ip=209.132.183.28; 
Authentication-Results: mx.google.com;
 spf=pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 smtp.mailfrom=libvir-list-bounces@redhat.com; 
 dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com
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 3614537EE0;
 Fri, 18 Jan 2019 23:05:59 +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 E3D21101E597;
 Fri, 18 Jan 2019 23:05:58 +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 97C601803398;
 Fri, 18 Jan 2019 23:05:58 +0000 (UTC)
Received: from smtp.corp.redhat.com
 (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
 by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with
 ESMTP
 id x0IN5bE2008680 for <libvir-list@listman.util.phx.redhat.com>;
 Fri, 18 Jan 2019 18:05:37 -0500
Received: by smtp.corp.redhat.com (Postfix)
 id 8EF7C600C2; Fri, 18 Jan 2019 23:05:37 +0000 (UTC)
Delivered-To: libvirt-list@redhat.com
Received: from worklaptop.redhat.com (ovpn-125-139.rdu2.redhat.com
 [10.10.125.139])
 by smtp.corp.redhat.com (Postfix) with ESMTP id 1E10E600CC;
 Fri, 18 Jan 2019 23:05:37 +0000 (UTC)
From: Cole Robinson <crobinso@redhat.com>
To: libvirt-list@redhat.com
Date: Fri, 18 Jan 2019 18:05:25 -0500
Message-Id: <aaa84ebe73378acee507118d4d0747436f867b34.1547851897.git.crobinso@redhat.com>
In-Reply-To: <cover.1547851897.git.crobinso@redhat.com>
References: <cover.1547851897.git.crobinso@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 07/10] 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>
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.29]);
 Fri, 18 Jan 2019 23:05:59 +0000 (UTC)

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         | 24 +++++++++++-------------
 src/conf/domain_conf.h         |  9 +++++++--
 src/libvirt_private.syms       |  1 -
 src/qemu/qemu_command.c        | 26 ++++++++++++--------------
 src/qemu/qemu_domain.c         | 29 +++++++++++++----------------
 src/qemu/qemu_domain_address.c | 12 ++++++------
 6 files changed, 49 insertions(+), 52 deletions(-)

-- 
2.20.1

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

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 9b651d06b6..4e0e7eabe6 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -441,7 +441,14 @@ VIR_ENUM_IMPL(virDomainNetModel, VIR_DOMAIN_NET_MODEL_LAST,
               "netfront",
               "rtl8139",
               "virtio",
-              "e1000")
+              "e1000",
+              "e1000e",
+              "virtio-transitional",
+              "virtio-non-transitional",
+              "usb-net",
+              "spapr-vlan",
+              "lan9118",
+              "scm91c111")
 
 VIR_ENUM_IMPL(virDomainNetBackend, VIR_DOMAIN_NET_BACKEND_TYPE_LAST,
               "default",
@@ -29873,15 +29880,6 @@ virDomainNetSetModelString(virDomainNetDefPtr iface,
     return 0;
 }
 
-int
-virDomainNetStreqModelString(const virDomainNetDef *iface,
-                             const char *model)
-{
-    if (iface->model)
-        return iface->model == virDomainNetModelTypeFromString(model);
-    return STREQ_NULLABLE(iface->modelstr, model);
-}
-
 int
 virDomainNetStrcaseeqModelString(const virDomainNetDef *iface,
                                  const char *model)
@@ -29895,9 +29893,9 @@ virDomainNetStrcaseeqModelString(const virDomainNetDef *iface,
 bool
 virDomainNetHasVirtioModel(const virDomainNetDef *iface)
 {
-    return (virDomainNetStreqModelString(iface, "virtio") ||
-            virDomainNetStreqModelString(iface, "virtio-transitional") ||
-            virDomainNetStreqModelString(iface, "virtio-non-transitional"));
+    return (iface->model == VIR_DOMAIN_NET_MODEL_VIRTIO ||
+            iface->model == VIR_DOMAIN_NET_MODEL_VIRTIO_TRANSITIONAL ||
+            iface->model == VIR_DOMAIN_NET_MODEL_VIRTIO_NON_TRANSITIONAL);
 }
 
 
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 2e1235a993..4c42bd18cf 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,
 
     VIR_DOMAIN_NET_MODEL_LAST
 } virDomainNetModelType;
@@ -3286,8 +3293,6 @@ bool virDomainNetGetActualTrustGuestRxFilters(virDomainNetDefPtr iface);
 const char *virDomainNetGetModelString(const virDomainNetDef *iface);
 int virDomainNetSetModelString(virDomainNetDefPtr iface,
                                const char *model);
-int virDomainNetStreqModelString(const virDomainNetDef *iface,
-                                 const char *model);
 int virDomainNetStrcaseeqModelString(const virDomainNetDef *iface,
                                      const char *model);
 bool virDomainNetHasVirtioModel(const virDomainNetDef *iface);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index d802535fa0..3ed0b3b11c 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -485,7 +485,6 @@ virDomainNetResolveActualType;
 virDomainNetSetDeviceImpl;
 virDomainNetSetModelString;
 virDomainNetStrcaseeqModelString;
-virDomainNetStreqModelString;
 virDomainNetTypeFromString;
 virDomainNetTypeSharesHostView;
 virDomainNetTypeToString;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 83222dd0be..48e8b7a9bf 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -449,7 +449,6 @@ qemuBuildVirtioTransitional(virBufferPtr buf,
                             virQEMUCapsPtr qemuCaps,
                             virDomainDeviceAddressType type,
                             int model,
-                            const char *modelstr,
                             virDomainDeviceType devtype)
 {
     int tmodel_cap, ntmodel_cap;
@@ -466,8 +465,8 @@ qemuBuildVirtioTransitional(virBufferPtr buf,
             ntmodel_cap = QEMU_CAPS_DEVICE_VIRTIO_BLK_NON_TRANSITIONAL;
             break;
         case VIR_DOMAIN_DEVICE_NET:
-            has_tmodel = STREQ(modelstr, "virtio-transitional");
-            has_ntmodel = STREQ(modelstr, "virtio-non-transitional");
+            has_tmodel = model == VIR_DOMAIN_NET_MODEL_VIRTIO_TRANSITIONAL;
+            has_ntmodel = model == VIR_DOMAIN_NET_MODEL_VIRTIO_NON_TRANSITIONAL;
             tmodel_cap = QEMU_CAPS_DEVICE_VIRTIO_NET_TRANSITIONAL;
             ntmodel_cap = QEMU_CAPS_DEVICE_VIRTIO_NET_NON_TRANSITIONAL;
             break;
@@ -2186,7 +2185,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def,
     case VIR_DOMAIN_DISK_BUS_VIRTIO:
         if (qemuBuildVirtioTransitional(&opt, "virtio-blk", qemuCaps,
                                         disk->info.type,
-                                        disk->model, NULL,
+                                        disk->model,
                                         VIR_DOMAIN_DEVICE_DISK) < 0)
             goto error;
 
@@ -2778,7 +2777,7 @@ qemuBuildFSDevStr(const virDomainDef *def,
 
     if (qemuBuildVirtioTransitional(&opt, "virtio-9p", qemuCaps,
                                     fs->info.type,
-                                    fs->model, NULL,
+                                    fs->model,
                                     VIR_DOMAIN_DEVICE_FS) < 0)
         goto error;
 
@@ -2989,7 +2988,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef,
         case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_NON_TRANSITIONAL:
             if (qemuBuildVirtioTransitional(&buf, "virtio-scsi", qemuCaps,
                                             def->info.type,
-                                            def->model, NULL,
+                                            def->model,
                                             VIR_DOMAIN_DEVICE_CONTROLLER) < 0) {
                 goto error;
             }
@@ -3034,7 +3033,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef,
     case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL:
         if (qemuBuildVirtioTransitional(&buf, "virtio-serial", qemuCaps,
                                         def->info.type,
-                                        def->model, NULL,
+                                        def->model,
                                         VIR_DOMAIN_DEVICE_CONTROLLER) < 0)
             goto error;
 
@@ -3806,8 +3805,7 @@ qemuBuildNicDevStr(virDomainDefPtr def,
 
     if (virDomainNetHasVirtioModel(net)) {
         if (qemuBuildVirtioTransitional(&buf, "virtio-net", qemuCaps,
-                                        net->info.type, 0,
-                                        virDomainNetGetModelString(net),
+                                        net->info.type, net->model,
                                         VIR_DOMAIN_DEVICE_NET) < 0)
             goto error;
 
@@ -4204,7 +4202,7 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd,
 
     if (qemuBuildVirtioTransitional(&buf, "virtio-balloon", qemuCaps,
                                     def->memballoon->info.type,
-                                    def->memballoon->model, NULL,
+                                    def->memballoon->model,
                                     VIR_DOMAIN_DEVICE_MEMBALLOON) < 0) {
         goto error;
     }
@@ -4317,7 +4315,7 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def,
     case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH:
         if (qemuBuildVirtioTransitional(&buf, "virtio-input-host", qemuCaps,
                                         dev->info.type,
-                                        dev->model, NULL,
+                                        dev->model,
                                         VIR_DOMAIN_DEVICE_INPUT) < 0)
             goto error;
         break;
@@ -5085,7 +5083,7 @@ qemuBuildSCSIVHostHostdevDevStr(const virDomainDef *def,
 
     if (qemuBuildVirtioTransitional(&buf, "vhost-scsi", qemuCaps,
                                     dev->info->type,
-                                    hostsrc->model, NULL,
+                                    hostsrc->model,
                                     VIR_DOMAIN_DEVICE_HOSTDEV) < 0)
         goto cleanup;
 
@@ -6044,7 +6042,7 @@ qemuBuildRNGDevStr(const virDomainDef *def,
 
     if (qemuBuildVirtioTransitional(&buf, "virtio-rng", qemuCaps,
                                     dev->info.type,
-                                    dev->model, NULL,
+                                    dev->model,
                                     VIR_DOMAIN_DEVICE_RNG) < 0)
         goto error;
 
@@ -10510,7 +10508,7 @@ qemuBuildVsockDevStr(virDomainDefPtr def,
 
     if (qemuBuildVirtioTransitional(&buf, "vhost-vsock", qemuCaps,
                                     vsock->info.type,
-                                    vsock->model, NULL,
+                                    vsock->model,
                                     VIR_DOMAIN_DEVICE_VSOCK) < 0)
         goto cleanup;
 
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 38e86b8ad1..44d43a85c9 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -6067,49 +6067,49 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev,
  * is NULL this function may return NULL if the default model depends on the
  * 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;
 
     if (def->os.arch == VIR_ARCH_ARMV6L ||
         def->os.arch == VIR_ARCH_ARMV7L ||
         def->os.arch == VIR_ARCH_AARCH64) {
         if (STREQ(def->os.machine, "versatilepb"))
-            return "smc91c111";
+            return VIR_DOMAIN_NET_MODEL_SMC91C111;
 
         if (qemuDomainIsARMVirt(def))
-            return "virtio";
+            return VIR_DOMAIN_NET_MODEL_VIRTIO;
 
         /* Incomplete. vexpress (and a few others) use this, but not all
          * arm boards */
-        return "lan9118";
+        return VIR_DOMAIN_NET_MODEL_LAN9118;
     }
 
     /* virtio is a sensible default for RISC-V virt guests */
     if (qemuDomainIsRISCVVirt(def))
-        return "virtio";
+        return VIR_DOMAIN_NET_MODEL_VIRTIO;
 
     /* In all other cases the model depends on the capabilities. If they were
      * not provided don't report any default. */
     if (!qemuCaps)
-        return NULL;
+        return VIR_DOMAIN_NET_MODEL_UNKNOWN;
 
     /* 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;
 
     /* 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;
 }
 
 
@@ -6565,11 +6565,8 @@ qemuDomainDeviceNetDefPostParse(virDomainNetDefPtr net,
                                 virQEMUCapsPtr qemuCaps)
 {
     if (net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV &&
-        !virDomainNetGetModelString(net)) {
-        if (virDomainNetSetModelString(net,
-                       qemuDomainDefaultNetModel(def, qemuCaps)) < 0)
-            return -1;
-    }
+        !virDomainNetGetModelString(net))
+        net->model = qemuDomainDefaultNetModel(def, qemuCaps);
 
     return 0;
 }
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index c0843bdad6..0cb557b2ab 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -230,7 +230,7 @@ qemuDomainAssignSpaprVIOAddresses(virDomainDefPtr def)
     for (i = 0; i < def->nnets; i++) {
         virDomainNetDefPtr net = def->nets[i];
 
-        if (virDomainNetStreqModelString(net, "spapr-vlan"))
+        if (net->model == VIR_DOMAIN_NET_MODEL_SPAPR_VLAN)
             net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO;
 
         if (qemuDomainAssignSpaprVIOAddress(def, &net->info, VIO_ADDR_NET) < 0)
@@ -694,18 +694,18 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev,
          * addresses for other hostdev devices.
          */
         if (net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV ||
-            virDomainNetStreqModelString(net, "usb-net")) {
+            net->model == VIR_DOMAIN_NET_MODEL_USB_NET) {
             return 0;
         }
 
-        if (virDomainNetStreqModelString(net, "virtio") ||
-            virDomainNetStreqModelString(net, "virtio-non-transitional"))
+        if (net->model == VIR_DOMAIN_NET_MODEL_VIRTIO ||
+            net->model == VIR_DOMAIN_NET_MODEL_VIRTIO_NON_TRANSITIONAL)
             return virtioFlags;
 
-        if (virDomainNetStreqModelString(net, "virtio-transitional"))
+        if (net->model == VIR_DOMAIN_NET_MODEL_VIRTIO_TRANSITIONAL)
             return pciFlags;
 
-        if (virDomainNetStreqModelString(net, "e1000e"))
+        if (net->model == VIR_DOMAIN_NET_MODEL_E1000E)
             return pcieFlags;
 
         return pciFlags;

From patchwork Fri Jan 18 23:05:26 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Cole Robinson <crobinso@redhat.com>
X-Patchwork-Id: 156105
Delivered-To: patch@linaro.org
Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3797432jaa;
 Fri, 18 Jan 2019 15:06:10 -0800 (PST)
X-Google-Smtp-Source: ALg8bN6M6amY22fjsKaQMpFk5xsOeaXy3IqGTE/K5iH8JnCu73XNaDXEeuVr25c+xCcz/rl2KBl5
X-Received: by 2002:a37:7183:: with SMTP id
 m125mr16276422qkc.195.1547852770503; 
 Fri, 18 Jan 2019 15:06:10 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1547852770; cv=none;
 d=google.com; s=arc-20160816;
 b=MwmX1Z0ooK1RO4dmIsOxa6iKd5X5HH6/zt/dXX1i3arTQtvvDrqmuuXHJNdAi1OdT5
 ES6jmiV85+ISKUCURn91qKf8+Fi/awT67ufFroTh0AyfBWIWq5t9zsNZQL1WnJP06Bg3
 Y9LmF09z8uTisYvJah43mp1w2ArMNqbRbX/74QGSvRKiJgnKnq/L68yzecjKlVH2hXHZ
 Mutd9vD15tcu94Zz3bGeVQchWYnmdz3ZFhbSPIXIdx/Q0ZAUvZQcrlwvMO5T5kJ42WkB
 DfQiOa6bYQccAF4JC26tt2zEhB02ZL3bc2CKSGggx9XUmm6xBqjiVszIPXlLcphElePS
 93DQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
 s=arc-20160816; 
 h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help
 :list-post:list-archive:list-unsubscribe:list-id:precedence:subject
 :mime-version:references:in-reply-to:message-id:date:to:from
 :delivered-to;
 bh=xnj6b9h1VhI8Q7DYX5jkShwpfki+UydTYk9wWOOs3KU=;
 b=dnbTb7c3IG7uQlD5uLxMJoJd2exz6aZqkQZaYDPyiiYj5D+bZifamXJWT7zWFsX970
 ENh2GVmWBObWoRP/LNlU5HP0Sblq+ZX12SyuD0V0biIBUyLMMf/EKGOlJTQN/VNXrAl+
 oBO4Mj74L03SNpcJjebzgxd1Ao5f4OTmDKEvK3A04rLY9BZskKCPHAKzvPcNHBcEZOkB
 /bl7ee85AD57xJuMi9U1KtheTRE+STJHLYmGjgur7bCXCfM01apT2ni+GN8BXxaokp+/
 V7LbvLllJrMnJFakisosnl9DqUHZJ+l9zNKGSCUTP6fcw7GLQH6Vid9AyPuf4B+NH0Nm
 9BXA==
ARC-Authentication-Results: i=1; mx.google.com;
 spf=pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 smtp.mailfrom=libvir-list-bounces@redhat.com; 
 dmarc=pass (p=NONE sp=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.google.com with ESMTPS id
 a15si2492738qvm.111.2019.01.18.15.06.10
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Fri, 18 Jan 2019 15:06:10 -0800 (PST)
Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 client-ip=209.132.183.28; 
Authentication-Results: mx.google.com;
 spf=pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 smtp.mailfrom=libvir-list-bounces@redhat.com; 
 dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com
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 4ED513697F;
 Fri, 18 Jan 2019 23:06:08 +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 15E5E5D991;
 Fri, 18 Jan 2019 23:06:08 +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 B5E493F608;
 Fri, 18 Jan 2019 23:06:07 +0000 (UTC)
Received: from smtp.corp.redhat.com
 (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
 by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with
 ESMTP
 id x0IN5cUv008687 for <libvir-list@listman.util.phx.redhat.com>;
 Fri, 18 Jan 2019 18:05:38 -0500
Received: by smtp.corp.redhat.com (Postfix)
 id 3203A600D7; Fri, 18 Jan 2019 23:05:38 +0000 (UTC)
Delivered-To: libvirt-list@redhat.com
Received: from worklaptop.redhat.com (ovpn-125-139.rdu2.redhat.com
 [10.10.125.139])
 by smtp.corp.redhat.com (Postfix) with ESMTP id BA512600C2;
 Fri, 18 Jan 2019 23:05:37 +0000 (UTC)
From: Cole Robinson <crobinso@redhat.com>
To: libvirt-list@redhat.com
Date: Fri, 18 Jan 2019 18:05:26 -0500
Message-Id: <e312bf51aecaf73c5d45427bca7d416bd6a55408.1547851898.git.crobinso@redhat.com>
In-Reply-To: <cover.1547851897.git.crobinso@redhat.com>
References: <cover.1547851897.git.crobinso@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 08/10] 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>
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.30]);
 Fri, 18 Jan 2019 23:06:09 +0000 (UTC)

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

Previously vmx would accept case insensitive network model
names via the domain XML, but now it will require names to
exactly match the enum case. For reading from vmx files this
won't matter as the parser does case-insensitive comparison.
But if a user attempts to define/create a VM via custom XML
with the wrong case, it will be rejected. I don't know if
that's actually a usecase here so maybe it doesn't matter.

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

-- 
2.20.1

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

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 4e0e7eabe6..b040b7b983 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -448,7 +448,11 @@ VIR_ENUM_IMPL(virDomainNetModel, VIR_DOMAIN_NET_MODEL_LAST,
               "usb-net",
               "spapr-vlan",
               "lan9118",
-              "scm91c111")
+              "scm91c111",
+              "vlance",
+              "vmxnet",
+              "vmxnet2",
+              "vmxnet3")
 
 VIR_ENUM_IMPL(virDomainNetBackend, VIR_DOMAIN_NET_BACKEND_TYPE_LAST,
               "default",
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 4c42bd18cf..e144d2c87c 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,
 
     VIR_DOMAIN_NET_MODEL_LAST
 } virDomainNetModelType;
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 7f8357211c..ae0373dad2 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -2545,6 +2545,8 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def)
     char networkName_name[48] = "";
     char *networkName = NULL;
 
+    int netmodel = VIR_DOMAIN_NET_MODEL_UNKNOWN;
+
     if (def == NULL || *def != NULL) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument"));
         return -1;
@@ -2629,11 +2631,17 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def)
     }
 
     if (virtualDev != NULL) {
-        if (STRCASENEQ(virtualDev, "vlance") &&
-            STRCASENEQ(virtualDev, "vmxnet") &&
-            STRCASENEQ(virtualDev, "vmxnet3") &&
-            STRCASENEQ(virtualDev, "e1000") &&
-            STRCASENEQ(virtualDev, "e1000e")) {
+        if (STRCASEEQ(virtualDev, "vlance")) {
+            netmodel = VIR_DOMAIN_NET_MODEL_VLANCE;
+        } else if (STRCASEEQ(virtualDev, "vmxnet")) {
+            netmodel = VIR_DOMAIN_NET_MODEL_VMXNET;
+        } else if (STRCASEEQ(virtualDev, "vmxnet3")) {
+            netmodel = VIR_DOMAIN_NET_MODEL_VMXNET3;
+        } else if (STRCASEEQ(virtualDev, "e1000")) {
+            netmodel = VIR_DOMAIN_NET_MODEL_E1000;
+        } else if (STRCASEEQ(virtualDev, "e1000e")) {
+            netmodel = 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'"),
@@ -2641,12 +2649,8 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def)
             goto cleanup;
         }
 
-        if (STRCASEEQ(virtualDev, "vmxnet") && features == 15) {
-            VIR_FREE(virtualDev);
-
-            if (VIR_STRDUP(virtualDev, "vmxnet2") < 0)
-                goto cleanup;
-        }
+        if (netmodel == VIR_DOMAIN_NET_MODEL_VMXNET && features == 15)
+            netmodel = VIR_DOMAIN_NET_MODEL_VMXNET2;
     }
 
     /* vmx:networkName -> def:data.bridge.brname */
@@ -2696,10 +2700,7 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def)
         goto cleanup;
     }
 
-    if (virDomainNetSetModelString((*def), virtualDev) < 0)
-        goto cleanup;
-    VIR_FREE(virtualDev);
-
+    (*def)->model = netmodel;
     result = 0;
 
  cleanup:
@@ -3737,29 +3738,30 @@ virVMXFormatEthernet(virDomainNetDefPtr def, int controller,
     virBufferAsprintf(buffer, "ethernet%d.present = \"true\"\n", controller);
 
     /* 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 != VIR_DOMAIN_NET_MODEL_VLANCE &&
+            def->model != VIR_DOMAIN_NET_MODEL_VMXNET &&
+            def->model != VIR_DOMAIN_NET_MODEL_VMXNET2 &&
+            def->model != VIR_DOMAIN_NET_MODEL_VMXNET3 &&
+            def->model != VIR_DOMAIN_NET_MODEL_E1000 &&
+            def->model != VIR_DOMAIN_NET_MODEL_E1000E) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
                            _("Expecting domain XML entry 'devices/interface/model' "
                              "to be 'vlance' or 'vmxnet' or 'vmxnet2' or 'vmxnet3' "
                              "or 'e1000' or 'e1000e' but found '%s'"),
-                            virDomainNetGetModelString(def));
+                            virDomainNetModelTypeToString(def->model));
             return -1;
         }
 
-        if (virDomainNetStrcaseeqModelString(def, "vmxnet2")) {
+        if (def->model == VIR_DOMAIN_NET_MODEL_VMXNET2) {
             virBufferAsprintf(buffer, "ethernet%d.virtualDev = \"vmxnet\"\n",
                               controller);
             virBufferAsprintf(buffer, "ethernet%d.features = \"15\"\n",
                               controller);
         } else {
             virBufferAsprintf(buffer, "ethernet%d.virtualDev = \"%s\"\n",
-                              controller, virDomainNetGetModelString(def));
+                              controller,
+                              virDomainNetModelTypeToString(def->model));
         }
     }
 

From patchwork Fri Jan 18 23:05:27 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Cole Robinson <crobinso@redhat.com>
X-Patchwork-Id: 156106
Delivered-To: patch@linaro.org
Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3797495jaa;
 Fri, 18 Jan 2019 15:06:14 -0800 (PST)
X-Google-Smtp-Source: ALg8bN62QY/F5VgG1S67qZvvpu4QD9+dcSRfsWGobze5tKESn0ezHiXu7mz4PZWWG/CnnBpoOzgw
X-Received: by 2002:a37:5002:: with SMTP id e2mr17252127qkb.169.1547852774191; 
 Fri, 18 Jan 2019 15:06:14 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1547852774; cv=none;
 d=google.com; s=arc-20160816;
 b=dDlTm0HkmRXWLIjb6pW6n2AEqcVI8pfucpSDogrVWlnvXQfOm69dhBTR8Ln21OZEnq
 dNgMbGDcbEdd5ceZyOoVCd4A/YNy/k2pS5IundDXAfH9KURRT2W9+s4qeS+whNj8eds8
 qTZVjdWg6lIx6jew7yjoA52K2Y4Fh2d+JqYj4GYFbAPAQF2hC/k0Ayesh9EcwhZnLmTl
 3bBM1py0X15e2NptnT6s2Hc8I+hkrR6fcUdHBWFttodBm6e6djjv2v+mnZ94IXS/hljJ
 eryE9fWtTUD6uYwAwE+quHe1Ksjgj0AT9PPscoelNoSh1p+KMLCWGBW/thqKiFWa1hMh
 QCBg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
 s=arc-20160816; 
 h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help
 :list-post:list-archive:list-unsubscribe:list-id:precedence:subject
 :mime-version:references:in-reply-to:message-id:date:to:from
 :delivered-to;
 bh=NZhmDVVGRyZElEeeObajgWETh3LxsGoMqVek1p+ii5E=;
 b=bFnjFMm2STwH6G9Rx5JPGqGf14fsvlKRuYR1HoSGj4AO82BrXMG/qKgg+mGtQtwOTn
 YGXmsMfZLCrk00IBA0rT9Qfzu7fL9I2BiB5Fdw1D9YzX6wQubadNd35J2+fbEQe84dCT
 Gx9BcwJZD0uOexzO7tF3xSVwRjD1UkQCWKjXbceHz08IoivPTYG7FMmkQXXhP5R9BHof
 tNUOYRv9WAKq0mZoUFQvCbk+pi0AA+8PtPwTdHVLbI6GAdShVV0cYubNg71pGhChMiXW
 GDCxj21RgHwsseJ4TX3pu861cUI37svQIn3UjBGDgpb7OKgnxkfA/b1vE2vzpGbPxOv7
 Q/nQ==
ARC-Authentication-Results: i=1; mx.google.com;
 spf=pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 smtp.mailfrom=libvir-list-bounces@redhat.com; 
 dmarc=pass (p=NONE sp=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.google.com with ESMTPS id
 u23si4415546qtq.317.2019.01.18.15.06.13
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Fri, 18 Jan 2019 15:06:14 -0800 (PST)
Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 client-ip=209.132.183.28; 
Authentication-Results: mx.google.com;
 spf=pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 smtp.mailfrom=libvir-list-bounces@redhat.com; 
 dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com
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 A5CAA18B320;
 Fri, 18 Jan 2019 23:06:12 +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 5FB4561D21;
 Fri, 18 Jan 2019 23:06:12 +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 15B46180339B;
 Fri, 18 Jan 2019 23:06:12 +0000 (UTC)
Received: from smtp.corp.redhat.com
 (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
 by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with
 ESMTP
 id x0IN5c6H008692 for <libvir-list@listman.util.phx.redhat.com>;
 Fri, 18 Jan 2019 18:05:38 -0500
Received: by smtp.corp.redhat.com (Postfix)
 id CE8FB600D6; Fri, 18 Jan 2019 23:05:38 +0000 (UTC)
Delivered-To: libvirt-list@redhat.com
Received: from worklaptop.redhat.com (ovpn-125-139.rdu2.redhat.com
 [10.10.125.139])
 by smtp.corp.redhat.com (Postfix) with ESMTP id 6189F600C2;
 Fri, 18 Jan 2019 23:05:38 +0000 (UTC)
From: Cole Robinson <crobinso@redhat.com>
To: libvirt-list@redhat.com
Date: Fri, 18 Jan 2019 18:05:27 -0500
Message-Id: <cc75189611a9dfcace8de23fdc044d28e7766d51.1547851898.git.crobinso@redhat.com>
In-Reply-To: <cover.1547851897.git.crobinso@redhat.com>
References: <cover.1547851897.git.crobinso@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 09/10] 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>
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.29]);
 Fri, 18 Jan 2019 23:06:13 +0000 (UTC)

Convert the vbox driver to net model enum, which requires adding
enum values for Am79C970A, Am79C973, 82540EM, 82545EM, 82543GC

Similar to the vmx driver, case insensitive handling of the model
passed in via the XML is lost. I don't know if we care

Remove the now unused virDomainNetStrcaseeqModelString

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

-- 
2.20.1

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

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b040b7b983..e951e8153b 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -452,7 +452,12 @@ VIR_ENUM_IMPL(virDomainNetModel, VIR_DOMAIN_NET_MODEL_LAST,
               "vlance",
               "vmxnet",
               "vmxnet2",
-              "vmxnet3")
+              "vmxnet3",
+              "Am79C970A",
+              "Am79C973",
+              "82540EM",
+              "82545EM",
+              "82543GC")
 
 VIR_ENUM_IMPL(virDomainNetBackend, VIR_DOMAIN_NET_BACKEND_TYPE_LAST,
               "default",
@@ -29884,16 +29889,6 @@ virDomainNetSetModelString(virDomainNetDefPtr iface,
     return 0;
 }
 
-int
-virDomainNetStrcaseeqModelString(const virDomainNetDef *iface,
-                                 const char *model)
-{
-    if (iface->model)
-        return STRCASEEQ(virDomainNetModelTypeToString(iface->model),
-                         model);
-    return iface->modelstr && STRCASEEQ(iface->modelstr, model);
-}
-
 bool
 virDomainNetHasVirtioModel(const virDomainNetDef *iface)
 {
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index e144d2c87c..b4e70480ac 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,
 
     VIR_DOMAIN_NET_MODEL_LAST
 } virDomainNetModelType;
@@ -3297,8 +3302,6 @@ bool virDomainNetGetActualTrustGuestRxFilters(virDomainNetDefPtr iface);
 const char *virDomainNetGetModelString(const virDomainNetDef *iface);
 int virDomainNetSetModelString(virDomainNetDefPtr iface,
                                const char *model);
-int virDomainNetStrcaseeqModelString(const virDomainNetDef *iface,
-                                     const char *model);
 bool virDomainNetHasVirtioModel(const virDomainNetDef *iface);
 int virDomainNetAppendIPAddress(virDomainNetDefPtr def,
                                 const char *address,
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 3ed0b3b11c..e4585e4884 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -484,7 +484,6 @@ virDomainNetRemoveHostdev;
 virDomainNetResolveActualType;
 virDomainNetSetDeviceImpl;
 virDomainNetSetModelString;
-virDomainNetStrcaseeqModelString;
 virDomainNetTypeFromString;
 virDomainNetTypeSharesHostView;
 virDomainNetTypeToString;
diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index fa8d899fec..0474c58730 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] = '\0';
 
         VIR_DEBUG("NIC(%zu): Type:   %d", i, def->nets[i]->type);
-        VIR_DEBUG("NIC(%zu): Model:  %s", i, virDomainNetGetModelString(def->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 == VIR_DOMAIN_NET_TYPE_NETWORK) {
@@ -1338,19 +1338,19 @@ vboxAttachNetwork(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine)
 
         gVBoxAPI.UINetworkAdapter.SetEnabled(adapter, 1);
 
-        if (virDomainNetGetModelString(def->nets[i])) {
-            if (virDomainNetStrcaseeqModelString(def->nets[i], "Am79C970A")) {
+        if (def->nets[i]->model) {
+            if (def->nets[i]->model == VIR_DOMAIN_NET_MODEL_AM79C970A) {
                 adapterType = NetworkAdapterType_Am79C970A;
-            } else if (virDomainNetStrcaseeqModelString(def->nets[i], "Am79C973")) {
+            } else if (def->nets[i]->model == VIR_DOMAIN_NET_MODEL_AM79C973) {
                 adapterType = NetworkAdapterType_Am79C973;
-            } else if (virDomainNetStrcaseeqModelString(def->nets[i], "82540EM")) {
+            } else if (def->nets[i]->model == VIR_DOMAIN_NET_MODEL_82540EM) {
                 adapterType = NetworkAdapterType_I82540EM;
-            } else if (virDomainNetStrcaseeqModelString(def->nets[i], "82545EM")) {
+            } else if (def->nets[i]->model == VIR_DOMAIN_NET_MODEL_82545EM) {
                 adapterType = NetworkAdapterType_I82545EM;
-            } else if (virDomainNetStrcaseeqModelString(def->nets[i], "82543GC")) {
+            } else if (def->nets[i]->model == VIR_DOMAIN_NET_MODEL_82543GC) {
                 adapterType = NetworkAdapterType_I82543GC;
             } else if (gVBoxAPI.APIVersion >= 3000051 &&
-                       virDomainNetStrcaseeqModelString(def->nets[i], "virtio")) {
+                       def->nets[i]->model == VIR_DOMAIN_NET_MODEL_VIRTIO) {
                 /* Only vbox 3.1 and later support NetworkAdapterType_Virto */
                 adapterType = NetworkAdapterType_Virtio;
             }
@@ -3687,7 +3687,6 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter *adapter)
 {
     PRUint32 attachmentType = NetworkAttachmentType_Null;
     PRUint32 adapterType = NetworkAdapterType_Null;
-    const char *model = NULL;
     PRUnichar *utf16 = NULL;
     char *utf8 = NULL;
     virDomainNetDefPtr net = NULL;
@@ -3742,28 +3741,26 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter *adapter)
     gVBoxAPI.UINetworkAdapter.GetAdapterType(adapter, &adapterType);
     switch (adapterType) {
     case NetworkAdapterType_Am79C970A:
-        model = "Am79C970A";
+        net->model = VIR_DOMAIN_NET_MODEL_AM79C970A;
         break;
     case NetworkAdapterType_Am79C973:
-        model = "Am79C973";
+        net->model = VIR_DOMAIN_NET_MODEL_AM79C973;
         break;
     case NetworkAdapterType_I82540EM:
-        model = "82540EM";
+        net->model = VIR_DOMAIN_NET_MODEL_82540EM;
         break;
     case NetworkAdapterType_I82545EM:
-        model = "82545EM";
+        net->model = VIR_DOMAIN_NET_MODEL_82545EM;
         break;
     case NetworkAdapterType_I82543GC:
-        model = "82543GC";
+        net->model = VIR_DOMAIN_NET_MODEL_82543GC;
         break;
     case NetworkAdapterType_Virtio:
         /* Only vbox 3.1 and later support NetworkAdapterType_Virto */
         if (gVBoxAPI.APIVersion >= 3000051)
-            model = "virtio";
+            net->model = VIR_DOMAIN_NET_MODEL_VIRTIO;
         break;
     }
-    if (virDomainNetSetModelString(net, model) < 0)
-        goto error;
 
     gVBoxAPI.UINetworkAdapter.GetMACAddress(adapter, &utf16);
     VBOX_UTF16_TO_UTF8(utf16, &utf8);

From patchwork Fri Jan 18 23:05:28 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Cole Robinson <crobinso@redhat.com>
X-Patchwork-Id: 156107
Delivered-To: patch@linaro.org
Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3797573jaa;
 Fri, 18 Jan 2019 15:06:18 -0800 (PST)
X-Google-Smtp-Source: ALg8bN7I8+atL4m8PBlS6MgRQQfbu9T/9+dSsu9Y4xDUZu2vM25Fcg5+cGZ4v2mALsvCaUOlVw/u
X-Received: by 2002:a0c:ab13:: with SMTP id h19mr17699405qvb.74.1547852778305; 
 Fri, 18 Jan 2019 15:06:18 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1547852778; cv=none;
 d=google.com; s=arc-20160816;
 b=cWaAhZ+1JcFH4ywDo3M8SjaBD53+tdalVOPBo0M+cTXk2h6a1eDqdHGQ3pD0xMM3jx
 laIRmKdX7RMrWdx4TPLAKAE5ImNyYBs9DNG2GscgJjvwJbAdnwAfql/fi5S84Dpxpfs6
 9QIbhZ/AfhzzT1TNMF/LkLl8SK3MIH0Zbg+Hj2akNYRqzIavIpuqkdF5hmTbN/8G2YRE
 +PPySn3pj1q12bHy4U8R252+/M/5tDSjvmlW9UAQInMOmgOR54NAW7qEO0dqjR4Ada6v
 fwKnzWudD+sxdZo4EmWrby+13onWtmF35ZxwdHhcjh2NAxgl8FO5X+UidxKRMp99qBAo
 evkQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
 s=arc-20160816; 
 h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help
 :list-post:list-archive:list-unsubscribe:list-id:precedence:subject
 :mime-version:references:in-reply-to:message-id:date:to:from
 :delivered-to;
 bh=IsTVd7DR/b7vxjn0mIYamtZqELeAtIRLfg58vlvEPbs=;
 b=guBPHeXAWw01AiT1oVYJx25Ir5HFgFiKlvDP+6p1e57hVyf18Prq7HPaiusjB2TTaM
 fgz9X7DHfKtA8jjchvWw7R7KnNfOyy2qqFPPznakXFcVThllOeWKZ3C8gnuh71fPKxpj
 OvulRbqQ1gXR3aC9qB7zhEUG1XmXzsRVJN0V4fnzA0Vaq4TJx+mM49xsnT03rurg39U2
 upoMw9k7ahPPQj8K4RJ0eRGADrYZweEiCUGr5zrajgO4LatXgqUtQYTi5sSbl6SvH6Ie
 9OA6bObllnYiQe29T/jVL3OIv7rI1HzNmsVBNouRo4RAeKEhgFcl8udqsq3wmqpXz70L
 G2WA==
ARC-Authentication-Results: i=1; mx.google.com;
 spf=pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 smtp.mailfrom=libvir-list-bounces@redhat.com; 
 dmarc=pass (p=NONE sp=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.google.com with ESMTPS id
 l45si874255qtk.229.2019.01.18.15.06.18
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Fri, 18 Jan 2019 15:06:18 -0800 (PST)
Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 client-ip=209.132.183.28; 
Authentication-Results: mx.google.com;
 spf=pass (google.com: domain of libvir-list-bounces@redhat.com
 designates 209.132.183.28 as permitted sender)
 smtp.mailfrom=libvir-list-bounces@redhat.com; 
 dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com
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 C8D0D80F94;
 Fri, 18 Jan 2019 23:06:16 +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 99E8F60C55;
 Fri, 18 Jan 2019 23:06:16 +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 45B853F60B;
 Fri, 18 Jan 2019 23:06:16 +0000 (UTC)
Received: from smtp.corp.redhat.com
 (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
 by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with
 ESMTP
 id x0IN5dsu008697 for <libvir-list@listman.util.phx.redhat.com>;
 Fri, 18 Jan 2019 18:05:39 -0500
Received: by smtp.corp.redhat.com (Postfix)
 id 707ED600D7; Fri, 18 Jan 2019 23:05:39 +0000 (UTC)
Delivered-To: libvirt-list@redhat.com
Received: from worklaptop.redhat.com (ovpn-125-139.rdu2.redhat.com
 [10.10.125.139])
 by smtp.corp.redhat.com (Postfix) with ESMTP id 06B3D600C2;
 Fri, 18 Jan 2019 23:05:38 +0000 (UTC)
From: Cole Robinson <crobinso@redhat.com>
To: libvirt-list@redhat.com
Date: Fri, 18 Jan 2019 18:05:28 -0500
Message-Id: <3bd2f9447197b482ebb0d78ee051267e297c3857.1547851898.git.crobinso@redhat.com>
In-Reply-To: <cover.1547851897.git.crobinso@redhat.com>
References: <cover.1547851897.git.crobinso@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 10/10] 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>
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.27]);
 Fri, 18 Jan 2019 23:06:17 +0000 (UTC)

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(-)

-- 
2.20.1

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

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e951e8153b..19564c3e4f 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4972,6 +4972,15 @@ virDomainDeviceDefPostParseCheckFeatures(virDomainDeviceDefPtr dev,
         virDomainDeviceDefCheckUnsupportedMemoryDevice(dev) < 0)
         return -1;
 
+    if (UNSUPPORTED(VIR_DOMAIN_DEF_FEATURE_NET_MODEL_STRING) &&
+        dev->type == 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 b4e70480ac..b25d539cb2 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2739,6 +2739,7 @@ typedef enum {
     VIR_DOMAIN_DEF_FEATURE_INDIVIDUAL_VCPUS = (1 << 4),
     VIR_DOMAIN_DEF_FEATURE_USER_ALIAS = (1 << 5),
     VIR_DOMAIN_DEF_FEATURE_NO_BOOT_ORDER = (1 << 6),
+    VIR_DOMAIN_DEF_FEATURE_NET_MODEL_STRING = (1 << 7),
 } virDomainDefFeatures;
 
 
diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index 3ada51f517..f4093411e3 100644
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -424,6 +424,7 @@ virDomainDefParserConfig libxlDomainDefParserConfig = {
     .macPrefix = { 0x00, 0x16, 0x3e },
     .devicesPostParseCallback = libxlDomainDeviceDefPostParse,
     .domainPostParseCallback = libxlDomainDefPostParse,
+    .features = VIR_DOMAIN_DEF_FEATURE_NET_MODEL_STRING,
 };
 
 
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 44d43a85c9..e1b0b08dcc 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -6804,7 +6804,8 @@ virDomainDefParserConfig virQEMUDriverDomainDefParserConfig = {
     .features = VIR_DOMAIN_DEF_FEATURE_MEMORY_HOTPLUG |
                 VIR_DOMAIN_DEF_FEATURE_OFFLINE_VCPUPIN |
                 VIR_DOMAIN_DEF_FEATURE_INDIVIDUAL_VCPUS |
-                VIR_DOMAIN_DEF_FEATURE_USER_ALIAS,
+                VIR_DOMAIN_DEF_FEATURE_USER_ALIAS |
+                VIR_DOMAIN_DEF_FEATURE_NET_MODEL_STRING,
 };
 
 
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 3bd30bb417..86abd35de6 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -646,7 +646,8 @@ caps_mockup(vahControl * ctl, const char *xmlStr)
 virDomainDefParserConfig virAAHelperDomainDefParserConfig = {
     .features = 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,
 };
 
 static int