External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: hotplug: use g_autoptr() with virConnectPtr

Browse Source 
Reviewed-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
Daniel Henrique Barboza 2019-10-17 12:44:01 -03:00 committed by Cole Robinson
parent 1b0de07f41
commit 54c17f8498
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/qemu/qemu_hotplug.c
View File

@ -1155,7 +1155,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
bool charDevPlugged = false; bool charDevPlugged = false;
bool netdevPlugged = false; bool netdevPlugged = false;
g_autofree char *netdev_name = NULL; g_autofree char *netdev_name = NULL;
virConnectPtr conn = NULL; g_autoptr(virConnect) conn = NULL;
virErrorPtr save_err = NULL; virErrorPtr save_err = NULL;
/* preallocate new slot for device */ /* preallocate new slot for device */
@ -1497,7 +1497,6 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
} }
VIR_FREE(vhostfd); VIR_FREE(vhostfd);
VIR_FREE(vhostfdName); VIR_FREE(vhostfdName);
virObjectUnref(conn);
virDomainCCWAddressSetFree(ccwaddrs); virDomainCCWAddressSetFree(ccwaddrs);
VIR_FORCE_CLOSE(slirpfd); VIR_FORCE_CLOSE(slirpfd);
@ -3475,7 +3474,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
bool needVlanUpdate = false; bool needVlanUpdate = false;
int ret = -1; int ret = -1;
int changeidx = -1; int changeidx = -1;
virConnectPtr conn = NULL; g_autoptr(virConnect) conn = NULL;
virErrorPtr save_err = NULL; virErrorPtr save_err = NULL;
if ((changeidx = virDomainNetFindIdx(vm->def, newdev)) < 0) if ((changeidx = virDomainNetFindIdx(vm->def, newdev)) < 0)
@ -3917,7 +3916,6 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
*/ */
if (newdev && newdev->type == VIR_DOMAIN_NET_TYPE_NETWORK && conn) if (newdev && newdev->type == VIR_DOMAIN_NET_TYPE_NETWORK && conn)
virDomainNetReleaseActualDevice(conn, vm->def, newdev); virDomainNetReleaseActualDevice(conn, vm->def, newdev);
virObjectUnref(conn);
virErrorRestore(&save_err); virErrorRestore(&save_err);
return ret; return ret;
@ -4524,14 +4522,12 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver,
if (net) { if (net) {
if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) { if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
virConnectPtr conn = virGetConnectNetwork(); g_autoptr(virConnect) conn = virGetConnectNetwork();
if (conn) { if (conn)
virDomainNetReleaseActualDevice(conn, vm->def, net); virDomainNetReleaseActualDevice(conn, vm->def, net);
virObjectUnref(conn); else
} else {
VIR_WARN("Unable to release network device '%s'", NULLSTR(net->ifname)); VIR_WARN("Unable to release network device '%s'", NULLSTR(net->ifname));
} }
}
virDomainNetDefFree(net); virDomainNetDefFree(net);
} }
@ -4630,14 +4626,12 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver,
qemuDomainNetDeviceVportRemove(net); qemuDomainNetDeviceVportRemove(net);
if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) { if (net->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
virConnectPtr conn = virGetConnectNetwork(); g_autoptr(virConnect) conn = virGetConnectNetwork();
if (conn) { if (conn)
virDomainNetReleaseActualDevice(conn, vm->def, net); virDomainNetReleaseActualDevice(conn, vm->def, net);
virObjectUnref(conn); else
} else {
VIR_WARN("Unable to release network device '%s'", NULLSTR(net->ifname)); VIR_WARN("Unable to release network device '%s'", NULLSTR(net->ifname));
} }
}
virDomainNetDefFree(net); virDomainNetDefFree(net);
return 0; return 0;
} }