[PATCH v3 repost] esx: Add the actual product version to the error message.

["Richard W.M. Jones" <rjones@xxxxxxxxxx>]

Really this should be a warning, not an error, but at least let's
print out the product version so we have a hope of diagnosing the
problem.

error: internal error: v2v-vcenter is neither an ESX 3.5, 4.x nor 5.x host (product version = 0x40007)

In this instance the error was that you have to use 'vpx://'
instead of 'esx://'.
---
 src/esx/esx_driver.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 39784b9..21ebe82 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -704,8 +704,9 @@ esxConnectToHost(esxPrivate *priv,
             priv->host->productVersion != esxVI_ProductVersion_ESX51 &&
             priv->host->productVersion != esxVI_ProductVersion_ESX5x) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("%s is neither an ESX 3.5, 4.x nor 5.x host"),
-                           conn->uri->server);
+                           _("%s is neither an ESX 3.5, 4.x nor 5.x host "
+                             "(product version = 0x%x)"),
+                           conn->uri->server, priv->host->productVersion);
             goto cleanup;
         }
     } else { /* GSX */
@@ -823,8 +824,9 @@ esxConnectToVCenter(esxPrivate *priv,
         priv->vCenter->productVersion != esxVI_ProductVersion_VPX51 &&
         priv->vCenter->productVersion != esxVI_ProductVersion_VPX5x) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("%s is neither a vCenter 2.5, 4.x nor 5.x server"),
-                       hostname);
+                       _("%s is neither a vCenter 2.5, 4.x nor 5.x server "
+                         "(product version = 0x%x)"),
+                       hostname, priv->vCenter->productVersion);
         goto cleanup;
     }
 
-- 
2.0.4

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list