From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Thu, 26 Aug 2010 22:07:23 +0000 (+0200)
Subject: esx: Fix esxVI_BuildSelectSet's invalid argument check
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e1bd99ab7e10cd87fb0f35f08d59004ed1ad52a2;p=libvirt.git

esx: Fix esxVI_BuildSelectSet's invalid argument check

The check was altered in 8c48743b9737ad4d246ab6043fd299316f9a2091
and got too strict, I've no clue how that snuck in. This check
makes every try to open a connection using the ESX driver fail
with an invalid argument error.

Revert the change to the check and add a comment to prevent future
mistakes with this check.
---

diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index 1c6f6ffcba..2359e8fe31 100644
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -1390,7 +1390,11 @@ esxVI_BuildSelectSet(esxVI_SelectionSpec **selectSet,
     esxVI_SelectionSpec *selectionSpec = NULL;
     const char *currentSelectSetName = NULL;
 
-    if (selectSet == NULL || *selectSet != NULL) {
+    if (selectSet == NULL) {
+        /*
+         * Don't check for *selectSet != NULL here because selectSet is a list
+         * and might contain items already. This function appends to selectSet.
+         */
         ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument"));
         return -1;
     }