# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1222736895 25200 # Node ID ed531540158bb3ad8f7c0f47252442c9ed83bbc0 # Parent 407ad692aa963c7e07ad92b06f19cfef562b235a Remove MemoryAllocationCapabilities from EC. This class doesn't exist. Also remove the virtual_system_management_capabilities struct. It's now identical to the host_caps struct. Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r 407ad692aa96 -r ed531540158b src/Virt_ElementCapabilities.c --- a/src/Virt_ElementCapabilities.c Mon Sep 29 10:46:57 2008 -0700 +++ b/src/Virt_ElementCapabilities.c Mon Sep 29 18:08:15 2008 -0700 @@ -391,16 +391,6 @@ NULL }; -static char* virtual_system_management_capabilities[] = { - "Xen_VirtualSystemManagementCapabilities", - "Xen_VirtualSystemMigrationCapabilities", - "KVM_VirtualSystemManagementCapabilities", - "KVM_VirtualSystemMigrationCapabilities", - "LXC_VirtualSystemManagementCapabilities", - "LXC_VirtualSystemMigrationCapabilities", - NULL, -}; - static char *host_caps[] = { "Xen_VirtualSystemManagementCapabilities", "Xen_VirtualSystemMigrationCapabilities", @@ -408,9 +398,6 @@ "KVM_VirtualSystemMigrationCapabilities", "LXC_VirtualSystemManagementCapabilities", "LXC_VirtualSystemMigrationCapabilities", - "Xen_MemoryAllocationCapabilities", - "KVM_MemoryAllocationCapabilities", - "LXC_MemoryAllocationCapabilities", NULL, }; @@ -428,7 +415,7 @@ }; static struct std_assoc vsm_cap_to_sys_or_service = { - .source_class = (char**)&virtual_system_management_capabilities, + .source_class = (char**)&host_caps, .source_prop = "Capabilities", .target_class = (char**)&host_sys_and_service, @@ -454,7 +441,7 @@ .source_class = (char**)&service, .source_prop = "ManagedElement", - .target_class = (char**)&virtual_system_management_capabilities, + .target_class = (char**)&host_caps, .target_prop = "Capabilities", .assoc_class = (char**)&assoc_classname,