[Pkg-libvirt-commits] [libguestfs] 06/40: p2v: Rename guest.xml -> physical.xml.

[Hilko Bengen]

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

bengen pushed a commit to annotated tag debian/1%1.27.57-1
in repository libguestfs.

commit c9f2e4e7f152e89ed3b4b19d38151b119d27631d
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Sat Sep 27 17:11:51 2014 +0100

    p2v: Rename guest.xml -> physical.xml.
---
 p2v/conversion.c |  2 +-
 p2v/ssh.c        |  2 +-
 p2v/virt-p2v.pod | 22 +++++++++++-----------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/p2v/conversion.c b/p2v/conversion.c
index ced9026..26074b6 100644
--- a/p2v/conversion.c
+++ b/p2v/conversion.c
@@ -253,7 +253,7 @@ start_conversion (struct config *config,
   }
   if (mexp_printf (control_h, " --root first") == -1)
     goto printf_fail;
-  if (mexp_printf (control_h, " %s/guest.xml", remote_dir) == -1)
+  if (mexp_printf (control_h, " %s/physical.xml", remote_dir) == -1)
     goto printf_fail;
   /* no stdin, and send stdout and stderr to the same place */
   if (mexp_printf (control_h, " </dev/null 2>&1") == -1)
diff --git a/p2v/ssh.c b/p2v/ssh.c
index 15ca50c..7b6786f 100644
--- a/p2v/ssh.c
+++ b/p2v/ssh.c
@@ -706,7 +706,7 @@ start_remote_connection (struct config *config,
 
   /* Upload the guest libvirt XML to the remote directory. */
   if (mexp_printf (h,
-                   "cat > '%s/guest.xml' << '__%s__'\n"
+                   "cat > '%s/physical.xml' << '__%s__'\n"
                    "%s"
                    "__%s__\n",
                    remote_dir, magic,
diff --git a/p2v/virt-p2v.pod b/p2v/virt-p2v.pod
index 14f2c64..42e6f90 100644
--- a/p2v/virt-p2v.pod
+++ b/p2v/virt-p2v.pod
@@ -291,7 +291,13 @@ Into this directory are written various files which include:
 
 =over 4
 
-=item C<guest.xml>
+=item C<name>
+
+I<before conversion>
+
+The name (usually the hostname) of the physical machine.
+
+=item C<physical.xml>
 
 I<before conversion>
 
@@ -303,12 +309,6 @@ Note this is not "real" libvirt XML (and must B<never> be loaded into
 libvirt, which would reject it anyhow).  Also it is not the same as
 the libvirt XML which virt-v2v generates in certain output modes.
 
-=item C<name>
-
-I<before conversion>
-
-The name (usually the hostname) of the physical machine.
-
 =item C<status>
 
 I<after conversion>
@@ -368,10 +368,10 @@ used.  Secondly libguestfs creates an overlay on top of the NBD
 connection which stores writes in a temporary file on the conversion
 file.
 
-The final step is to send the virt-v2v command to the conversion
-server over the control connection.  This references the C<guest.xml>
-file (see above), which in turn references the NBD listening port(s)
-of the data connection(s).
+The final step is to send the S<C<virt-v2v -i libvirtxml physical.xml ...>>
+command to the conversion server over the control connection.  This
+references the C<physical.xml> file (see above), which in turn
+references the NBD listening port(s) of the data connection(s).
 
 Output from the virt-v2v command (messages, debugging etc) is saved
 both in the log file on the conversion server, and sent over the

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