search for: string_find

It will be used for the OCaml unit tests. --- configure.ac | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure.ac b/configure.ac index e0fb481..e360bbb 100644 --- a/configure.ac +++ b/configure.ac @@ -1120,6 +1120,7 @@ AS_IF([test "x$OCAMLC" != "xno"],[ ]) OCAML_PKG_gettext=no +OCAML_PKG_oUnit=no AS_IF([test "x$OCAMLC" != "xno"],[ #

..._suffix,foo,foo" (string_suffix "foo" "foo"); + assert_bool "string_suffix,123foo,foo" (string_suffix "123foo" "foo"); + assert_bool "not string_suffix,,foo" (not (string_suffix "" "foo")) + +(* Test Common_utils.string_find. *) +let test_string_find () = + assert_equal_int 0 (string_find "" ""); + assert_equal_int 0 (string_find "foo" ""); + assert_equal_int 1 (string_find "foo" "o"); + assert_equal_int 3 (string_find "foobar" "bar");...

Since v2: - Use string_suffix kernel_name "-debug" || string_suffix kernel_name "-dbg" - This requires addition of the string_suffix function and some tests

This is just a straight refactoring. Various ad hoc string_* functions that appeared in Common_utils have been renamed and placed in the String.* namespace. The old vs "new" functions are: string_prefix -> String.is_prefix string_suffix -> String.is_suffix string_find -> String.find replace_str -> String.replace string_nsplit -> String.nsplit string_split -> String.split string_lines_split -> String.lines_split string_random8 -> String.random8 --- builder/checksums.ml | 2 +- builder/downloader.ml...

Hide/prevent the use of bad string functions like String.lowercase. These are replaced by safe functions that won't break UTF-8 strings. Other miscellaneous refactoring. Rich.

...uot;foo" ""); assert_bool "string_suffix,foo,foo" (string_suffix "foo" "foo"); @@ -103,7 +103,7 @@ let test_string_suffix () = assert_bool "not string_suffix,,foo" (not (string_suffix "" "foo")) (* Test Common_utils.string_find. *) -let test_string_find () = +let test_string_find ctx = assert_equal_int 0 (string_find "" ""); assert_equal_int 0 (string_find "foo" ""); assert_equal_int 1 (string_find "foo" "o"); @@ -112,7 +112,7 @@ let test_string_find ()...

...insertion(+), 1 deletion(-) diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index adbcaa2..1e9e689 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -581,7 +581,7 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source = List.filter (fun s -> string_find s library = -1) provides in (* Trim whitespace. *) - let rex = Str.regexp "^[ \\t]*\\([^ \\t]+\\)[ \\t]*$" in + let rex = Str.regexp "^[ \t]*\\([^ \t]+\\)[ \t]*$" in let provides = List.map (Str.replace_first rex "\\1")...

...just a straight refactoring. Various ad hoc string_* > functions that appeared in Common_utils have been renamed and placed > in the String.* namespace. The old vs "new" functions are: > > string_prefix -> String.is_prefix > string_suffix -> String.is_suffix > string_find -> String.find > replace_str -> String.replace > string_nsplit -> String.nsplit > string_split -> String.split > string_lines_split -> String.lines_split > string_random8 -> String.random8 > --- As mentioned yesterday on IRC, I'm torn about this one...

...upports_virtio = List.mem "virtio_net" modules in let is_xen_kernel = List.mem "xennet" modules in + (* If the package name is like "kernel-debug", then it's + * a debug kernel. + *) + let is_debug = string_find app.G.app2_name "debug" >= 0 in + Some { ki_app = app; ki_name = name; @@ -253,6 +259,7 @@ let rec convert ~verbose ~keep_serial_console (g : G.guestfs) inspect source = ki_modules = modules; ki_supports_vir...

...List.exists (fun fs' -> fs = g#canonical_device_name fs') ignores in + let is_readonly_btrfs_snapshot fs mp = + try + let is_btrfs = List.mem fs btrfs_filesystems in + if is_btrfs then ( + try + let vol_info = g#btrfs_subvolume_show mp in + string_find (List.assoc "Flags" vol_info) "readonly" <> -1 + with _ -> false + ) else false + with Not_found -> false + in + List.iter ( fun fs -> if not (is_ignored fs) then ( @@ -230,10 +247,15 @@ You can ignore this warning or change it to a...

Nikita, Please take a look at the attached patch. I have rewritten it a little, and only lightly tested it. Rich.

...gt; type overlay = { > - ov_overlay : string; (** Local overlay file (qcow2 format). *) > + ov_overlay : string; (** Local overlgy file (qcow2 format). *) Typo added. > +let string_contains s1 s2 = There's a function already defined for this in mllib/common_utils.ml. `string_find'. It returns -1 if not found, or >= 0 if found. > +let read_file filename = See mllib/common_utils.ml `read_whole_file'. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com...

...:(fun x -> Int64.to_string x) +let assert_equal_stringlist = assert_equal ~printer:(fun x -> "(" ^ (String.escaped (String.concat "," x)) ^ ")") (* Test Common_utils.int_of_le32 and Common_utils.le32_of_int. *) let test_le32 () = @@ -110,6 +111,22 @@ let test_string_find () = assert_equal_int (-1) (string_find "" "baz"); assert_equal_int (-1) (string_find "foobar" "baz") +(* Test Common_utils.string_lines_split. *) +let test_string_lines_split () = + assert_equal_stringlist [""] (string_lines_split "&q...

...what version of Windows - * this driver is for. Paths can be things like: - * "NetKVM/2k12R2/amd64/netkvm.sys" or - * "./drivers/amd64/Win2012R2/netkvm.sys". - * Note we check lowercase paths. - *) - let pathelem elem = string_find lc_path ("/" ^ elem ^ "/") >= 0 in - let arch = - if pathelem "x86" || pathelem "i386" then "i386" - else if pathelem "amd64" then "x86_64" - else raise Not_found in - let os_...

...t;virtio_net" modules in > let is_xen_kernel = List.mem "xennet" modules in > > + (* If the package name is like "kernel-debug", then it's > + * a debug kernel. > + *) > + let is_debug = string_find app.G.app2_name "debug" >= 0 in What about something like (simplified): let is_debug = string_suffix app2_name "-debug" || string_suffix app2_name "-dbg" in ? This should avoid matching "debug" in other parts of the package name (unlik...

...upports_virtio = List.mem "virtio_net" modules in let is_xen_kernel = List.mem "xennet" modules in + (* If the package name is like "kernel-debug", then it's + * a debug kernel. + *) + let is_debug = string_find app.G.app2_name "debug" >= 0 in + Some { ki_app = app; ki_name = name; @@ -253,6 +259,7 @@ let rec convert ~verbose ~keep_serial_console (g : G.guestfs) inspect source = ki_modules = modules; ki_supports_vir...

Libguestfs supports passing an ISO image as a source of virtio windows drivers to v2v. That support, however, looks too heavy-weight: in order to access those drivers, a separate guestfs handle is created (and thus a new emulator process is started), which runs until v2v completes. This series attempts to make it simpler and lighter-weight, by making the relevant code more local, and by

Shahar: This is the same patch as you posted, but I have rebased it on top of current HEAD. You'll have to do save the next email to a file, and do: git reset --hard HEAD^ git pull git am /path/to/saved_email There are no changes in this patch, except what is needed to make it compile. Will follow-up with comments. Rich.

...what version of Windows + * this driver is for. Paths can be things like: + * "NetKVM/2k12R2/amd64/netkvm.sys" or + * "./drivers/amd64/Win2012R2/netkvm.sys". + * Note we check lowercase paths. + *) + let pathelem elem = string_find lc_path ("/" ^ elem ^ "/") >= 0 in + let arch = + if pathelem "x86" || pathelem "i386" then "i386" + else if pathelem "amd64" then "x86_64" + else raise Not_found in + let os_...

In version 2: - Add a bunch of debugging output. - Recognize Windows Vista, Windows 10. - Compare driver paths case-insensitively.