diff options
Diffstat (limited to 'tools/libxl/libxl.c')
| -rw-r--r-- | tools/libxl/libxl.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 1f7a529dbc..d0b2f74912 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -31,8 +31,6 @@ #include <inttypes.h> #include <assert.h> -#include <arpa/inet.h> - #include "libxl.h" #include "libxl_utils.h" #include "libxl_internal.h" @@ -1175,7 +1173,7 @@ int libxl_device_nic_init(libxl_device_nic *nic_info, int devnum) nic_info->mac[5] = r[2]; nic_info->ifname = NULL; nic_info->bridge = strdup("xenbr0"); - nic_info->ip.s_addr = 0UL; + nic_info->ip = NULL; if ( asprintf(&nic_info->script, "%s/vif-bridge", libxl_xen_script_dir_path()) < 0 ) return ERROR_FAIL; @@ -1235,16 +1233,11 @@ int libxl_device_nic_add(libxl_ctx *ctx, uint32_t domid, libxl_device_nic *nic) flexarray_append(back, libxl__sprintf(&gc, "%02x:%02x:%02x:%02x:%02x:%02x", nic->mac[0], nic->mac[1], nic->mac[2], nic->mac[3], nic->mac[4], nic->mac[5])); - if (nic->ip.s_addr != 0UL) { - char dst[INET_ADDRSTRLEN]; - const char *addr = inet_ntop(AF_INET, &nic->ip.s_addr, &dst[0], INET_ADDRSTRLEN); - if (addr) { - flexarray_append(back, "ip"); - flexarray_append(back, libxl__strdup(&gc, addr)); - } else { - LIBXL__LOG(ctx, LIBXL__LOG_WARNING, "Unable to format IP address"); - } + if (nic->ip) { + flexarray_append(back, "ip"); + flexarray_append(back, libxl__strdup(&gc, nic->ip)); } + flexarray_append(back, "bridge"); flexarray_append(back, libxl__strdup(&gc, nic->bridge)); flexarray_append(back, "handle"); |