[libvirt] [PATCH] libxl: report correct errno from virNetSocketNewConnectTCP on migration

Ian Campbell ian.campbell at citrix.com
Thu Sep 3 10:14:47 UTC 2015


saved_errno is never written to in this function after it is
initialised and it is only used to log the failure from
virNetSocketNewConnectTCP masking the real errno from that function.

Drop saved_errno and use errno itself.

Signed-off-by: Ian Campbell <ian.campbell at citrix.com>
---
 src/libxl/libxl_migration.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c
index 39e4a65..e291d71 100644
--- a/src/libxl/libxl_migration.c
+++ b/src/libxl/libxl_migration.c
@@ -480,7 +480,6 @@ libxlDomainMigrationPerform(libxlDriverPrivatePtr driver,
     virURIPtr uri = NULL;
     virNetSocketPtr sock;
     int sockfd = -1;
-    int saved_errno = EINVAL;
     int ret = -1;
 
     /* parse dst host:port from uri */
@@ -496,7 +495,7 @@ libxlDomainMigrationPerform(libxlDriverPrivatePtr driver,
     if (virNetSocketNewConnectTCP(hostname, portstr,
                                   AF_UNSPEC,
                                   &sock) < 0) {
-        virReportSystemError(saved_errno,
+        virReportSystemError(errno,
                              _("unable to connect to '%s:%s'"),
                              hostname, portstr);
         goto cleanup;
-- 
2.1.4




More information about the libvir-list mailing list