search for: overlaydisk

It mimics a bit in OCaml the logic used in commit a95214b1985e694946e3426120a6fdc13a3f081f (for the main library) and commit 588af1953e5f7ab74009b9175cc5d3efb8bb651a (in disk-create), so in OCaml tools direct calls to qemu/qemu-img with filenames provided by the user can properly handle filenames with e.g. ':'. --- mllib/common_utils.ml | 13 +++++++++++++ mllib/common_utils.mli | 8

...x 3628b01..d4861f9 100644 --- a/sparsify/copying.ml +++ b/sparsify/copying.ml @@ -311,7 +311,7 @@ You can ignore this warning or change it to a hard failure using the (match option with | None -> "" | Some option -> " -o " ^ quote option) - (quote overlaydisk) (quote outdisk) in + (quote overlaydisk) (quote (qemu_input_filename outdisk)) in if verbose then printf "%s\n%!" cmd; if Sys.command cmd <> 0 then -- 1.9.3

...new G.guestfs () in - if trace () then g#set_trace true; - if verbose () then g#set_verbose true; + let g = open_guestfs () in (* Note that the temporary overlay disk is always qcow2 format. *) g#add_drive ~format:"qcow2" ~readonly:false ~cachemode:"unsafe" overlaydisk; diff --git a/sparsify/in_place.ml b/sparsify/in_place.ml index 3a2b32c..6a42a11 100644 --- a/sparsify/in_place.ml +++ b/sparsify/in_place.ml @@ -31,9 +31,7 @@ module G = Guestfs let rec run disk format ignores machine_readable zeroes = (* Connect to libguestfs. *) - let g = new G.guestfs ()...

This still isn't working at the moment. See: http://marc.info/?t=139457409300003&r=1&w=2 This set of patches: - Adds new APIs to support discard in libguestfs. - Adds discard support to virt-format. - Adds discard support to virt-sysprep. - Implements virt-sparsify --in-place. Rich.

The first patch is just some simple refactoring. See the second patch for a description of the new virt-sparsify --tmp option. I tested this using a loopback device as my temporary block device, and it seems to work fine for me. Federico .. this needs a BZ :-) Rich.

...cluding the potentially massive overlay file), we @@ -179,7 +179,7 @@ You can ignore this warning or change it to a hard failure using the (* Note that the temporary overlay disk is always qcow2 format. *) g#add_drive ~format:"qcow2" ~readonly:false ~cachemode:"unsafe" overlaydisk; - if not (quiet ()) then Progress.set_up_progress_bar ~machine_readable g; + if not (quiet ()) then Progress.set_up_progress_bar ~machine_readable:(machine_readable ()) g; g#launch (); g in diff --git a/sparsify/copying.mli b/sparsify/copying.mli index fae903d3e..50605cc71 1006...

Store the machine-readable flag globally, just like done for verbose/debug/etc, and enhance create_standard_options to provide --machine-readable automatically. --- common/mlstdutils/std_utils.ml | 4 ++++ common/mlstdutils/std_utils.mli | 7 +++++-- common/mltools/tools_utils.ml | 7 ++++++- common/mltools/tools_utils.mli | 5 ++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff

...a/sparsify/copying.ml +++ b/sparsify/copying.ml @@ -179,7 +179,10 @@ You can ignore this warning or change it to a hard failure using the (* Note that the temporary overlay disk is always qcow2 format. *) g#add_drive ~format:"qcow2" ~readonly:false ~cachemode:"unsafe" overlaydisk; - if not (quiet ()) then Progress.set_up_progress_bar ~machine_readable:(machine_readable ()) g; + if not (quiet ()) then ( + let machine_readable = machine_readable () <> None in + Progress.set_up_progress_bar ~machine_readable g + ); g#launch (); g in diff...

..._size virtual_size); let print_warning () = let free_space = statvfs_free_space tmpdir in @@ -327,8 +326,7 @@ You can ignore this warning or change it to a hard failure using the | None -> "" | Some option -> " -o " ^ quote option) (quote overlaydisk) (quote (qemu_input_filename outdisk)) in - if verbose () then - printf "%s\n%!" cmd; + debug "%s" cmd; if Sys.command cmd <> 0 then error (f_"external command failed: %s") cmd; diff --git a/v2v/convert_windows.ml b/v2v/convert_windows.ml index 5da...

Hi, this adds the possibility to select the output for --machine-readable in OCaml tools. The possible choices are: * --machine-readable: to stdout, like before * --machine-readable=file:name-of-file: to the specified file * --machine-readable=stream:stdout: explicitly to stdout * --machine-readable=stream:stderr: explicitly to stderr This makes it possible to add additional output for

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

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

A lot of code runs 'qemu-img create' or 'truncate' to create blank disk images. In the past I resisted adding an API to do this, since it essentially duplicates what you can already do using other tools (ie. qemu-img). However this does simplify calling code quite a lot since qemu-img is somewhat error-prone to use (eg: don't try to create a disk called "foo:bar")

...trace true; - if verbose then g#set_verbose true; + if trace () then g#set_trace true; + if verbose () then g#set_verbose true; (* Note that the temporary overlay disk is always qcow2 format. *) g#add_drive ~format:"qcow2" ~readonly:false ~cachemode:"unsafe" overlaydisk; @@ -346,7 +346,7 @@ You can ignore this warning or change it to a hard failure using the | None -> "" | Some option -> " -o " ^ quote option) (quote overlaydisk) (quote (qemu_input_filename outdisk)) in - if verbose then + if verbose () then pr...

Version 1 of the patch, for discussion, but not to be applied. It does work, but needs a lot more testing. This removes all the psychopathic gettextify cruft, and replaces it with a 99 line Makefile.am. A large win, I think. The third patch implements gettext support in the OCaml tools. The fourth patch is just for illustration. It shows the consequent changes to libguestfs.pot and the po

This rather complex set of patches allow non-optargs functions to gain optional arguments, while preserving source and binary backwards compatibility. The problem is that we cannot add an optional argument to an existing function. For example, we might want to add flags to the 'lvresize' API which currently has no optional arguments.

.. and a lot of refactoring. https://bugzilla.redhat.com/show_bug.cgi?id=1167623 Rich.

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