Change 'interface' to 'iface' in virNetworkDHCPLease

Variables/fields named 'interface' clash with system
header symbols on some platforms.
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>

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;
 }
 

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 */

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

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 */

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)

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;

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;