[Libguestfs] [PATCH 3/4] v2v: pass libvirt connection URI to parse_libvirt_xml

This makes it possible to connect to the right libvirt. --- v2v/input_libvirt_other.ml | 2 +- v2v/input_libvirt_vcenter_https.ml | 2 +- v2v/input_libvirt_xen_ssh.ml | 2 +- v2v/input_libvirtxml.ml | 2 +- v2v/input_libvirtxml.mli | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/v2v/input_libvirt_other.ml b/v2v/input_libvirt_other.ml index 14a209c..48c6092 100644 --- a/v2v/input_libvirt_other.ml +++ b/v2v/input_libvirt_other.ml @@ -70,7 +70,7 @@ object *) let xml = Domainxml.dumpxml ?password ?conn:libvirt_uri guest in - let source, disks = Input_libvirtxml.parse_libvirt_xml ~verbose xml in + let source, disks = Input_libvirtxml.parse_libvirt_xml ?conn:libvirt_uri ~verbose xml in let disks = List.map (fun { Input_libvirtxml.p_source_disk = disk } -> disk) disks in { source with s_disks = disks } diff --git a/v2v/input_libvirt_vcenter_https.ml b/v2v/input_libvirt_vcenter_https.ml index 630894d..d45d602 100644 --- a/v2v/input_libvirt_vcenter_https.ml +++ b/v2v/input_libvirt_vcenter_https.ml @@ -298,7 +298,7 @@ object * that the domain is not running. (RHBZ#1138586) *) let xml = Domainxml.dumpxml ?password ?conn:libvirt_uri guest in - let source, disks = parse_libvirt_xml ~verbose xml in + let source, disks = parse_libvirt_xml ?conn:libvirt_uri ~verbose xml in (* Save the original source paths, so that we can remap them again * in [#adjust_overlay_parameters]. diff --git a/v2v/input_libvirt_xen_ssh.ml b/v2v/input_libvirt_xen_ssh.ml index 4a844c9..f8b0c7a 100644 --- a/v2v/input_libvirt_xen_ssh.ml +++ b/v2v/input_libvirt_xen_ssh.ml @@ -46,7 +46,7 @@ object * that the domain is not running. (RHBZ#1138586) *) let xml = Domainxml.dumpxml ?password ?conn:libvirt_uri guest in - let source, disks = parse_libvirt_xml ~verbose xml in + let source, disks = parse_libvirt_xml ?conn:libvirt_uri ~verbose xml in (* Map the <source/> filename (which is relative to the remote * Xen server) to an ssh URI. This is a JSON URI looking something diff --git a/v2v/input_libvirtxml.ml b/v2v/input_libvirtxml.ml index 2e8fa1f..ed850cd 100644 --- a/v2v/input_libvirtxml.ml +++ b/v2v/input_libvirtxml.ml @@ -33,7 +33,7 @@ and parsed_source = | P_source_file of string | P_dont_rewrite -let parse_libvirt_xml ~verbose xml = +let parse_libvirt_xml ?conn ~verbose xml = if verbose then printf "libvirt xml is:\n%s\n" xml; diff --git a/v2v/input_libvirtxml.mli b/v2v/input_libvirtxml.mli index 5674bb1..abe0c43 100644 --- a/v2v/input_libvirtxml.mli +++ b/v2v/input_libvirtxml.mli @@ -27,7 +27,7 @@ and parsed_source = | P_source_file of string (** <source file> *) | P_dont_rewrite (** s_qemu_uri is already set. *) -val parse_libvirt_xml : verbose:bool -> string -> Types.source * parsed_disk list +val parse_libvirt_xml : ?conn:string -> verbose:bool -> string -> Types.source * parsed_disk list (** Take libvirt XML and parse it into a {!Types.source} structure and a list of source disks. -- 2.1.0