[Libguestfs] [PATCH 1/2] v2v: Make fstrim warning clearer (RHBZ#1366456).

[Richard W.M. Jones]

This reverts the change made for RHBZ#1168144.  The warning is now
always displayed.

It would be nice to make the warning actionable, but there is not a
lot that end users can do since fstrim is such a complex topic
interacting with all filesystem and storage layers.
---
 v2v/v2v.ml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/v2v/v2v.ml b/v2v/v2v.ml
index e221f29..8365aae 100644
--- a/v2v/v2v.ml
+++ b/v2v/v2v.ml
@@ -397,11 +397,7 @@ and do_fstrim g inspect =
       if mounted then (
         try g#fstrim "/"
         with G.Error msg ->
-          (* Only emit this warning when debugging, because otherwise
-           * it causes distress (RHBZ#1168144).
-           *)
-          if verbose () then
-            warning (f_"%s (ignored)") msg
+          warning (f_"fstrim on guest filesystem %s failed.  This may mean that conversion takes longer than normal.  Usually you can ignore this as fstrim is just an optimization.  Not all filesystems support trimming, and it can depend on specific details of the filesystem, alignment and backing storage.  Original message: %s") dev msg
       )
   ) fses
 
-- 
2.7.4