[Libguestfs] [PATCH] vCenter: pass user name to nbdkit curl plugin

2020-01-20 Thread Tomáš Golembiovský
Signed-off-by: Tomáš Golembiovský 
---
 v2v/vCenter.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2v/vCenter.ml b/v2v/vCenter.ml
index 89c5579b..d9bf12c1 100644
--- a/v2v/vCenter.ml
+++ b/v2v/vCenter.ml
@@ -79,7 +79,7 @@ let rec map_source ?bandwidth ?password_file dcPath uri 
server path =
 
   let nbdkit =
 Nbdkit.create_curl ?bandwidth ?cookie:session_cookie ~password ~sslverify
-   https_url in
+   ?user:uri.uri_user https_url in
   let qemu_uri = Nbdkit.run nbdkit in
 
   (* Return the struct. *)
-- 
2.24.1


___
Libguestfs mailing list
Libguestfs@redhat.com
https://www.redhat.com/mailman/listinfo/libguestfs

[Libguestfs] [PATCH] nbdkit: fix condition in probe_filter

2020-01-20 Thread Tomáš Golembiovský
The tests assume probe_filter returns true if the filter is available
(and not the other way around).

Signed-off-by: Tomáš Golembiovský 
---
 v2v/nbdkit.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2v/nbdkit.ml b/v2v/nbdkit.ml
index 77d2a506..00122bec 100644
--- a/v2v/nbdkit.ml
+++ b/v2v/nbdkit.ml
@@ -142,7 +142,7 @@ let common_create ?bandwidth plugin_name plugin_args 
plugin_env =
 let cmd =
   sprintf "%s nbdkit --dump-plugin --filter=%s null >/dev/null"
   env_as_string filter_name in
-Sys.command cmd <> 0
+Sys.command cmd == 0
   in
 
   (* Adding the readahead filter is always a win for our access
-- 
2.24.1


___
Libguestfs mailing list
Libguestfs@redhat.com
https://www.redhat.com/mailman/listinfo/libguestfs