External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-23 03:42:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

libxl: Don't use dom->conn to lookup virNetwork

Browse Source 
When using the monolithic daemon, then dom->conn has all driver
tables filled in properly and thus it's safe to call an API other
than virDomain*(). However, when using split daemons then
dom->conn has only hypervisor driver table set
(dom->conn->driver) and the rest is NULL. Therefore, if we want
to call a non-domain API (virNetworkLookupByName() in this case),
we have obtain the cached connection object accessible via
virGetConnectNetwork().

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Michal Privoznik 2019-12-04 10:18:22 +01:00
parent 7be63dbe25
commit 068fd891cd
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libxl/libxl_driver.c
View File

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