[PATCH 00 of 11] #2 - Fix stale issue with threads for assocs

This patch set adds the missing static declarations to assocs. diff to patch set 1: - EC contained two typos

# HG changeset patch # User Heidi Eckhart <heidieck@linux.vnet.ibm.com> # Date 1202204968 -3600 # Node ID 32d3353796600f7ee064b77ecca0d22d17e3104e # Parent 108f192632bfd801a1f0520b8f20341a2c3a2f53 EAFP: fix stale issue with threads Signed-off-by: Heidi Eckhart <heidieck@linux.vnet.ibm.com> diff -r 108f192632bf -r 32d335379660 src/Virt_ElementAllocatedFromPool.c --- a/src/Virt_ElementAllocatedFromPool.c Mon Feb 04 08:35:03 2008 -0800 +++ b/src/Virt_ElementAllocatedFromPool.c Tue Feb 05 10:49:28 2008 +0100 @@ -228,7 +228,7 @@ static CMPIStatus pool_to_vdev(const CMP LIBVIRT_CIM_DEFAULT_MAKEREF() -char* antecedent[] = { +static char* antecedent[] = { "Xen_ProcessorPool", "Xen_MemoryPool", "Xen_NetworkPool", @@ -240,7 +240,7 @@ char* antecedent[] = { NULL }; -char* dependent[] = { +static char* dependent[] = { "Xen_Processor", "Xen_Memory", "Xen_NetworkPort", @@ -252,7 +252,7 @@ char* dependent[] = { NULL }; -char* assoc_classname[] = { +static char* assoc_classname[] = { "Xen_ElementAllocatedFromPool", "KVM_ElementAllocatedFromPool", NULL

# HG changeset patch # User Heidi Eckhart <heidieck@linux.vnet.ibm.com> # Date 1202208780 -3600 # Node ID 760d970b2ff7ac3fdc15450e15f7ab4e937d94af # Parent 32d3353796600f7ee064b77ecca0d22d17e3104e EC: fix stale issue with threads Signed-off-by: Heidi Eckhart <heidieck@linux.vnet.ibm.com> diff -r 32d335379660 -r 760d970b2ff7 src/Virt_ElementCapabilities.c --- a/src/Virt_ElementCapabilities.c Tue Feb 05 10:49:28 2008 +0100 +++ b/src/Virt_ElementCapabilities.c Tue Feb 05 11:53:00 2008 +0100 @@ -233,19 +233,19 @@ static CMPIStatus pool_to_alloc(const CM LIBVIRT_CIM_DEFAULT_MAKEREF() -char* assoc_classname[] = { +static char* assoc_classname[] = { "Xen_ElementCapabilities", "KVM_ElementCapabilities", NULL }; -char* host_system[] = { +static char* host_system[] = { "Xen_HostSystem", "KVM_HostSystem", NULL }; -char* virtual_system_management_capabilities[] = { +static char* virtual_system_management_capabilities[] = { "Xen_VirtualSystemManagementCapabilities", "Xen_VirtualSystemMigrationCapabilities", "KVM_VirtualSystemManagementCapabilities", @@ -253,7 +253,7 @@ char* virtual_system_management_capabili NULL, }; -struct std_assoc system_to_vsm_cap = { +static struct std_assoc system_to_vsm_cap = { .source_class = (char**)&host_system, .source_prop = "ManagedElement", @@ -266,7 +266,7 @@ struct std_assoc system_to_vsm_cap = { .make_ref = make_ref }; -struct std_assoc vsm_cap_to_system = { +static struct std_assoc vsm_cap_to_system = { .source_class = (char**)&virtual_system_management_capabilities, .source_prop = "Capabilities", @@ -279,19 +279,19 @@ struct std_assoc vsm_cap_to_system = { .make_ref = make_ref }; -char* computer_system[] = { +static char* computer_system[] = { "Xen_ComputerSystem", "KVM_ComputerSystem", NULL }; -char* enabled_logical_element_capabilities[] = { +static char* enabled_logical_element_capabilities[] = { "Xen_EnabledLogicalElementCapabilities", "KVM_EnabledLogicalElementCapabilities", NULL }; -struct std_assoc ele_cap_to_cs = { +static struct std_assoc ele_cap_to_cs = { .source_class = (char**)&enabled_logical_element_capabilities, .source_prop = "Capabilities", @@ -304,7 +304,7 @@ struct std_assoc ele_cap_to_cs = { .make_ref = make_ref }; -struct std_assoc cs_to_ele_cap = { +static struct std_assoc cs_to_ele_cap = { .source_class = (char**)&computer_system, .source_prop = "ManagedElement", @@ -317,13 +317,13 @@ struct std_assoc cs_to_ele_cap = { .make_ref = make_ref }; -char* allocation_capabilities[] = { +static char* allocation_capabilities[] = { "Xen_AllocationCapabilities", "KVM_AllocationCapabilities", NULL }; -char* resource_pool[] = { +static char* resource_pool[] = { "Xen_ProcessorPool", "Xen_MemoryPool", "Xen_NetworkPool", @@ -335,7 +335,7 @@ char* resource_pool[] = { NULL }; -struct std_assoc alloc_cap_to_resource_pool = { +static struct std_assoc alloc_cap_to_resource_pool = { .source_class = (char**)&allocation_capabilities, .source_prop = "Capabilities", @@ -348,7 +348,7 @@ struct std_assoc alloc_cap_to_resource_p .make_ref = make_ref }; -struct std_assoc resource_pool_to_alloc_cap = { +static struct std_assoc resource_pool_to_alloc_cap = { .source_class = (char**)&resource_pool, .source_prop = "ManagedElement", @@ -361,7 +361,7 @@ struct std_assoc resource_pool_to_alloc_ .make_ref = make_ref }; -struct std_assoc *assoc_handlers[] = { +static struct std_assoc *assoc_handlers[] = { &system_to_vsm_cap, &vsm_cap_to_system, &ele_cap_to_cs,

# HG changeset patch # User Heidi Eckhart <heidieck@linux.vnet.ibm.com> # Date 1202208795 -3600 # Node ID a74de7c13f806b7d9ba233c84c48277f7d1d92ce # Parent 760d970b2ff7ac3fdc15450e15f7ab4e937d94af ECTP: fix stale issue with threads Signed-off-by: Heidi Eckhart <heidieck@linux.vnet.ibm.com> diff -r 760d970b2ff7 -r a74de7c13f80 src/Virt_ElementConformsToProfile.c --- a/src/Virt_ElementConformsToProfile.c Tue Feb 05 11:53:00 2008 +0100 +++ b/src/Virt_ElementConformsToProfile.c Tue Feb 05 11:53:15 2008 +0100 @@ -192,13 +192,13 @@ static CMPIStatus elem_to_prof(const CMP LIBVIRT_CIM_DEFAULT_MAKEREF() -char* conformant_standard[] = { +static char* conformant_standard[] = { "Xen_RegisteredProfile", "KVM_RegisteredProfile", NULL }; -char* managed_element[] = { +static char* managed_element[] = { "Xen_HostSystem", "Xen_ComputerSystem", "KVM_HostSystem", @@ -206,13 +206,13 @@ char* managed_element[] = { NULL }; -char* assoc_classname[] = { +static char* assoc_classname[] = { "Xen_ElementConformsToProfile", "KVM_ElementConformsToProfile", NULL }; -struct std_assoc forward = { +static struct std_assoc forward = { .source_class = (char**)&conformant_standard, .source_prop = "ConformantStandard", @@ -225,7 +225,7 @@ struct std_assoc forward = { .make_ref = make_ref }; -struct std_assoc backward = { +static struct std_assoc backward = { .source_class = (char**)&managed_element, .source_prop = "ManagedElement", @@ -238,7 +238,7 @@ struct std_assoc backward = { .make_ref = make_ref }; -struct std_assoc *assoc_handlers[] = { +static struct std_assoc *assoc_handlers[] = { &forward, &backward, NULL

# HG changeset patch # User Heidi Eckhart <heidieck@linux.vnet.ibm.com> # Date 1202208795 -3600 # Node ID 50e5e752477d1784421c0daa279df45958ae59d8 # Parent a74de7c13f806b7d9ba233c84c48277f7d1d92ce ESD: fix stale issue with threads Signed-off-by: Heidi Eckhart <heidieck@linux.vnet.ibm.com> diff -r a74de7c13f80 -r 50e5e752477d src/Virt_ElementSettingData.c --- a/src/Virt_ElementSettingData.c Tue Feb 05 11:53:15 2008 +0100 +++ b/src/Virt_ElementSettingData.c Tue Feb 05 11:53:15 2008 +0100 @@ -160,13 +160,13 @@ static CMPIInstance *make_ref(const CMPI return refinst; } -char* virtual_system_setting_data[] = { +static char* virtual_system_setting_data[] = { "Xen_VirtualSystemSettingData", "KVM_VirtualSystemSettingData", NULL }; -char* resource_allocation_setting_data[] = { +static char* resource_allocation_setting_data[] = { "Xen_DiskResourceAllocationSettingData", "Xen_MemResourceAllocationSettingData", "Xen_NetResourceAllocationSettingData", @@ -178,7 +178,7 @@ char* resource_allocation_setting_data[] NULL }; -char* assoc_classname[] = { +static char* assoc_classname[] = { "Xen_ElementSettingData", "KVM_ElementSettingData", NULL

# HG changeset patch # User Heidi Eckhart <heidieck@linux.vnet.ibm.com> # Date 1202208796 -3600 # Node ID ea9ba48df4ae5d383720b6dae6ed5d3176555bc8 # Parent 50e5e752477d1784421c0daa279df45958ae59d8 HRP: fix stale issue with threads Signed-off-by: Heidi Eckhart <heidieck@linux.vnet.ibm.com> diff -r 50e5e752477d -r ea9ba48df4ae src/Virt_HostedResourcePool.c --- a/src/Virt_HostedResourcePool.c Tue Feb 05 11:53:15 2008 +0100 +++ b/src/Virt_HostedResourcePool.c Tue Feb 05 11:53:16 2008 +0100 @@ -94,13 +94,13 @@ static CMPIStatus sys_to_pool(const CMPI LIBVIRT_CIM_DEFAULT_MAKEREF() -char* group_component[] = { +static char* group_component[] = { "Xen_HostSystem", "KVM_HostSystem", NULL }; -char* part_component[] = { +static char* part_component[] = { "Xen_ProcessorPool", "Xen_MemoryPool", "Xen_NetworkPool", @@ -112,13 +112,13 @@ char* part_component[] = { NULL }; -char* assoc_classname[] = { +static char* assoc_classname[] = { "Xen_HostedResourcePool", "KVM_HostedResourcePool", NULL }; -struct std_assoc forward = { +static struct std_assoc forward = { .source_class = (char**)&part_component, .source_prop = "PartComponent", @@ -131,7 +131,7 @@ struct std_assoc forward = { .make_ref = make_ref }; -struct std_assoc backward = { +static struct std_assoc backward = { .source_class = (char**)&group_component, .source_prop = "GroupComponent", @@ -144,7 +144,7 @@ struct std_assoc backward = { .make_ref = make_ref }; -struct std_assoc *assoc_handlers[] = { +static struct std_assoc *assoc_handlers[] = { &forward, &backward, NULL

# HG changeset patch # User Heidi Eckhart <heidieck@linux.vnet.ibm.com> # Date 1202208796 -3600 # Node ID 639072fe628db4eb506e9af1d47cb0e90d5291ad # Parent ea9ba48df4ae5d383720b6dae6ed5d3176555bc8 HS: fix stale issue with threads Signed-off-by: Heidi Eckhart <heidieck@linux.vnet.ibm.com> diff -r ea9ba48df4ae -r 639072fe628d src/Virt_HostedService.c --- a/src/Virt_HostedService.c Tue Feb 05 11:53:16 2008 +0100 +++ b/src/Virt_HostedService.c Tue Feb 05 11:53:16 2008 +0100 @@ -128,13 +128,13 @@ static CMPIStatus host_to_service(const LIBVIRT_CIM_DEFAULT_MAKEREF() -char* antecedent[] = { +static char* antecedent[] = { "Xen_HostSystem", "KVM_HostSystem", NULL }; -char* dependent[] = { +static char* dependent[] = { "Xen_ResourcePoolConfigurationService", "Xen_VirtualSystemManagementService", "Xen_VirtualSystemMigrationService", @@ -144,7 +144,7 @@ char* dependent[] = { NULL }; -char* assoc_classname[] = { +static char* assoc_classname[] = { "Xen_HostedService", "KVM_HostedService", NULL

# HG changeset patch # User Heidi Eckhart <heidieck@linux.vnet.ibm.com> # Date 1202208797 -3600 # Node ID c49e722599eee4b1fb6296b1da6e64c0d879d829 # Parent 639072fe628db4eb506e9af1d47cb0e90d5291ad RAFP: fix stale issue with threads Signed-off-by: Heidi Eckhart <heidieck@linux.vnet.ibm.com> diff -r 639072fe628d -r c49e722599ee src/Virt_ResourceAllocationFromPool.c --- a/src/Virt_ResourceAllocationFromPool.c Tue Feb 05 11:53:16 2008 +0100 +++ b/src/Virt_ResourceAllocationFromPool.c Tue Feb 05 11:53:17 2008 +0100 @@ -245,7 +245,7 @@ static CMPIStatus pool_to_rasd(const CMP LIBVIRT_CIM_DEFAULT_MAKEREF() -char* antecedent[] = { +static char* antecedent[] = { "Xen_ProcessorPool", "Xen_MemoryPool", "Xen_NetworkPool", @@ -257,7 +257,7 @@ char* antecedent[] = { NULL }; -char* dependent[] = { +static char* dependent[] = { "Xen_DiskResourceAllocationSettingData", "Xen_MemResourceAllocationSettingData", "Xen_NetResourceAllocationSettingData", @@ -269,7 +269,7 @@ char* dependent[] = { NULL }; -char* assoc_classname[] = { +static char* assoc_classname[] = { "Xen_ResourceAllocationFromPool", "KVM_ResourceAllocationFromPool", NULL

# HG changeset patch # User Heidi Eckhart <heidieck@linux.vnet.ibm.com> # Date 1202208798 -3600 # Node ID 1208c17a1a11df7fd3fa118c6f222c95f4efd083 # Parent c49e722599eee4b1fb6296b1da6e64c0d879d829 SDC: fix stale issue with threads Signed-off-by: Heidi Eckhart <heidieck@linux.vnet.ibm.com> diff -r c49e722599ee -r 1208c17a1a11 src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Tue Feb 05 11:53:17 2008 +0100 +++ b/src/Virt_SettingsDefineCapabilities.c Tue Feb 05 11:53:18 2008 +0100 @@ -827,13 +827,13 @@ static CMPIStatus rasd_to_alloc_cap(cons LIBVIRT_CIM_DEFAULT_MAKEREF() -char* group_component[] = { +static char* group_component[] = { "Xen_AllocationCapabilities", "KVM_AllocationCapabilities", NULL }; -char* part_component[] = { +static char* part_component[] = { "Xen_DiskResourceAllocationSettingData", "Xen_MemResourceAllocationSettingData", "Xen_NetResourceAllocationSettingData", @@ -845,13 +845,13 @@ char* part_component[] = { NULL }; -char* assoc_classname[] = { +static char* assoc_classname[] = { "Xen_SettingsDefineCapabilities", "KVM_SettingsDefineCapabilities", NULL }; -struct std_assoc _alloc_cap_to_rasd = { +static struct std_assoc _alloc_cap_to_rasd = { .source_class = (char**)&group_component, .source_prop = "GroupComponent", @@ -864,7 +864,7 @@ struct std_assoc _alloc_cap_to_rasd = { .make_ref = make_ref }; -struct std_assoc _rasd_to_alloc_cap = { +static struct std_assoc _rasd_to_alloc_cap = { .source_class = (char**)&part_component, .source_prop = "PartComponent", @@ -877,7 +877,7 @@ struct std_assoc _rasd_to_alloc_cap = { .make_ref = make_ref }; -struct std_assoc *assoc_handlers[] = { +static struct std_assoc *assoc_handlers[] = { &_alloc_cap_to_rasd, &_rasd_to_alloc_cap, NULL

# HG changeset patch # User Heidi Eckhart <heidieck@linux.vnet.ibm.com> # Date 1202208798 -3600 # Node ID ca631d19373b61f60e83eddc4be4ca4176653647 # Parent 1208c17a1a11df7fd3fa118c6f222c95f4efd083 SDS: fix stale issue with threads Signed-off-by: Heidi Eckhart <heidieck@linux.vnet.ibm.com> diff -r 1208c17a1a11 -r ca631d19373b src/Virt_SettingsDefineState.c --- a/src/Virt_SettingsDefineState.c Tue Feb 05 11:53:18 2008 +0100 +++ b/src/Virt_SettingsDefineState.c Tue Feb 05 11:53:18 2008 +0100 @@ -290,7 +290,7 @@ static CMPIStatus vssd_to_vs(const CMPIO LIBVIRT_CIM_DEFAULT_MAKEREF() -char* logical_device[] = { +static char* logical_device[] = { "Xen_Processor", "Xen_Memory", "Xen_NetworkPort", @@ -302,7 +302,7 @@ char* logical_device[] = { NULL }; -char* resource_allocation_setting_data[] = { +static char* resource_allocation_setting_data[] = { "Xen_DiskResourceAllocationSettingData", "Xen_MemResourceAllocationSettingData", "Xen_NetResourceAllocationSettingData", @@ -314,19 +314,19 @@ char* resource_allocation_setting_data[] NULL }; -char* computer_system[] = { +static char* computer_system[] = { "Xen_ComputerSystem", "KVM_ComputerSystem", NULL }; -char* virtual_system_setting_data[] = { +static char* virtual_system_setting_data[] = { "Xen_VirtualSystemSettingData", "KVM_VirtualSystemSettingData", NULL }; -char* assoc_classname[] = { +static char* assoc_classname[] = { "Xen_SettingsDefineState", "KVM_SettingsDefineState", NULL

# HG changeset patch # User Heidi Eckhart <heidieck@linux.vnet.ibm.com> # Date 1202208799 -3600 # Node ID 4bab53fec75afc0e3efdf25fbfcaa4a668182d71 # Parent ca631d19373b61f60e83eddc4be4ca4176653647 SD: fix stale issue with threads Signed-off-by: Heidi Eckhart <heidieck@linux.vnet.ibm.com> diff -r ca631d19373b -r 4bab53fec75a src/Virt_SystemDevice.c --- a/src/Virt_SystemDevice.c Tue Feb 05 11:53:18 2008 +0100 +++ b/src/Virt_SystemDevice.c Tue Feb 05 11:53:19 2008 +0100 @@ -210,13 +210,13 @@ static CMPIStatus dev_to_sys(const CMPIO LIBVIRT_CIM_DEFAULT_MAKEREF() -char* group_component[] = { +static char* group_component[] = { "Xen_ComputerSystem", "KVM_ComputerSystem", NULL }; -char* part_component[] = { +static char* part_component[] = { "Xen_Processor", "Xen_Memory", "Xen_NetworkPort", @@ -228,7 +228,7 @@ char* part_component[] = { NULL }; -char* assoc_classname[] = { +static char* assoc_classname[] = { "Xen_SystemDevice", "KVM_SystemDevice", NULL

# HG changeset patch # User Heidi Eckhart <heidieck@linux.vnet.ibm.com> # Date 1202208799 -3600 # Node ID 0bbd401701982deb19263023b560415a2cb69360 # Parent 4bab53fec75afc0e3efdf25fbfcaa4a668182d71 VSSDC: fix stale issue with threads Signed-off-by: Heidi Eckhart <heidieck@linux.vnet.ibm.com> diff -r 4bab53fec75a -r 0bbd40170198 src/Virt_VSSDComponent.c --- a/src/Virt_VSSDComponent.c Tue Feb 05 11:53:19 2008 +0100 +++ b/src/Virt_VSSDComponent.c Tue Feb 05 11:53:19 2008 +0100 @@ -154,13 +154,13 @@ static CMPIStatus rasd_to_vssd(const CMP LIBVIRT_CIM_DEFAULT_MAKEREF() -char* group_component[] = { +static char* group_component[] = { "Xen_VirtualSystemSettingData", "KVM_VirtualSystemSettingData", NULL }; -char* part_component[] = { +static char* part_component[] = { "Xen_DiskResourceAllocationSettingData", "Xen_MemResourceAllocationSettingData", "Xen_NetResourceAllocationSettingData", @@ -172,7 +172,7 @@ char* part_component[] = { NULL }; -char* assoc_classname[] = { +static char* assoc_classname[] = { "Xen_VirtualSystemSettingDataComponent", "KVM_VirtualSystemSettingDataComponent", NULL

I tested out this set - looks good. +1 -- Kaitlin Rupert IBM Linux Technology Center kaitlin@linux.vnet.ibm.com
participants (3)
-
Heidi Eckhart
-
Jay Gagnon
-
Kaitlin Rupert