From nobody Thu May 2 16:43:36 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1532318673313669.8828203151744; Sun, 22 Jul 2018 21:04:33 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3551D308212E; Mon, 23 Jul 2018 04:04:30 +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 79E7058820; Mon, 23 Jul 2018 04:04:27 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id DBBBE4A460; Mon, 23 Jul 2018 04:04:21 +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 w6N44ILh004762 for ; Mon, 23 Jul 2018 00:04:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 381D5600C8; Mon, 23 Jul 2018 04:04:18 +0000 (UTC) Received: from mx1.redhat.com (ext-mx13.extmail.prod.ext.phx2.redhat.com [10.5.110.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2EFE9600C6 for ; Mon, 23 Jul 2018 04:04:14 +0000 (UTC) Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C26A8308213B for ; Mon, 23 Jul 2018 04:04:11 +0000 (UTC) Received: from localhost.localdomain ([58.56.27.130]) by mail.gmx.com (mrgmx002 [212.227.17.184]) with ESMTPSA (Nemesis) id 0M4WRI-1fvoay0RlE-00yjDc; Mon, 23 Jul 2018 06:04:09 +0200 From: Shi Lei To: libvir-list@redhat.com Date: Mon, 23 Jul 2018 12:03:57 +0800 Message-Id: <1532318637-25869-1-git-send-email-shilei.massclouds@gmx.com> X-Provags-ID: V03:K1:Luua1F0gkUDRAA0cJxdgZMqqmVXfruFo9+HWKf1TiHAdrR8v4sB 9ExatULhZ73rVUqH5Vq+mRe+p0Z8vrh1AYAVCD1b3tFmriimPvZNMB3ytKkPFym0xtSjYZw c3KfT010jFzQXeMJ0WK3lrw++su73nERen3Ss9EiFexsPhbGWvDkKJGlBYIBEPJlI+OHR7v YdnVy6cwuk/DO7N9qGQoA== X-UI-Out-Filterresults: notjunk:1;V01:K0:zazb1R2SoMw=:Ay0qU//6uYpkomSkTieda1 skybHeRXJj+NxsDHnfQpVdxS/cAjG6DUGBkvs4rjVsEyMzDXlaCD6evHCt4Tl9aIXcEB2cJ9u T9BCBlJsa/7jJsnMGYcg/tkqQdlbyuvCxLChtcpGMp/YYs2psU96yMK6umAMLJQc57XtKMQfx wgsPvBR7GeT9+rl2vBLYJ/djaqvTpQgAojE7yehlG6e3AZAkwh8Cq/yYVLqlPJYMLGby7pdvF Hj8nv9nwycdaCiuqVmuNrHhF7sjQO4NgY6MNt8+KLgCA01CpGgc0eeDqp0CocSuS7heaZSd1l G5WReAqY2o9DWO5HbWnbv4awU7v63nBluxsyVzu5qFae8TgMqc/OYqfUJJv9HMxhmZW8hGxAx yqEqo+caPQeLFWjQNEdSJ9VLXpeQsDJc/4mIYb862gog5GCCdwq8pFe9PCLg/6cSFSYZukRUy TPR96Of6b8JgSDpL9K8hV/pqdiTJnsrAwF9StzevkbW5LJNKhDpwJu7PpokMRk89rLppa/Wr6 g6bKlr7H3YizsbGm4c5wy9cF9MSAwd6CUItxu27AqPp1e/LViyyP4nyltDNP8DatLNjlBpLyQ nHdUfdcWqjqnCRVj9K2wVupW5rbAvseTjEHv5pmQoLNlNhPtZTE2+QnrDW/I6qXNTQQTJQiqs KRPYBP9H9B5AwSXklwTdcbb/f6uTJGhs88M3w0U0lx6iRoTDCYxPOlV08jDAh9s5SK9ZK5D9u xclmpmgYKn4ZJ3iOSmAz8KaTB1TblVBqCJozgwrPpURJ0mizleuOL079KDs= X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 207 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 23 Jul 2018 04:04:12 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 23 Jul 2018 04:04:12 +0000 (UTC) for IP:'212.227.15.15' DOMAIN:'mout.gmx.net' HELO:'mout.gmx.net' FROM:'shilei.massclouds@gmx.com' RCPT:'' X-RedHat-Spam-Score: -0.7 (FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS) 212.227.15.15 mout.gmx.net 212.227.15.15 mout.gmx.net X-Scanned-By: MIMEDefang 2.84 on 10.5.110.42 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Shi Lei Subject: [libvirt] [PATCHv2] replace 'if' type conditions with 'switch' for VIR_NETWORK_FORWARD_ X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 23 Jul 2018 04:04:31 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" v1 patch here: https://www.redhat.com/archives/libvir-list/2018-July/msg013= 14.html since v1: 1. Change the type declaration of _virNetworkForwardDef.type from int to virNetworkForwardType 2. use the default case to report out of range error with virReportEnumRangeError Signed-off-by: Shi Lei --- src/conf/domain_conf.c | 49 ++++--- src/conf/network_conf.c | 73 +++++++--- src/conf/network_conf.h | 2 +- src/conf/virnetworkobj.c | 24 +++- src/esx/esx_network_driver.c | 19 ++- src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 309 ++++++++++++++++++++++++++++-----------= ---- src/qemu/qemu_process.c | 8 ++ 8 files changed, 329 insertions(+), 156 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 178c6d2..de08788 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29975,40 +29975,49 @@ virDomainNetResolveActualType(virDomainNetDefPtr = iface) if (!(def =3D virNetworkDefParseString(xml))) goto cleanup; =20 - if ((def->forward.type =3D=3D VIR_NETWORK_FORWARD_NONE) || - (def->forward.type =3D=3D VIR_NETWORK_FORWARD_NAT) || - (def->forward.type =3D=3D VIR_NETWORK_FORWARD_ROUTE) || - (def->forward.type =3D=3D VIR_NETWORK_FORWARD_OPEN)) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: /* for these forward types, the actual net type really *is* * NETWORK; we just keep the info from the portgroup in * iface->data.network.actual */ ret =3D VIR_DOMAIN_NET_TYPE_NETWORK; + break; =20 - } else if ((def->forward.type =3D=3D VIR_NETWORK_FORWARD_BRIDGE) && - def->bridge) { - - /* - * is VIR_DOMAIN_NET_TYPE_BRIDGE - */ - - ret =3D VIR_DOMAIN_NET_TYPE_BRIDGE; - - } else if (def->forward.type =3D=3D VIR_NETWORK_FORWARD_HOSTDEV) { - + case VIR_NETWORK_FORWARD_HOSTDEV: ret =3D VIR_DOMAIN_NET_TYPE_HOSTDEV; + break; =20 - } else if ((def->forward.type =3D=3D VIR_NETWORK_FORWARD_BRIDGE) || - (def->forward.type =3D=3D VIR_NETWORK_FORWARD_PRIVATE) || - (def->forward.type =3D=3D VIR_NETWORK_FORWARD_VEPA) || - (def->forward.type =3D=3D VIR_NETWORK_FORWARD_PASSTHROUGH))= { + case VIR_NETWORK_FORWARD_BRIDGE: + if (def->bridge) { + /* + * is VIR_DOMAIN_NET_TYPE_BRIDGE + */ + ret =3D VIR_DOMAIN_NET_TYPE_BRIDGE; + break; + } + + /* intentionally fall through to the direct case for + * VIR_NETWORK_FORWARD_BRIDGE with no bridge device defined + */ + ATTRIBUTE_FALLTHROUGH; =20 + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: /* are all * VIR_DOMAIN_NET_TYPE_DIRECT. */ - ret =3D VIR_DOMAIN_NET_TYPE_DIRECT; + break; =20 + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; } =20 cleanup: diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 630a87f..526291c 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1955,21 +1955,40 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) goto error; } break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto error; } =20 VIR_FREE(stp); =20 - if (def->mtu && - (def->forward.type !=3D VIR_NETWORK_FORWARD_NONE && - def->forward.type !=3D VIR_NETWORK_FORWARD_NAT && - def->forward.type !=3D VIR_NETWORK_FORWARD_ROUTE && - def->forward.type !=3D VIR_NETWORK_FORWARD_OPEN)) { - virReportError(VIR_ERR_XML_ERROR, - _("mtu size only allowed in open, route, nat, " - "and isolated mode, not in %s (network '%s')"), - virNetworkForwardTypeToString(def->forward.type), - def->name); - goto error; + if (def->mtu) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + virReportError(VIR_ERR_XML_ERROR, + _("mtu size only allowed in open, route, nat, " + "and isolated mode, not in %s (network '%s')"= ), + virNetworkForwardTypeToString(def->forward.type= ), + def->name); + goto error; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.ty= pe); + goto error; + } } =20 /* Extract custom metadata */ @@ -2349,6 +2368,7 @@ virNetworkDefFormatBuf(virBufferPtr buf, char uuidstr[VIR_UUID_STRING_BUFLEN]; size_t i; bool shortforward; + bool hasbridge =3D false; =20 virBufferAddLit(buf, "connections > 0)) @@ -2469,22 +2489,33 @@ virNetworkDefFormatBuf(virBufferPtr buf, virBufferAddLit(buf, "\n"); } =20 + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + hasbridge =3D true; + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + break; =20 - if (def->forward.type =3D=3D VIR_NETWORK_FORWARD_NONE || - def->forward.type =3D=3D VIR_NETWORK_FORWARD_NAT || - def->forward.type =3D=3D VIR_NETWORK_FORWARD_ROUTE || - def->forward.type =3D=3D VIR_NETWORK_FORWARD_OPEN || - def->bridge || def->macTableManager) { + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto error; + } =20 + if (hasbridge || def->bridge || def->macTableManager) { virBufferAddLit(buf, "bridge); - if (def->forward.type =3D=3D VIR_NETWORK_FORWARD_NONE || - def->forward.type =3D=3D VIR_NETWORK_FORWARD_NAT || - def->forward.type =3D=3D VIR_NETWORK_FORWARD_ROUTE || - def->forward.type =3D=3D VIR_NETWORK_FORWARD_OPEN) { + if (hasbridge) virBufferAsprintf(buf, " stp=3D'%s' delay=3D'%ld'", def->stp ? "on" : "off", def->delay); - } if (def->macTableManager) { virBufferAsprintf(buf, " macTableManager=3D'%s'", virNetworkBridgeMACTableManagerTypeToString(d= ef->macTableManager)); diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 54c8ed1..8fa8114 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -199,7 +199,7 @@ struct _virNetworkForwardPfDef { typedef struct _virNetworkForwardDef virNetworkForwardDef; typedef virNetworkForwardDef *virNetworkForwardDefPtr; struct _virNetworkForwardDef { - int type; /* One of virNetworkForwardType constants */ + virNetworkForwardType type; bool managed; /* managed attribute for hostdev mode */ int driverName; /* enum virNetworkForwardDriverNameType */ =20 diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index e00c8a7..81b53e8 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -1009,19 +1009,31 @@ virNetworkLoadConfig(virNetworkObjListPtr nets, goto error; } =20 - if (def->forward.type =3D=3D VIR_NETWORK_FORWARD_NONE || - def->forward.type =3D=3D VIR_NETWORK_FORWARD_NAT || - def->forward.type =3D=3D VIR_NETWORK_FORWARD_ROUTE || - def->forward.type =3D=3D VIR_NETWORK_FORWARD_OPEN) { - + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: if (!def->mac_specified) { virNetworkSetBridgeMacAddr(def); virNetworkSaveConfig(configDir, def); } - } else { + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: /* Throw away MAC address for other forward types, * which could have been generated by older libvirt RPMs */ def->mac_specified =3D false; + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto error; } =20 if (!(obj =3D virNetworkObjAssignDef(nets, def, 0))) diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 04118b4..4d1b3cd 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -326,12 +326,27 @@ esxNetworkDefineXML(virConnectPtr conn, const char *x= ml) } =20 /* FIXME: Add support for NAT */ - if (def->forward.type !=3D VIR_NETWORK_FORWARD_NONE && - def->forward.type !=3D VIR_NETWORK_FORWARD_BRIDGE) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_BRIDGE: + break; + + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported forward mode '%s'"), virNetworkForwardTypeToString(def->forward.type)); goto cleanup; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; } =20 /* Verify that specified HostPortGroups don't exist already */ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1a4cf98..fc386e1 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2369,6 +2369,7 @@ virNetDevMacVLanCreate; virNetDevMacVLanCreateWithVPortProfile; virNetDevMacVLanDelete; virNetDevMacVLanDeleteWithVPortProfile; +virNetDevMacVLanModeTypeFromString; virNetDevMacVLanReleaseName; virNetDevMacVLanReserveName; virNetDevMacVLanRestartWithVPortProfile; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index da3c32e..a6c9111 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -485,6 +485,11 @@ networkUpdateState(virNetworkObjPtr obj, case VIR_NETWORK_FORWARD_HOSTDEV: /* so far no extra checks */ break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; } =20 /* Try and read dnsmasq/radvd pids of active networks */ @@ -2088,20 +2093,37 @@ networkRefreshDaemonsHelper(virNetworkObjPtr obj, =20 virObjectLock(obj); def =3D virNetworkObjGetDef(obj); - if (virNetworkObjIsActive(obj) && - ((def->forward.type =3D=3D VIR_NETWORK_FORWARD_NONE) || - (def->forward.type =3D=3D VIR_NETWORK_FORWARD_NAT) || - (def->forward.type =3D=3D VIR_NETWORK_FORWARD_ROUTE) || - (def->forward.type =3D=3D VIR_NETWORK_FORWARD_OPEN))) { - /* Only the three L3 network types that are configured by - * libvirt will have a dnsmasq or radvd daemon associated - * with them. Here we send a SIGHUP to an existing - * dnsmasq and/or radvd, or restart them if they've - * disappeared. - */ - networkRefreshDhcpDaemon(driver, obj); - networkRefreshRadvd(driver, obj); + if (virNetworkObjIsActive(obj)) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + /* Only the three L3 network types that are configured by + * libvirt will have a dnsmasq or radvd daemon associated + * with them. Here we send a SIGHUP to an existing + * dnsmasq and/or radvd, or restart them if they've + * disappeared. + */ + networkRefreshDhcpDaemon(driver, obj); + networkRefreshRadvd(driver, obj); + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.ty= pe); + goto cleanup; + } } + + cleanup: virObjectUnlock(obj); return 0; } @@ -2128,20 +2150,37 @@ networkReloadFirewallRulesHelper(virNetworkObjPtr o= bj, =20 virObjectLock(obj); def =3D virNetworkObjGetDef(obj); - if (virNetworkObjIsActive(obj) && - ((def->forward.type =3D=3D VIR_NETWORK_FORWARD_NONE) || - (def->forward.type =3D=3D VIR_NETWORK_FORWARD_NAT) || - (def->forward.type =3D=3D VIR_NETWORK_FORWARD_ROUTE))) { - /* Only three of the L3 network types that are configured by - * libvirt need to have iptables rules reloaded. The 4th L3 - * network type, forward=3D'open', doesn't need this because it - * has no iptables rules. - */ - networkRemoveFirewallRules(def); - if (networkAddFirewallRules(def) < 0) { - /* failed to add but already logged */ + if (virNetworkObjIsActive(obj)) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + /* Only three of the L3 network types that are configured by + * libvirt need to have iptables rules reloaded. The 4th L3 + * network type, forward=3D'open', doesn't need this because it + * has no iptables rules. + */ + networkRemoveFirewallRules(def); + /* No need to check return value since already logged internal= ly */ + ignore_value(networkAddFirewallRules(def)); + break; + + case VIR_NETWORK_FORWARD_OPEN: + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.ty= pe); + goto cleanup; } } + + cleanup: virObjectUnlock(obj); return 0; } @@ -2719,9 +2758,13 @@ networkCreateInterfacePool(virNetworkDefPtr netdef) case VIR_NETWORK_FORWARD_NAT: case VIR_NETWORK_FORWARD_ROUTE: case VIR_NETWORK_FORWARD_OPEN: - case VIR_NETWORK_FORWARD_LAST: /* by definition these will never be encountered here */ break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, netdef->forward= .type); + goto cleanup; } } =20 @@ -2840,6 +2883,11 @@ networkStartNetwork(virNetworkDriverStatePtr driver, if (networkStartNetworkExternal(obj) < 0) goto cleanup; break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + goto cleanup; } =20 /* finally we can call the 'started' hook script if any */ @@ -2919,6 +2967,11 @@ networkShutdownNetwork(virNetworkDriverStatePtr driv= er, case VIR_NETWORK_FORWARD_HOSTDEV: ret =3D networkShutdownNetworkExternal(obj); break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + return -1; } =20 /* now that we know it's stopped call the hook if present */ @@ -3273,11 +3326,11 @@ networkValidate(virNetworkDriverStatePtr driver, /* Only the three L3 network types that are configured by libvirt * need to have a bridge device name / mac address provided */ - if (def->forward.type =3D=3D VIR_NETWORK_FORWARD_NONE || - def->forward.type =3D=3D VIR_NETWORK_FORWARD_NAT || - def->forward.type =3D=3D VIR_NETWORK_FORWARD_ROUTE || - def->forward.type =3D=3D VIR_NETWORK_FORWARD_OPEN) { - + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: /* if no bridge name was given in the config, find a name * unused by any other libvirt networks and assign it. */ @@ -3285,7 +3338,13 @@ networkValidate(virNetworkDriverStatePtr driver, return -1; =20 virNetworkSetBridgeMacAddr(def); - } else { + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: /* They are also the only types that currently support setting * a MAC or IP address for the host-side device (bridge), DNS * configuration, or network-wide bandwidth limits. @@ -3331,6 +3390,12 @@ networkValidate(virNetworkDriverStatePtr driver, return -1; } bandwidthAllowed =3D false; + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.type); + return -1; } =20 /* we support configs with a single PF defined: @@ -3755,9 +3820,10 @@ networkUpdate(virNetworkPtr net, /* Take care of anything that must be done before updating the * live NetworkDef. */ - if (def->forward.type =3D=3D VIR_NETWORK_FORWARD_NONE || - def->forward.type =3D=3D VIR_NETWORK_FORWARD_NAT || - def->forward.type =3D=3D VIR_NETWORK_FORWARD_ROUTE) { + switch (def->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: switch (section) { case VIR_NETWORK_SECTION_FORWARD: case VIR_NETWORK_SECTION_FORWARD_INTERFACE: @@ -3768,14 +3834,26 @@ networkUpdate(virNetworkPtr net, * old rules (and remember to load new ones after the * update). */ - if (def->forward.type !=3D VIR_NETWORK_FORWARD_OPEN) { - networkRemoveFirewallRules(def); - needFirewallRefresh =3D true; - } + networkRemoveFirewallRules(def); + needFirewallRefresh =3D true; break; default: break; } + break; + + case VIR_NETWORK_FORWARD_OPEN: + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, def->forward.ty= pe); + goto cleanup; } } =20 @@ -4440,10 +4518,11 @@ networkAllocateActualDevice(virDomainDefPtr dom, iface->data.network.actual->trustGuestRxFilters =3D netdef->trustGuestRxFilters; =20 - if ((netdef->forward.type =3D=3D VIR_NETWORK_FORWARD_NONE) || - (netdef->forward.type =3D=3D VIR_NETWORK_FORWARD_NAT) || - (netdef->forward.type =3D=3D VIR_NETWORK_FORWARD_ROUTE) || - (netdef->forward.type =3D=3D VIR_NETWORK_FORWARD_OPEN)) { + switch (netdef->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: /* for these forward types, the actual net type really *is* * NETWORK; we just keep the info from the portgroup in * iface->data.network.actual @@ -4463,46 +4542,9 @@ networkAllocateActualDevice(virDomainDefPtr dom, =20 if (networkPlugBandwidth(obj, iface) < 0) goto error; + break; =20 - } else if ((netdef->forward.type =3D=3D VIR_NETWORK_FORWARD_BRIDGE) && - netdef->bridge) { - - /* - * is VIR_DOMAIN_NET_TYPE_BRIDGE - */ - - iface->data.network.actual->type =3D actualType =3D VIR_DOMAIN_NET= _TYPE_BRIDGE; - if (VIR_STRDUP(iface->data.network.actual->data.bridge.brname, - netdef->bridge) < 0) - goto error; - iface->data.network.actual->data.bridge.macTableManager - =3D netdef->macTableManager; - - /* merge virtualports from interface, network, and portgroup to - * arrive at actual virtualport to use - */ - if (virNetDevVPortProfileMerge3(&iface->data.network.actual->virtP= ortProfile, - iface->virtPortProfile, - netdef->virtPortProfile, - portgroup - ? portgroup->virtPortProfile : NUL= L) < 0) { - goto error; - } - virtport =3D iface->data.network.actual->virtPortProfile; - if (virtport) { - /* only type=3D'openvswitch' is allowed for bridges */ - if (virtport->virtPortType !=3D VIR_NETDEV_VPORT_PROFILE_OPENV= SWITCH) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _(" not supported = for network " - "'%s' which uses a bridge device"), - virNetDevVPortTypeToString(virtport->virtPo= rtType), - netdef->name); - goto error; - } - } - - } else if (netdef->forward.type =3D=3D VIR_NETWORK_FORWARD_HOSTDEV) { - + case VIR_NETWORK_FORWARD_HOSTDEV: { virDomainHostdevSubsysPCIBackendType backend; =20 iface->data.network.actual->type =3D actualType =3D VIR_DOMAIN_NET= _TYPE_HOSTDEV; @@ -4575,32 +4617,67 @@ networkAllocateActualDevice(virDomainDefPtr dom, goto error; } } + break; + } =20 - } else if ((netdef->forward.type =3D=3D VIR_NETWORK_FORWARD_BRIDGE) || - (netdef->forward.type =3D=3D VIR_NETWORK_FORWARD_PRIVATE) || - (netdef->forward.type =3D=3D VIR_NETWORK_FORWARD_VEPA) || - (netdef->forward.type =3D=3D VIR_NETWORK_FORWARD_PASSTHROUG= H)) { + case VIR_NETWORK_FORWARD_BRIDGE: + if (netdef->bridge) { + /* + * is VIR_DOMAIN_NET_TYPE_BRIDGE + */ =20 + iface->data.network.actual->type =3D actualType =3D VIR_DOMAIN= _NET_TYPE_BRIDGE; + if (VIR_STRDUP(iface->data.network.actual->data.bridge.brname, + netdef->bridge) < 0) + goto error; + iface->data.network.actual->data.bridge.macTableManager + =3D netdef->macTableManager; + + /* merge virtualports from interface, network, and portgroup to + * arrive at actual virtualport to use + */ + if (virNetDevVPortProfileMerge3(&iface->data.network.actual->v= irtPortProfile, + iface->virtPortProfile, + netdef->virtPortProfile, + portgroup + ? portgroup->virtPortProfile := NULL) < 0) { + goto error; + } + virtport =3D iface->data.network.actual->virtPortProfile; + if (virtport) { + /* only type=3D'openvswitch' is allowed for bridges */ + if (virtport->virtPortType !=3D VIR_NETDEV_VPORT_PROFILE_O= PENVSWITCH) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _(" not suppor= ted for network " + "'%s' which uses a bridge device"), + virNetDevVPortTypeToString(virtport->vi= rtPortType), + netdef->name); + goto error; + } + } + break; + } + + /* intentionally fall through to the direct case for + * VIR_NETWORK_FORWARD_BRIDGE with no bridge device defined + */ + ATTRIBUTE_FALLTHROUGH; + + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: /* are all * VIR_DOMAIN_NET_TYPE_DIRECT. */ =20 /* Set type=3Ddirect and appropriate */ iface->data.network.actual->type =3D actualType =3D VIR_DOMAIN_NET= _TYPE_DIRECT; - switch (netdef->forward.type) { - case VIR_NETWORK_FORWARD_BRIDGE: - iface->data.network.actual->data.direct.mode =3D VIR_NETDEV_MA= CVLAN_MODE_BRIDGE; - break; - case VIR_NETWORK_FORWARD_PRIVATE: - iface->data.network.actual->data.direct.mode =3D VIR_NETDEV_MA= CVLAN_MODE_PRIVATE; - break; - case VIR_NETWORK_FORWARD_VEPA: - iface->data.network.actual->data.direct.mode =3D VIR_NETDEV_MA= CVLAN_MODE_VEPA; - break; - case VIR_NETWORK_FORWARD_PASSTHROUGH: - iface->data.network.actual->data.direct.mode =3D VIR_NETDEV_MA= CVLAN_MODE_PASSTHRU; - break; - } + + /* NO need to check the value returned from virNetDevMacVLanModeTy= peFromString + * it must be valid for these forward type(bridge|private|vepa|pas= sthrough) + */ + iface->data.network.actual->data.direct.mode =3D + virNetDevMacVLanModeTypeFromString(virNetworkForwardTypeToStri= ng(netdef->forward.type)); =20 /* merge virtualports from interface, network, and portgroup to * arrive at actual virtualport to use @@ -4680,6 +4757,12 @@ networkAllocateActualDevice(virDomainDefPtr dom, dev->device.dev) < 0) goto error; } + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, netdef->forward.typ= e); + goto error; } =20 if (virNetworkObjMacMgrAdd(obj, driver->dnsmasqStateDir, @@ -5037,13 +5120,27 @@ networkReleaseActualDevice(virDomainDefPtr dom, } netdef =3D virNetworkObjGetDef(obj); =20 - if (iface->data.network.actual && - (netdef->forward.type =3D=3D VIR_NETWORK_FORWARD_NONE || - netdef->forward.type =3D=3D VIR_NETWORK_FORWARD_NAT || - netdef->forward.type =3D=3D VIR_NETWORK_FORWARD_ROUTE || - netdef->forward.type =3D=3D VIR_NETWORK_FORWARD_OPEN) && - networkUnplugBandwidth(obj, iface) < 0) + switch (netdef->forward.type) { + case VIR_NETWORK_FORWARD_NONE: + case VIR_NETWORK_FORWARD_NAT: + case VIR_NETWORK_FORWARD_ROUTE: + case VIR_NETWORK_FORWARD_OPEN: + if (iface->data.network.actual && networkUnplugBandwidth(obj, ifac= e) < 0) + goto error; + break; + + case VIR_NETWORK_FORWARD_BRIDGE: + case VIR_NETWORK_FORWARD_PRIVATE: + case VIR_NETWORK_FORWARD_VEPA: + case VIR_NETWORK_FORWARD_PASSTHROUGH: + case VIR_NETWORK_FORWARD_HOSTDEV: + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, netdef->forward.typ= e); goto error; + } =20 if ((!iface->data.network.actual) || ((actualType !=3D VIR_DOMAIN_NET_TYPE_DIRECT) && diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bba157b..1946a28 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4582,6 +4582,14 @@ qemuProcessGetNetworkAddress(const char *netname, goto cleanup; } break; + + case VIR_NETWORK_FORWARD_HOSTDEV: + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportEnumRangeError(virNetworkForwardType, netdef->forward.typ= e); + goto cleanup; } =20 if (dev_name) { --=20 2.7.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list