Change 'interface' to 'iface' in virNetworkDHCPLease

Variables/fields named 'interface' clash with system
header symbols on some platforms.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

diff --git a/daemon/remote.c b/daemon/remote.c
index f4ec8eaccfb0dcb34cb27c8a65c3f9e51be3b40d..ae19b2a7ab3bd9e09de56526f4b3b05cb3a83de9 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -6223,7 +6223,7 @@ remoteSerializeDHCPLease(remote_network_dhcp_lease *lease_dst, virNetworkDHCPLea
     lease_dst->type = lease_src->type;
     lease_dst->prefix = lease_src->prefix;
 
-    if (VIR_STRDUP(lease_dst->interface, lease_src->interface) < 0 ||
+    if (VIR_STRDUP(lease_dst->iface, lease_src->iface) < 0 ||
         VIR_STRDUP(lease_dst->ipaddr, lease_src->ipaddr) < 0 ||
         VIR_STRDUP(*mac_tmp, lease_src->mac) < 0 ||
         VIR_STRDUP(*iaid_tmp, lease_src->iaid) < 0 ||
@@ -6248,7 +6248,7 @@ remoteSerializeDHCPLease(remote_network_dhcp_lease *lease_dst, virNetworkDHCPLea
     VIR_FREE(hostname_tmp);
     VIR_FREE(clientid_tmp);
     VIR_FREE(lease_dst->ipaddr);
-    VIR_FREE(lease_dst->interface);
+    VIR_FREE(lease_dst->iface);
     return -1;
 }
 

diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index b3120e24d365ead75b81830163be0fa9cd0df9fa..7e695a3659d965fcf889effc7feae50a0b5e0a87 100644 (file)
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -5174,7 +5174,7 @@ typedef enum {
 typedef struct _virNetworkDHCPLease virNetworkDHCPLease;
 typedef virNetworkDHCPLease *virNetworkDHCPLeasePtr;
 struct _virNetworkDHCPLease {
-    char *interface;            /* Network interface name */
+    char *iface;                /* Network interface name */
     long long expirytime;       /* Seconds since epoch */
     int type;                   /* virIPAddrType */
     char *mac;                  /* MAC address */

diff --git a/src/libvirt.c b/src/libvirt.c
index f4d03bc9082eeeddd1efb6a331d6ec3b4008778b..a0cdfa21a1b99cfb2a26132148fa19e9c84897c8 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -21176,7 +21176,7 @@ virNetworkDHCPLeaseFree(virNetworkDHCPLeasePtr lease)
 {
     if (!lease)
         return;
-    VIR_FREE(lease->interface);
+    VIR_FREE(lease->iface);
     VIR_FREE(lease->mac);
     VIR_FREE(lease->iaid);
     VIR_FREE(lease->ipaddr);

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index d5577e0d8a5c44a3901d14405415b939911fe791..a407c6ea295afc3246138268cc289c66d254b9c9 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -3490,7 +3490,7 @@ networkGetDHCPLeasesHelper(virNetworkObjPtr obj,
 
             if ((VIR_STRDUP(lease->mac, mac_tmp) < 0) ||
                 (VIR_STRDUP(lease->ipaddr, ip_tmp) < 0) ||
-                (VIR_STRDUP(lease->interface, obj->def->bridge) < 0))
+                (VIR_STRDUP(lease->iface, obj->def->bridge) < 0))
                 goto error;
 
             /* Fields that can be NULL */

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index af79cb55dde01ae8e1f4a8093f3e04c81b85ca4f..76ce4a94ae5b65c6c2105ea46f74ae79f7d4db62 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -7557,7 +7557,7 @@ remoteSerializeDHCPLease(virNetworkDHCPLeasePtr lease_dst, remote_network_dhcp_l
     lease_dst->type = lease_src->type;
     lease_dst->prefix = lease_src->prefix;
 
-    if (VIR_STRDUP(lease_dst->interface, lease_src->interface) < 0)
+    if (VIR_STRDUP(lease_dst->iface, lease_src->iface) < 0)
         goto error;
 
     if (VIR_STRDUP(lease_dst->ipaddr, lease_src->ipaddr) < 0)

diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
index b5f44f7503724d919ef84e0b48dbdbcd32d268ec..4b75bdb83735f195be367e0ae2127cf374319264 100644 (file)
--- a/src/remote/remote_protocol.x
+++ b/src/remote/remote_protocol.x
@@ -3022,7 +3022,7 @@ struct remote_node_get_free_pages_ret {
 };
 
 struct remote_network_dhcp_lease {
-    remote_nonnull_string interface;
+    remote_nonnull_string iface;
     hyper expirytime;
     int type;
     remote_string mac;

diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
index d363247925bec1ef8cd93a6ecf13586d249e732d..222f125d058bc501531f61e12b93b1e044f362ac 100644 (file)
--- a/src/remote_protocol-structs
+++ b/src/remote_protocol-structs
@@ -2486,7 +2486,7 @@ struct remote_node_get_free_pages_ret {
         } counts;
 };
 struct remote_network_dhcp_lease {
-        remote_nonnull_string      interface;
+        remote_nonnull_string      iface;
         int64_t                    expirytime;
         int                        type;
         remote_string              mac;