提交 dae430cc 编写于 作者: M Michal Privoznik

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

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: NMichal Privoznik <mprivozn@redhat.com>
Reviewed-by: NCole Robinson <crobinso@redhat.com>
上级 5910b180
...@@ -21718,10 +21718,10 @@ qemuDomainGetFSInfo(virDomainPtr dom, ...@@ -21718,10 +21718,10 @@ qemuDomainGetFSInfo(virDomainPtr dom,
static int static int
qemuGetDHCPInterfaces(virDomainPtr dom, qemuGetDHCPInterfaces(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;
...@@ -21732,21 +21732,20 @@ qemuGetDHCPInterfaces(virDomainPtr dom, ...@@ -21732,21 +21732,20 @@ qemuGetDHCPInterfaces(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)
continue; continue;
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)
...@@ -21892,7 +21891,7 @@ qemuDomainInterfaceAddresses(virDomainPtr dom, ...@@ -21892,7 +21891,7 @@ qemuDomainInterfaceAddresses(virDomainPtr dom,
switch (source) { switch (source) {
case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE: case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE:
ret = qemuGetDHCPInterfaces(dom, vm, ifaces); ret = qemuGetDHCPInterfaces(vm, ifaces);
break; break;
case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT: case VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册