[Pkg-libvirt-commits] [libguestfs] 120/146: p2v: Move debug message earlier.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository libguestfs.

commit e0c28a1d5fcf266d3c813f3bbd9a8918885b3e85
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Jan 20 07:58:34 2015 +0000

    p2v: Move debug message earlier.
    
    This ensures we can see the port numbers even when the
    connection fails.
    
    (cherry picked from commit 0b54e111e42a4433064a4167f29081d870cb0ad7)
---
 p2v/conversion.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/p2v/conversion.c b/p2v/conversion.c
index 14e7b3b..f30fc63 100644
--- a/p2v/conversion.c
+++ b/p2v/conversion.c
@@ -157,6 +157,13 @@ start_conversion (struct config *config,
       exit (EXIT_FAILURE);
     }
 
+#if DEBUG_STDERR
+    fprintf (stderr,
+             "%s: data connection for %s: SSH remote port %d, local port %d\n",
+             program_name, device,
+             data_conns[i].nbd_remote_port, data_conns[i].nbd_local_port);
+#endif
+
     /* Start qemu-nbd listening on the given port number. */
     data_conns[i].nbd_pid =
       start_qemu_nbd (data_conns[i].nbd_local_port, device);
@@ -167,13 +174,6 @@ start_conversion (struct config *config,
     if (wait_qemu_nbd (data_conns[i].nbd_local_port,
                        WAIT_QEMU_NBD_TIMEOUT) == -1)
       goto out;
-
-#if DEBUG_STDERR
-    fprintf (stderr,
-             "%s: data connection for %s: SSH remote port %d, local port %d\n",
-             program_name, device,
-             data_conns[i].nbd_remote_port, data_conns[i].nbd_local_port);
-#endif
   }
 
   /* Create a remote directory name which will be used for libvirt

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git