On Thu, Feb 04, 2010 at 04:42:45PM +0100, Matthias Bolte wrote:
> ---
> src/esx/esx_vi.c | 14 ++++++--------
> 1 files changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
> index bc94326..19c85c5 100644
> --- a/src/esx/esx_vi.c
> +++ b/src/esx/esx_vi.c
> @@ -1317,16 +1317,18 @@ esxVI_BuildFullTraversalSpecList(esxVI_SelectionSpec **fullTraversalSpecList)
> * you try to call it. Query the session manager for the current session of
> * this connection instead and re-login if there is no current session for this
> * connection.
> + *
> + * Update: 'ESX 4.0.0 build-171294' doesn't implement this method.
> */
> #define ESX_VI_USE_SESSION_IS_ACTIVE 0
>
> int
> esxVI_EnsureSession(esxVI_Context *ctx)
> {
> - int result = 0;
> #if ESX_VI_USE_SESSION_IS_ACTIVE
> esxVI_Boolean active = esxVI_Boolean_Undefined;
> #else
> + int result = 0;
> esxVI_String *propertyNameList = NULL;
> esxVI_ObjectContent *sessionManager = NULL;
> esxVI_DynamicProperty *dynamicProperty = NULL;
> @@ -1352,6 +1354,8 @@ esxVI_EnsureSession(esxVI_Context *ctx)
> return -1;
> }
> }
> +
> + return 0;
> #else
> if (esxVI_String_AppendValueToList(&propertyNameList,
> "currentSession") < 0 ||
> @@ -1388,16 +1392,11 @@ esxVI_EnsureSession(esxVI_Context *ctx)
> "last login");
> goto failure;
> }
> -#endif
>
> cleanup:
> -#if ESX_VI_USE_SESSION_IS_ACTIVE
> - /* nothing */
> -#else
> esxVI_String_Free(&propertyNameList);
> esxVI_ObjectContent_Free(&sessionManager);
> esxVI_UserSession_Free(¤tSession);
> -#endif
>
> return result;
>
> @@ -1405,8 +1404,7 @@ esxVI_EnsureSession(esxVI_Context *ctx)
> result = -1;
>
> goto cleanup;
> -
> - return 0;
> +#endif
> }
ACK,
Daniel
--
Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/
daniel@xxxxxxxxxxxx | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library http://libvirt.org/
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list