conf: make 'vnet' prefix a macro

Using a macro ensures that all the code is looking for the same
prefix.

* src/conf/domain_conf.h (VIR_NET_GENERATED_PREFIX): New macro.
* src/conf/domain_conf.c (virDomainNetDefParseXML): Use it.
* src/uml/uml_conf.c (umlConnectTapDevice): Likewise.
* src/qemu/qemu_command.c (qemuNetworkIfaceConnect): Likewise.
Suggested by Laine Stump.

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 257a1ea93b1b1a0cea2dabe24da6992a6b475c9a..72eccde3c9ad643fb561af76a2a5aa86d1a80f6f 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2819,7 +2819,7 @@ virDomainNetDefParseXML(virCapsPtr caps,
                 ifname = virXMLPropString(cur, "dev");
                 if ((ifname != NULL) &&
                     ((flags & VIR_DOMAIN_XML_INACTIVE) &&
-                      (STRPREFIX((const char*)ifname, "vnet")))) {
+                      (STRPREFIX(ifname, VIR_NET_GENERATED_PREFIX)))) {
                     /* An auto-generated target name, blank it out */
                     VIR_FREE(ifname);
                 }

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index c748f5211c05fc8061ccac98b8e17a14f98477f0..dd33eb060775dba4dcf748168db8a07443fb9553 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -429,6 +429,10 @@ struct _virDomainNetDef {
     virBandwidthPtr bandwidth;
 };
 
+/* Used for prefix of ifname of any network name generated dynamically
+ * by libvirt, and cannot be used for a persistent network name.  */
+# define VIR_NET_GENERATED_PREFIX "vnet"
+
 enum virDomainChrDeviceType {
     VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL = 0,
     VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL,

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index ee42f1db7296ebfd193a447f8aed251930353dec..6a2e2ae27cc39bd7bb4f828847c7f48fc1f4a999 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -188,7 +188,7 @@ qemuNetworkIfaceConnect(virDomainDefPtr def,
     int err;
     int tapfd = -1;
     int vnet_hdr = 0;
-    int template_ifname = 0;
+    bool template_ifname = false;
     unsigned char tapmac[VIR_MAC_BUFLEN];
     int actualType = virDomainNetGetActualType(net);
 
@@ -244,15 +244,15 @@ qemuNetworkIfaceConnect(virDomainDefPtr def,
     }
 
     if (!net->ifname ||
-        STRPREFIX(net->ifname, "vnet") ||
+        STRPREFIX(net->ifname, VIR_NET_GENERATED_PREFIX) ||
         strchr(net->ifname, '%')) {
         VIR_FREE(net->ifname);
-        if (!(net->ifname = strdup("vnet%d"))) {
+        if (!(net->ifname = strdup(VIR_NET_GENERATED_PREFIX "%d"))) {
             virReportOOMError();
             goto cleanup;
         }
         /* avoid exposing vnet%d in getXMLDesc or error outputs */
-        template_ifname = 1;
+        template_ifname = true;
     }
 
     if (qemuCapsGet(qemuCaps, QEMU_CAPS_VNET_HDR) &&

diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index 417271ee9c16b07dcacd8dd81252143b88eaf07f..7b5e094c4df855b0df5e39564b8f9cb45c41bb37 100644 (file)
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -115,7 +115,7 @@ umlConnectTapDevice(virConnectPtr conn,
                     const char *bridge)
 {
     brControl *brctl = NULL;
-    int template_ifname = 0;
+    bool template_ifname = false;
     int err;
     unsigned char tapmac[VIR_MAC_BUFLEN];
 
@@ -126,13 +126,13 @@ umlConnectTapDevice(virConnectPtr conn,
     }
 
     if (!net->ifname ||
-        STRPREFIX(net->ifname, "vnet") ||
+        STRPREFIX(net->ifname, VIR_NET_GENERATED_PREFIX) ||
         strchr(net->ifname, '%')) {
         VIR_FREE(net->ifname);
-        if (!(net->ifname = strdup("vnet%d")))
+        if (!(net->ifname = strdup(VIR_NET_GENERATED_PREFIX "%d")))
             goto no_memory;
         /* avoid exposing vnet%d in getXMLDesc or error outputs */
-        template_ifname = 1;
+        template_ifname = true;
     }
 
     memcpy(tapmac, net->mac, VIR_MAC_BUFLEN);