search for: output_pool

...nly names. --- v2v/output_libvirt.ml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index 5fa338f..e934335 100644 --- a/v2v/output_libvirt.ml +++ b/v2v/output_libvirt.ml @@ -340,6 +340,7 @@ class output_libvirt oc output_pool = object inherit output val mutable capabilities_doc = None + val mutable pool_name = None method as_options = match oc with @@ -392,6 +393,15 @@ class output_libvirt oc output_pool = object | Some dir when not (is_directory dir) -> error (f_"-o libvirt:...

...ect. --- v2v/output_libvirt.ml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index d1e9346..1f66d6a 100644 --- a/v2v/output_libvirt.ml +++ b/v2v/output_libvirt.ml @@ -394,10 +394,12 @@ class output_libvirt oc output_pool = object (* We copied directly into the final pool directory. However we * have to tell libvirt. *) - let cmd = - match oc with - | None -> [ "virsh"; "pool-refresh"; output_pool ] - | Some uri -> [ "virsh"; "-c"; uri...

...etions(-) diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index 30857c572..e62e43bb8 100644 --- a/v2v/output_libvirt.ml +++ b/v2v/output_libvirt.ml @@ -59,11 +59,16 @@ let target_features_of_capabilities_doc doc arch = List.map Xml.node_name features ) -class output_libvirt oc output_pool = object +class output_libvirt oc output_pool = +object (self) inherit output val mutable capabilities_doc = None val mutable pool_name = None + val lazy_conn = lazy (Libvirt.Connect.connect ?name:oc ()) + + method private conn : Libvirt.rw Libvirt.Connect.t = + Lazy.force lazy_conn...

...ndex 0247e5ad..dfd5d1a3 100644 --- a/v2v/output_libvirt.ml +++ b/v2v/output_libvirt.ml @@ -105,9 +105,8 @@ object (self) (* Connect to output libvirt instance and check that the pool exists * and dump out its XML. *) - let xml = - let pool = Libvirt_utils.get_pool self#conn output_pool in - Libvirt.Pool.get_xml_desc (Libvirt.Pool.const pool) in + let pool = Libvirt_utils.get_pool self#conn output_pool in + let xml = Libvirt.Pool.get_xml_desc (Libvirt.Pool.const pool) in let doc = Xml.parse_memory xml in let xpathctx = Xml.xpath_new_context doc in let xpa...

...pic" set + else + set + ) features features_force in + + let features = List.sort compare (StringSet.elements features) in let disks = let block_prefix = @@ -202,12 +271,36 @@ let create_libvirt_xml ?pool source targets guestcaps = class output_libvirt verbose oc output_pool = object inherit output verbose + val mutable capabilities_doc = None + method as_options = match oc with | None -> sprintf "-o libvirt -os %s" output_pool | Some uri -> sprintf "-o libvirt -oc %s -os %s" uri output_pool method prepare_targets...

...final pool directory. However we * have to tell libvirt. *) - let cmd = [ "virsh" ] @ - (if quiet () then [ "-q" ] else []) @ - (match oc with - | None -> [] - | Some uri -> [ "-c"; uri; ]) @ - [ "pool-refresh"; output_pool ] in - if run_command cmd <> 0 then - warning (f_"could not refresh libvirt pool %s") output_pool; + (try + let pool = Libvirt_utils.get_pool self#conn output_pool in + Libvirt.Pool.refresh (Libvirt.Pool.const pool) + with + Libvirt.Virterror { message }...

...cal.ml | 13 +++++++++++-- v2v/output_qemu.ml | 4 ++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index 072b94f..33f69dc 100644 --- a/v2v/output_libvirt.ml +++ b/v2v/output_libvirt.ml @@ -76,8 +76,6 @@ class output_libvirt oc output_pool = object | None -> sprintf "-o libvirt -os %s" output_pool | Some uri -> sprintf "-o libvirt -oc %s -os %s" uri output_pool - method supported_firmware = [ TargetBIOS; TargetUEFI ] - method prepare_targets source targets = (* Get the capabilities from...

...Dump out the image properties so the user can set them. *) printf "Image properties:\n"; diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index db3a3fa..219388a 100644 --- a/v2v/output_libvirt.ml +++ b/v2v/output_libvirt.ml @@ -386,11 +386,9 @@ class output_libvirt oc output_pool = object *) let cmd = match oc with - | None -> sprintf "virsh pool-refresh %s" (quote output_pool) - | Some uri -> - sprintf "virsh -c %s pool-refresh %s" - (quote uri) (quote output_pool) in - if shell_command cmd <> 0...

...virt, and what actually gets defined. --- v2v/output_libvirt.ml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index abdd410..f86f336 100644 --- a/v2v/output_libvirt.ml +++ b/v2v/output_libvirt.ml @@ -407,6 +407,12 @@ class output_libvirt oc output_pool = object DOM.doc_to_chan chan doc; close_out chan; + if verbose () then ( + printf "resulting XML for libvirt:\n%!"; + DOM.doc_to_chan stdout doc; + printf "\n%!"; + ); + (* Define the domain in libvirt. *) let cmd = match oc wit...

Add an optional parameter to disable this behaviour, so the Curl module in v2v won't print user-sensible data (like passwords). --- builder/checksums.ml | 1 - builder/downloader.ml | 1 - builder/sigchecker.ml | 1 - mllib/common_utils.ml | 4 +++- mllib/common_utils.mli | 7 +++++-- v2v/curl.ml | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git

When importing from VMware via the libvirt driver, the libvirt driver can add an empty source bridge name: <interface type='bridge'> <mac address='00:01:02:03:04:05:06'/> <source bridge=''/> </interface> Replicate what we do on the -i ova path, and map these to "eth0", "eth1" etc. This also includes a bunch

...e targets target_buses guestcaps target_features target_firmware] creates the final libvirt XML diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index 1271bdc2f5e3..9008b05079cd 100644 --- a/v2v/output_libvirt.ml +++ b/v2v/output_libvirt.ml @@ -143,7 +143,7 @@ class output_libvirt oc output_pool = object error_unless_uefi_firmware guestcaps.gcaps_arch method create_metadata source targets - target_buses guestcaps _ target_firmware = + target_buses guestcaps inspect target_firmware = (* We copied directly into the final pool...

...triple [(major, minor, release)] version number of the libvirt library that we are linked against. *) diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index b5df8245f..e00cac24b 100644 --- a/v2v/output_libvirt.ml +++ b/v2v/output_libvirt.ml @@ -78,8 +78,10 @@ class output_libvirt oc output_pool = object | Some uri -> sprintf "-o libvirt -oc %s -os %s" uri output_pool method prepare_targets source targets = + let conn = Libvirt_utils.connect_ro ?conn:oc () in + (* Get the capabilities from libvirt. *) - let xml = Libvirt_utils.capabilities ?conn:oc () in +...

...ps > target_features target_firmware] creates the final libvirt XML > diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml > index 1271bdc2f5e3..9008b05079cd 100644 > --- a/v2v/output_libvirt.ml > +++ b/v2v/output_libvirt.ml > @@ -143,7 +143,7 @@ class output_libvirt oc output_pool = object > error_unless_uefi_firmware guestcaps.gcaps_arch > > method create_metadata source targets > - target_buses guestcaps _ target_firmware = > + target_buses guestcaps inspect target_firmware = > (* We copied...

...e targets target_buses guestcaps target_features target_firmware] creates the final libvirt XML diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index 1271bdc2f5e3..9008b05079cd 100644 --- a/v2v/output_libvirt.ml +++ b/v2v/output_libvirt.ml @@ -143,7 +143,7 @@ class output_libvirt oc output_pool = object error_unless_uefi_firmware guestcaps.gcaps_arch method create_metadata source targets - target_buses guestcaps _ target_firmware = + target_buses guestcaps inspect target_firmware = (* We copied directly into the final pool...

...[dom] may be a guest name, but not a UUID. *) val libvirt_get_version : unit -> int * int * int diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index e110897c2..30857c572 100644 --- a/v2v/output_libvirt.ml +++ b/v2v/output_libvirt.ml @@ -71,8 +71,17 @@ class output_libvirt oc output_pool = object | Some uri -> sprintf "-o libvirt -oc %s -os %s" uri output_pool method prepare_targets source overlays _ _ _ _ = + (* Open the connection to libvirt. *) + let conn = Libvirt.Connect.connect ?name:oc () in + (* Get the capabilities from libvirt. *) - le...

https://bugzilla.redhat.com/show_bug.cgi?id=889082

Hi, this series switches virt-2v to ocaml-libvirt, embedding the latest version of it from git. This way, it is possible to improve the way v2v connects to libvirt for both input, and output modules, and interacts with libvirt (e.g. no more virsh calls needed in virt-v2v). As side effect, virt-v2v now requires libvirt, as keeping it optional would create too much burden. I could not test all

...et image properties (ignored)"); (* Dump out the image properties so the user can set them. *) diff --git a/v2v/output_libvirt.ml b/v2v/output_libvirt.ml index bedd6b4..7e04a54 100644 --- a/v2v/output_libvirt.ml +++ b/v2v/output_libvirt.ml @@ -318,7 +318,7 @@ class output_libvirt oc output_pool = object method prepare_targets source targets = (* Get the capabilities from libvirt. *) let xml = Domainxml.capabilities ?conn:oc () in - if verbose () then printf "libvirt capabilities XML:\n%s\n%!" xml; + debug "libvirt capabilities XML:\n%s" xml; (...

Add a Common_utils.debug function for printing messages only when in verbose mode. Rich.