diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 568277c714..2eea0bef63 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -6228,10 +6228,10 @@ static int libxlNodeGetSecurityModel(virConnectPtr conn, } static int -libxlGetDHCPInterfaces(virDomainPtr dom, - virDomainObjPtr vm, +libxlGetDHCPInterfaces(virDomainObjPtr vm, virDomainInterfacePtr **ifaces) { + g_autoptr(virConnect) conn = NULL; int rv = -1; int n_leases = 0; size_t i, j; @@ -6242,12 +6242,8 @@ libxlGetDHCPInterfaces(virDomainPtr dom, virNetworkDHCPLeasePtr *leases = NULL; virDomainInterfacePtr *ifaces_ret = NULL; - if (!dom->conn->networkDriver || - !dom->conn->networkDriver->networkGetDHCPLeases) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Network driver does not support DHCP lease query")); + if (!(conn = virGetConnectNetwork())) return -1; - } for (i = 0; i < vm->def->nnets; i++) { if (vm->def->nets[i]->type != VIR_DOMAIN_NET_TYPE_NETWORK) @@ -6255,8 +6251,10 @@ libxlGetDHCPInterfaces(virDomainPtr dom, virMacAddrFormat(&(vm->def->nets[i]->mac), macaddr); virObjectUnref(network); - network = virNetworkLookupByName(dom->conn, + network = virNetworkLookupByName(conn, vm->def->nets[i]->data.network.name); + if (!network) + goto error; if ((n_leases = virNetworkGetDHCPLeases(network, macaddr, &leases, 0)) < 0) @@ -6344,7 +6342,7 @@ libxlDomainInterfaceAddresses(virDomainPtr dom, switch (source) { case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE: - ret = libxlGetDHCPInterfaces(dom, vm, ifaces); + ret = libxlGetDHCPInterfaces(vm, ifaces); break; default: