External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 12:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

libxl: remove cleanup label from libxlDomainMigrationSrcPerform

Browse Source 
Use VIR_AUTOCLOSE for the remaining file descriptor that uses
manual cleanup and remove the label.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Ján Tomko 2022-06-22 07:32:42 +02:00
parent 7b5dd948b8
commit cf1a7df577
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libxl/libxl_migration.c
View File

@ -1183,13 +1183,13 @@ libxlDomainMigrationSrcPerform(libxlDriverPrivate *driver,
char portstr[100];
g_autoptr(virURI) uri = NULL;
virNetSocket *sock;
int sockfd = -1;
VIR_AUTOCLOSE sockfd = -1;
int ret = -1;
/* parse dst host:port from uri */
uri = virURIParse(uri_str);
if (uri == NULL || uri->server == NULL || uri->port == 0)
goto cleanup;
return -1;
hostname = uri->server;
port = uri->port;
@ -1199,11 +1199,11 @@ libxlDomainMigrationSrcPerform(libxlDriverPrivate *driver,
if (virNetSocketNewConnectTCP(hostname, portstr,
AF_UNSPEC,
&sock) < 0)
goto cleanup;
return -1;
if (virNetSocketSetBlocking(sock, true) < 0) {
virObjectUnref(sock);
goto cleanup;
return -1;
}
sockfd = virNetSocketDupFD(sock, true);
@ -1229,8 +1229,6 @@ libxlDomainMigrationSrcPerform(libxlDriverPrivate *driver,
libxlDomainObjEndJob(driver, vm);
}
cleanup:
VIR_FORCE_CLOSE(sockfd);
return ret;
}