# HG changeset patch # User Dan Smith <danms@us.ibm.com> # Date 1196787356 28800 # Node ID bde7af5c35fa76a58a825817f181d2e6a08096ee # Parent b71790bb1ff44e6cbd8eebf28caee6ce3c21a340 Add ElementCapabilities support for VirtualSystemMigrationCapabilities Signed-off-by: Dan Smith <danms@us.ibm.com> diff -r b71790bb1ff4 -r bde7af5c35fa src/Makefile.am --- a/src/Makefile.am Tue Dec 04 08:55:55 2007 -0800 +++ b/src/Makefile.am Tue Dec 04 08:55:56 2007 -0800 @@ -88,12 +88,13 @@ libVirt_ElementConformsToProfile_la_LIBA libVirt_EnabledLogicalElementCapabilities_la_SOURCES = Virt_EnabledLogicalElementCapabilities.c -libVirt_ElementCapabilities_la_DEPENDENCIES = libVirt_VirtualSystemManagementCapabilities.la libVirt_EnabledLogicalElementCapabilities.la libVirt_ComputerSystem.la libVirt_HostSystem.la +libVirt_ElementCapabilities_la_DEPENDENCIES = libVirt_VirtualSystemManagementCapabilities.la libVirt_EnabledLogicalElementCapabilities.la libVirt_ComputerSystem.la libVirt_HostSystem.la libVirt_VSMigrationCapabilities.la libVirt_ElementCapabilities_la_SOURCES = Virt_ElementCapabilities.c libVirt_ElementCapabilities_la_LIBADD = -lVirt_VirtualSystemManagementCapabilities \ -lVirt_EnabledLogicalElementCapabilities \ -lVirt_ComputerSystem \ - -lVirt_HostSystem + -lVirt_HostSystem \ + -lVirt_VSMigrationCapabilities libVirt_AllocationCapabilities_la_DEPENDENCIES = libVirt_RASD.la libVirt_DevicePool.la libVirt_AllocationCapabilities_la_SOURCES = Virt_AllocationCapabilities.c diff -r b71790bb1ff4 -r bde7af5c35fa src/Virt_ElementCapabilities.c --- a/src/Virt_ElementCapabilities.c Tue Dec 04 08:55:55 2007 -0800 +++ b/src/Virt_ElementCapabilities.c Tue Dec 04 08:55:56 2007 -0800 @@ -37,6 +37,7 @@ #include "Virt_EnabledLogicalElementCapabilities.h" #include "Virt_ComputerSystem.h" #include "Virt_HostSystem.h" +#include "Virt_VSMigrationCapabilities.h" /* Associate an XXX_Capabilities to the proper XXX_ManagedElement. * @@ -70,6 +71,11 @@ static CMPIStatus sys_to_cap(const CMPIO s = get_vsm_cap(_BROKER, ref, &inst); if (s.rc == CMPI_RC_OK) inst_list_add(list, inst); + + s = get_migration_caps(ref, &inst, _BROKER); + if (s.rc == CMPI_RC_OK) + inst_list_add(list, inst); + out: return s; } @@ -249,8 +255,10 @@ char* host_system[] = { char* virtual_system_management_capabilities[] = { "Xen_VirtualSystemManagementCapabilities", + "Xen_VirtualSystemMigrationCapabilities", "KVM_VirtualSystemManagementCapabilities", - NULL + "KVM_VirtualSystemMigrationCapabilities", + NULL, }; struct std_assoc system_to_vsm_cap = {