search for: set_identifier

...(* Common function to create a new Guestfs handle, with common options * (e.g. debug, tracing) already set. *) -let open_guestfs () = +let open_guestfs ?identifier () = let g = new Guestfs.guestfs () in if trace () then g#set_trace true; if verbose () then g#set_verbose true; + may g#set_identifier identifier; g (* All the OCaml virt-* programs use this wrapper to catch exceptions diff --git a/mllib/common_utils.mli b/mllib/common_utils.mli index d8f63d5..44b8c93 100644 --- a/mllib/common_utils.mli +++ b/mllib/common_utils.mli @@ -152,7 +152,7 @@ val warning : ('a, unit, string, uni...

...git a/v2v/convert_windows.ml b/v2v/convert_windows.ml index 099ced2..fbd3ce1 100644 --- a/v2v/convert_windows.ml +++ b/v2v/convert_windows.ml @@ -296,7 +296,7 @@ echo uninstalling Xen PV driver else if is_regular_file virtio_win then ( try let g2 = open_guestfs () in - g#set_identifier "virtio_win"; + g2#set_identifier "virtio_win"; g2#add_drive_opts virtio_win ~readonly:true; g2#launch (); let vio_root = "/" in -- 2.1.0

The 'may' function is a higher-order function (HOF) that replaces: match x with | None -> () | Some x -> f x with: may f x The idea comes from lablgtk (OCaml Gtk bindings) where it is widely used. If this change is clearer than previous code, then this could be used in many more places. However I previously steered clear from using HOFs like this because they can be

....ml +++ b/v2v/v2v.ml @@ -60,19 +60,9 @@ let rec main () = let overlays = create_overlays source.s_disks in let targets = init_targets overlays source output output_format in - (* Open the guestfs handle. *) message (f_"Opening the overlay"); - let g = new G.guestfs () in - g#set_identifier "v2v"; - if trace () then g#set_trace true; - if verbose () then g#set_verbose true; - g#set_network true; - List.iter ( - fun ({ov_overlay_file = overlay_file}) -> - g#add_drive_opts overlay_file - ~format:"qcow2" ~cachemode:"unsafe" ~discard:&qu...

...-> Guestfs.guestfs +(* Create a new Guestfs handle, with common options (e.g. debug, tracing) + * already set. + *) diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 333ece0..88ae409 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -76,6 +76,8 @@ let rec main () = ); let g = open_guestfs () in + g#set_identifier "v2v"; + g#set_network true; (match conversion_mode with | Copying (overlays, _) -> populate_overlays g overlays | In_place -> populate_disks g source.s_disks @@ -284,15 +286,6 @@ and init_targets overlays source output output_format = output#prepare_targets source...

...l index 6402a63..099ced2 100644 --- a/v2v/convert_windows.ml +++ b/v2v/convert_windows.ml @@ -295,10 +295,8 @@ echo uninstalling Xen PV driver ) else if is_regular_file virtio_win then ( try - let g2 = new Guestfs.guestfs () in + let g2 = open_guestfs () in g#set_identifier "virtio_win"; - if trace () then g2#set_trace true; - if verbose () then g2#set_verbose true; g2#add_drive_opts virtio_win ~readonly:true; g2#launch (); let vio_root = "/" in diff --git a/v2v/input_disk.ml b/v2v/input_disk.ml index 970f55...

...v/convert_windows.ml > +++ b/v2v/convert_windows.ml > @@ -295,10 +295,8 @@ echo uninstalling Xen PV driver > ) > else if is_regular_file virtio_win then ( > try > - let g2 = new Guestfs.guestfs () in > + let g2 = open_guestfs () in > g#set_identifier "virtio_win"; > - if trace () then g2#set_trace true; > - if verbose () then g2#set_verbose true; > g2#add_drive_opts virtio_win ~readonly:true; > g2#launch (); > let vio_root = "/" in > diff --git a/v2v/input_disk.ml b/...

These 2 patches are mostly code motion. They were prompted by an apparent augeas error in BZ 613967 which didn't display useful error message. The error seems to happen in Converter::Linux. GuestOS::RedHat had a handy function which displayed verbose augeas error messages. This function moves into the new module where it can be used by both modules. The second patch is an consequential tidy

...+ +If set to true, SELinux contexts are restored. +Note this applies only if C<remotepath> is a directory. + +=item C<acls> + +If set to true, POSIX ACLs are restored. +Note this applies only if C<remotepath> is a directory. + +=back" }; { defaults with name = "set_identifier"; added = (1, 31, 14); diff --git a/gobject/Makefile.inc b/gobject/Makefile.inc index 55a137e..76482f7 100644 --- a/gobject/Makefile.inc +++ b/gobject/Makefile.inc @@ -67,6 +67,7 @@ guestfs_gobject_headers= \ include/guestfs-gobject/optargs-copy_device_to_file.h \ include/guestfs-gobject...

...r-order function (HOF) that replaces: > > match x with > | None -> () > | Some x -> f x > > with: > > may f x Another possibility is to break from lablgtk and call the function 'maybe', as in: g#set_trace trace; g#set_verbose verbose; maybe g#set_identifier identifier; ? Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and...

...dcards cannot be used. + +The other optional arguments are: + +=over 4 + +=item C<excludes> + +A list of wildcards. Files are excluded if they match any of the +wildcards. Note they are used only if C<remotepath> is a directory. + +=back" }; { defaults with name = "set_identifier"; added = (1, 31, 14); diff --git a/gobject/Makefile.inc b/gobject/Makefile.inc index 55a137e..76482f7 100644 --- a/gobject/Makefile.inc +++ b/gobject/Makefile.inc @@ -67,6 +67,7 @@ guestfs_gobject_headers= \ include/guestfs-gobject/optargs-copy_device_to_file.h \ include/guestfs-gobject...

...ools_utils.ml index f66ee9f50..8140ba84d 100644 --- a/common/mltools/tools_utils.ml +++ b/common/mltools/tools_utils.ml @@ -109,7 +109,7 @@ let open_guestfs ?identifier () = let g = new Guestfs.guestfs () in if trace () then g#set_trace true; if verbose () then g#set_verbose true; - may g#set_identifier identifier; + Option.may g#set_identifier identifier; g (* All the OCaml virt-* programs use this wrapper to catch exceptions @@ -340,8 +340,8 @@ and do_run ?(echo_cmd = true) ?stdout_chan ?stderr_chan args = Or 127 and do_teardown app outfd errfd exitstat = - may Unix.close outfd;...

Libguestfs supports passing an ISO image as a source of virtio windows drivers to v2v. This series attempts to make it simpler and better scoped. Roman Kagan (3): v2v: consolidate virtio-win file copying v2v: copy virtio drivers without guestfs handle leak v2v: drop useless forced gc --- changes since v2: - drop patch 4 (reuse of the master guestfs handle for hot-adding the ISO image)

...y libguestfs: trace: set_verbose true libguestfs: trace: set_verbose = 0 libguestfs: create: flags = 0, handle = 0x1f00280, program = virt-v2v libguestfs: trace: set_trace true libguestfs: trace: set_trace = 0 libguestfs: trace: set_verbose true libguestfs: trace: set_verbose = 0 libguestfs: trace: set_identifier "v2v" libguestfs: trace: v2v: set_identifier = 0 libguestfs: trace: v2v: get_memsize libguestfs: trace: v2v: get_memsize = 500 libguestfs: trace: v2v: set_memsize 2000 libguestfs: trace: v2v: set_memsize = 0 libguestfs: trace: v2v: set_network true libguestfs: trace: v2v: set_network = 0...

...GPIPE will cause an untidy exit of the perl process, without calling +# destructors. We don't rely on it anywhere, as we check for errors when reading +# from or writing to a pipe. +$SIG{'PIPE'} = 'IGNORE'; + # Initialise the message output prefix Sys::VirtV2V::UserMessage->set_identifier('virt-v2v'); @@ -362,9 +370,6 @@ if ($output_method eq 'rhev') { $> = "0"; } -$SIG{'INT'} = \&close_guest_handle; -$SIG{'QUIT'} = \&close_guest_handle; - # Inspect the guest my $os = inspect_guest($g); @@ -425,6 +430,12 @@ sub close...

This is very useful for debugging multithreaded programs. Rich.

...t; - let abs_path = virtio_win // path in - (path, abs_path, - Filename.basename path, - fun () -> read_whole_file abs_path) - ) paths - ) - else if is_regular_file virtio_win then ( - try - let g = new Guestfs.guestfs () in - g#set_identifier "virtio_win"; - if trace () then g#set_trace true; - if verbose () then g#set_verbose true; - g#add_drive_opts virtio_win ~readonly:true; - g#launch (); - g#mount_ro "/dev/sda" "/"; - let paths = g#find "/" in -...

...ts backing store and update the guest to using -the original storage. - -=cut - -my $rollback = 0; - -=item B<--rollback> - -Remove the snapshot and restore the guest to its previous, unmodified storage. - -=back - -=cut - -# Initialise the message output prefix -Sys::VirtV2V::UserMessage->set_identifier('v2v-snapshot'); - -GetOptions ("help|?" => \$help, - "version" => \$version, - "connect|c=s" => \$uri, - "input|i=s" => \$input, - "outputxml|o=s" => \$outputxml,...

v8: - split the big patch into several commits v7: - rebased because patch 1/3 has been pushed - changes to nsplit have been dropped (2/3) - addressed Richard's comments, notably the subfolder function was moved to mllib and renamed to subdirectory v6: - just rebase v5: - rebase, patches 1,3,5 were merged - 1/3: we still need to discuss whether to detect compressed discs - 2/3: -

Hi, this patch series does changes mostly in virt-dib, few bug fixes and a couple of new features (mostly implemented upstream already). In addition, one new API is added, and a new optional argument for an existing API is added (the latter is not needed, but could be useful anyway). Thanks, Pino Toscano (10): dib: fix listing envvars in fake-sudo dib: source dib "die" script in