On Tue, Oct 17, 2017 at 02:22:00PM +0200, Pino Toscano wrote:
Updates commit f87f254b2bcda09713d908451f29512ec4286626.
---
v2v/input_libvirt_xen_ssh.ml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/v2v/input_libvirt_xen_ssh.ml b/v2v/input_libvirt_xen_ssh.ml
index a1b1dfa1e..545a8f5da 100644
--- a/v2v/input_libvirt_xen_ssh.ml
+++ b/v2v/input_libvirt_xen_ssh.ml
@@ -34,16 +34,16 @@ class input_libvirt_xen_ssh password libvirt_uri parsed_uri scheme
server guest
object
inherit input_libvirt password libvirt_uri guest
+ method precheck () =
+ if backend_is_libvirt () then
+ error (f_"because of libvirt bug
https://bugzilla.redhat.com/1140166 you must
set this environment variable:\n\nexport LIBGUESTFS_BACKEND=direct\n\nand then rerun the
virt-v2v command.");
+ error_if_libvirt_does_not_support_json_backingfile ();
+ error_if_no_ssh_agent ()
+
method source () =
debug "input_libvirt_xen_ssh: source: scheme %s server %s"
scheme server;
- if backend_is_libvirt () then (
- error (f_"because of libvirt bug
https://bugzilla.redhat.com/1140166 you must
set this environment variable:\n\nexport LIBGUESTFS_BACKEND=direct\n\nand then rerun the
virt-v2v command.")
- );
- error_if_libvirt_does_not_support_json_backingfile ();
- error_if_no_ssh_agent ();
-
(* Get the libvirt XML. This also checks (as a side-effect)
* that the domain is not running. (RHBZ#1138586)
*)
I don't know how I missed that :-/
ACK.
Rich.
--
Richard Jones, Virtualization Group, Red Hat
http://people.redhat.com/~rjones
Read my programming and virtualization blog:
http://rwmj.wordpress.com
virt-builder quickly builds VMs from scratch
http://libguestfs.org/virt-builder.1.html