# HG changeset patch # User root@hyperion.shrike # Node ID 22a27900bf21ea957e60803decd8070740666842 # Parent 25962bc0d49ad3a8d13ad221a9c291dadbb90530 This set of patches allows the providers to be compiled with the tip of the unstable tree. There are still two open problems - integration with the vdi code - NIC model. I am seeing some Segfaults with this and I am working on fixing them Signed-off-by: Raj Subrahmanian diff -r 25962bc0d49a -r 22a27900bf21 src/Xen_VirtualSystemManagementService_Resource.c --- a/src/Xen_VirtualSystemManagementService_Resource.c Wed Apr 04 22:46:28 2007 -0400 +++ b/src/Xen_VirtualSystemManagementService_Resource.c Thu Apr 05 14:13:36 2007 -0400 @@ -72,7 +72,7 @@ static int populate_resource(xen_utils_s /* Get version */ xen_host host = NULL; - xen_session_get_this_host(session->xen, &host); + xen_session_get_this_host(session->xen, &host, session->xen); xen_host_get_software_version(session->xen, &((*resource)->versions), host); xen_host_free(host); @@ -260,7 +260,7 @@ int Xen_VirtualSystemManagementService_d int rc; xen_host host; - if (!xen_session_get_this_host(session->xen, &host)) { + if (!xen_session_get_this_host(session->xen, &host, session->xen)) { /* Error description in session object. */ return 0; } @@ -283,7 +283,7 @@ int Xen_VirtualSystemManagementService_e int rc; xen_host host; - if (!xen_session_get_this_host(session->xen, &host)) { + if (!xen_session_get_this_host(session->xen, &host, session->xen)) { /* Error description in session object. */ return 0; } diff -r 25962bc0d49a -r 22a27900bf21 src/xen_utils.c --- a/src/xen_utils.c Wed Apr 04 22:46:28 2007 -0400 +++ b/src/xen_utils.c Thu Apr 05 14:13:36 2007 -0400 @@ -315,7 +315,7 @@ static xen_vm_set* xen_utils_enum_domain xen_vm_set *resident_vms; char error_msg[XEN_UTILS_ERROR_BUF_LEN]; - if (!xen_session_get_this_host(session, &host)) { + if (!xen_session_get_this_host(session, &host, session)) { /* Error description in session object. */ XEN_UTILS_GET_ERROR_STRING(error_msg, session); _SBLIM_TRACE(1, ("--- xen_session_get_this_host failed: \"%s\"", error_msg)); @@ -440,7 +440,7 @@ int xen_utils_validate_session(xen_utils /* Clear any errors and attempt a simple call */ s->xen->ok = 1; xen_host host; - if (xen_session_get_this_host(s->xen, &host) && s->xen->ok) { + if (xen_session_get_this_host(s->xen, &host, s->xen) && s->xen->ok) { xen_host_free(host); return 1; }