[Libvirt-cim] [PATCH] Add the entries to all the std_assoc blocks to support LXC domains
Dan Smith
danms at us.ibm.com
Tue Apr 22 17:23:51 UTC 2008
# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1208884871 25200
# Node ID 5713d5e112fc71a3478b5fc2d6a8a9a93b4905a5
# Parent c48de3c7541217fce53add72cbd7a2d50fa3e2c8
Add the entries to all the std_assoc blocks to support LXC domains
I haven't hand-tested all of these, but we should be able to get that done
by adding LXC to the list of supported types in the various tests.
Signed-off-by: Dan Smith <danms at us.ibm.com>
diff -r c48de3c75412 -r 5713d5e112fc src/Virt_ElementAllocatedFromPool.c
--- a/src/Virt_ElementAllocatedFromPool.c Fri Apr 18 11:49:24 2008 -0700
+++ b/src/Virt_ElementAllocatedFromPool.c Tue Apr 22 10:21:11 2008 -0700
@@ -176,7 +176,11 @@ static char* antecedent[] = {
"KVM_ProcessorPool",
"KVM_MemoryPool",
"KVM_NetworkPool",
- "KVM_DiskPool",
+ "KVM_DiskPool",
+ "LXC_ProcessorPool",
+ "LXC_MemoryPool",
+ "LXC_NetworkPool",
+ "LXC_DiskPool",
NULL
};
@@ -189,12 +193,17 @@ static char* dependent[] = {
"KVM_Memory",
"KVM_NetworkPort",
"KVM_LogicalDisk",
+ "LXC_Processor",
+ "LXC_Memory",
+ "LXC_NetworkPort",
+ "LXC_LogicalDisk",
NULL
};
static char* assoc_classname[] = {
"Xen_ElementAllocatedFromPool",
- "KVM_ElementAllocatedFromPool",
+ "KVM_ElementAllocatedFromPool",
+ "LXC_ElementAllocatedFromPool",
NULL
};
diff -r c48de3c75412 -r 5713d5e112fc src/Virt_ElementCapabilities.c
--- a/src/Virt_ElementCapabilities.c Fri Apr 18 11:49:24 2008 -0700
+++ b/src/Virt_ElementCapabilities.c Tue Apr 22 10:21:11 2008 -0700
@@ -295,23 +295,28 @@ LIBVIRT_CIM_DEFAULT_MAKEREF()
static char* assoc_classname[] = {
"Xen_ElementCapabilities",
- "KVM_ElementCapabilities",
+ "KVM_ElementCapabilities",
+ "LXC_ElementCapabilities",
NULL
};
static char* host_system[] = {
"Xen_HostSystem",
"KVM_HostSystem",
+ "LXC_HostSystem",
NULL
};
static char* host_sys_and_service[] = {
"Xen_HostSystem",
+ "Xen_VirtualSystemManagementService",
+ "Xen_VirtualSystemMigrationService",
"KVM_HostSystem",
- "Xen_VirtualSystemManagementService",
"KVM_VirtualSystemManagementService",
- "Xen_VirtualSystemMigrationService",
"KVM_VirtualSystemMigrationService",
+ "LXC_HostSystem",
+ "LXC_VirtualSystemManagementService",
+ "LXC_VirtualSystemMigrationService",
NULL
};
@@ -320,6 +325,8 @@ static char* virtual_system_management_c
"Xen_VirtualSystemMigrationCapabilities",
"KVM_VirtualSystemManagementCapabilities",
"KVM_VirtualSystemMigrationCapabilities",
+ "LXC_VirtualSystemManagementCapabilities",
+ "LXC_VirtualSystemMigrationCapabilities",
NULL,
};
@@ -354,6 +361,7 @@ static char* service[] = {
"KVM_VirtualSystemManagementService",
"Xen_VirtualSystemMigrationService",
"KVM_VirtualSystemMigrationService",
+ "LXC_VirtualSystemMigrationService",
NULL
};
@@ -373,12 +381,14 @@ static char* computer_system[] = {
static char* computer_system[] = {
"Xen_ComputerSystem",
"KVM_ComputerSystem",
+ "LXC_ComputerSystem",
NULL
};
static char* enabled_logical_element_capabilities[] = {
"Xen_EnabledLogicalElementCapabilities",
"KVM_EnabledLogicalElementCapabilities",
+ "LXC_EnabledLogicalElementCapabilities",
NULL
};
@@ -411,6 +421,7 @@ static char* allocation_capabilities[] =
static char* allocation_capabilities[] = {
"Xen_AllocationCapabilities",
"KVM_AllocationCapabilities",
+ "LXC_AllocationCapabilities",
NULL
};
@@ -423,6 +434,10 @@ static char* resource_pool[] = {
"KVM_MemoryPool",
"KVM_NetworkPool",
"KVM_DiskPool",
+ "LXC_ProcessorPool",
+ "LXC_MemoryPool",
+ "LXC_NetworkPool",
+ "LXC_DiskPool",
NULL
};
diff -r c48de3c75412 -r 5713d5e112fc src/Virt_ElementConformsToProfile.c
--- a/src/Virt_ElementConformsToProfile.c Fri Apr 18 11:49:24 2008 -0700
+++ b/src/Virt_ElementConformsToProfile.c Tue Apr 22 10:21:11 2008 -0700
@@ -209,7 +209,8 @@ LIBVIRT_CIM_DEFAULT_MAKEREF()
static char* conformant_standard[] = {
"Xen_RegisteredProfile",
- "KVM_RegisteredProfile",
+ "KVM_RegisteredProfile",
+ "LXC_RegisteredProfile",
NULL
};
@@ -218,12 +219,15 @@ static char* managed_element[] = {
"Xen_ComputerSystem",
"KVM_HostSystem",
"KVM_ComputerSystem",
+ "LXC_HostSystem",
+ "LXC_ComputerSystem",
NULL
};
static char* assoc_classname[] = {
"Xen_ElementConformsToProfile",
- "KVM_ElementConformsToProfile",
+ "KVM_ElementConformsToProfile",
+ "LXC_ElementConformsToProfile",
NULL
};
diff -r c48de3c75412 -r 5713d5e112fc src/Virt_ElementSettingData.c
--- a/src/Virt_ElementSettingData.c Fri Apr 18 11:49:24 2008 -0700
+++ b/src/Virt_ElementSettingData.c Tue Apr 22 10:21:11 2008 -0700
@@ -117,7 +117,8 @@ static CMPIInstance *make_ref(const CMPI
static char* virtual_system_setting_data[] = {
"Xen_VirtualSystemSettingData",
- "KVM_VirtualSystemSettingData",
+ "KVM_VirtualSystemSettingData",
+ "LXC_VirtualSystemSettingData",
NULL
};
@@ -130,12 +131,17 @@ static char* resource_allocation_setting
"KVM_MemResourceAllocationSettingData",
"KVM_NetResourceAllocationSettingData",
"KVM_ProcResourceAllocationSettingData",
+ "LXC_DiskResourceAllocationSettingData",
+ "LXC_MemResourceAllocationSettingData",
+ "LXC_NetResourceAllocationSettingData",
+ "LXC_ProcResourceAllocationSettingData",
NULL
};
static char* assoc_classname[] = {
"Xen_ElementSettingData",
- "KVM_ElementSettingData",
+ "KVM_ElementSettingData",
+ "LXC_ElementSettingData",
NULL
};
diff -r c48de3c75412 -r 5713d5e112fc src/Virt_HostedDependency.c
--- a/src/Virt_HostedDependency.c Fri Apr 18 11:49:24 2008 -0700
+++ b/src/Virt_HostedDependency.c Tue Apr 22 10:21:11 2008 -0700
@@ -82,19 +82,22 @@ LIBVIRT_CIM_DEFAULT_MAKEREF()
static char* antecedent[] = {
"Xen_ComputerSystem",
- "KVM_ComputerSystem",
+ "KVM_ComputerSystem",
+ "LXC_ComputerSystem",
NULL
};
static char* dependent[] = {
"Xen_HostSystem",
"KVM_HostSystem",
+ "LXC_HostSystem",
NULL
};
static char* assoc_classname[] = {
"Xen_HostedDependency",
- "KVM_HostedDependency",
+ "KVM_HostedDependency",
+ "LXC_HostedDependency",
NULL
};
diff -r c48de3c75412 -r 5713d5e112fc src/Virt_HostedResourcePool.c
--- a/src/Virt_HostedResourcePool.c Fri Apr 18 11:49:24 2008 -0700
+++ b/src/Virt_HostedResourcePool.c Tue Apr 22 10:21:11 2008 -0700
@@ -87,6 +87,7 @@ static char* group_component[] = {
static char* group_component[] = {
"Xen_HostSystem",
"KVM_HostSystem",
+ "LXC_HostSystem",
NULL
};
@@ -99,12 +100,17 @@ static char* part_component[] = {
"KVM_MemoryPool",
"KVM_NetworkPool",
"KVM_DiskPool",
+ "LXC_ProcessorPool",
+ "LXC_MemoryPool",
+ "LXC_NetworkPool",
+ "LXC_DiskPool",
NULL
};
static char* assoc_classname[] = {
"Xen_HostedResourcePool",
- "KVM_HostedResourcePool",
+ "KVM_HostedResourcePool",
+ "LXC_HostedResourcePool",
NULL
};
diff -r c48de3c75412 -r 5713d5e112fc src/Virt_HostedService.c
--- a/src/Virt_HostedService.c Fri Apr 18 11:49:24 2008 -0700
+++ b/src/Virt_HostedService.c Tue Apr 22 10:21:11 2008 -0700
@@ -119,6 +119,7 @@ static char* antecedent[] = {
static char* antecedent[] = {
"Xen_HostSystem",
"KVM_HostSystem",
+ "LXC_HostSystem",
NULL
};
@@ -129,12 +130,16 @@ static char* dependent[] = {
"KVM_ResourcePoolConfigurationService",
"KVM_VirtualSystemManagementService",
"KVM_VirtualSystemMigrationService",
+ "LXC_ResourcePoolConfigurationService",
+ "LXC_VirtualSystemManagementService",
+ "LXC_VirtualSystemMigrationService",
NULL
};
static char* assoc_classname[] = {
"Xen_HostedService",
- "KVM_HostedService",
+ "KVM_HostedService",
+ "LXC_HostedService",
NULL
};
diff -r c48de3c75412 -r 5713d5e112fc src/Virt_ReferencedProfile.c
--- a/src/Virt_ReferencedProfile.c Fri Apr 18 11:49:24 2008 -0700
+++ b/src/Virt_ReferencedProfile.c Tue Apr 22 10:21:11 2008 -0700
@@ -176,13 +176,15 @@ static CMPIInstance *make_ref(const CMPI
static char* registered_profile[] = {
"Xen_RegisteredProfile",
- "KVM_RegisteredProfile",
+ "KVM_RegisteredProfile",
+ "LXC_RegisteredProfile",
NULL
};
static char* assoc_classname[] = {
"Xen_ReferencedProfile",
- "KVM_ReferencedProfile",
+ "KVM_ReferencedProfile",
+ "LXC_ReferencedProfile",
NULL
};
diff -r c48de3c75412 -r 5713d5e112fc src/Virt_ResourceAllocationFromPool.c
--- a/src/Virt_ResourceAllocationFromPool.c Fri Apr 18 11:49:24 2008 -0700
+++ b/src/Virt_ResourceAllocationFromPool.c Tue Apr 22 10:21:11 2008 -0700
@@ -183,6 +183,10 @@ static char* antecedent[] = {
"KVM_MemoryPool",
"KVM_NetworkPool",
"KVM_DiskPool",
+ "LXC_ProcessorPool",
+ "LXC_MemoryPool",
+ "LXC_NetworkPool",
+ "LXC_DiskPool",
NULL
};
@@ -195,12 +199,17 @@ static char* dependent[] = {
"KVM_MemResourceAllocationSettingData",
"KVM_NetResourceAllocationSettingData",
"KVM_ProcResourceAllocationSettingData",
+ "LXC_DiskResourceAllocationSettingData",
+ "LXC_MemResourceAllocationSettingData",
+ "LXC_NetResourceAllocationSettingData",
+ "LXC_ProcResourceAllocationSettingData",
NULL
};
static char* assoc_classname[] = {
"Xen_ResourceAllocationFromPool",
- "KVM_ResourceAllocationFromPool",
+ "KVM_ResourceAllocationFromPool",
+ "LXC_ResourceAllocationFromPool",
NULL
};
diff -r c48de3c75412 -r 5713d5e112fc src/Virt_SettingsDefineCapabilities.c
--- a/src/Virt_SettingsDefineCapabilities.c Fri Apr 18 11:49:24 2008 -0700
+++ b/src/Virt_SettingsDefineCapabilities.c Tue Apr 22 10:21:11 2008 -0700
@@ -924,6 +924,7 @@ static char* group_component[] = {
static char* group_component[] = {
"Xen_AllocationCapabilities",
"KVM_AllocationCapabilities",
+ "LXC_AllocationCapabilities",
NULL
};
@@ -936,12 +937,17 @@ static char* part_component[] = {
"KVM_MemResourceAllocationSettingData",
"KVM_NetResourceAllocationSettingData",
"KVM_ProcResourceAllocationSettingData",
+ "LXC_DiskResourceAllocationSettingData",
+ "LXC_MemResourceAllocationSettingData",
+ "LXC_NetResourceAllocationSettingData",
+ "LXC_ProcResourceAllocationSettingData",
NULL
};
static char* assoc_classname[] = {
"Xen_SettingsDefineCapabilities",
- "KVM_SettingsDefineCapabilities",
+ "KVM_SettingsDefineCapabilities",
+ "LXC_SettingsDefineCapabilities",
NULL
};
@@ -974,12 +980,14 @@ static char* migrate_cap[] = {
static char* migrate_cap[] = {
"Xen_VirtualSystemMigrationCapabilities",
"KVM_VirtualSystemMigrationCapabilities",
+ "LXC_VirtualSystemMigrationCapabilities",
NULL
};
static char* migrate_sd[] = {
"Xen_VirtualSystemMigrationSettingData",
"KVM_VirtualSystemMigrationSettingData",
+ "LXC_VirtualSystemMigrationSettingData",
NULL
};
diff -r c48de3c75412 -r 5713d5e112fc src/Virt_SettingsDefineState.c
--- a/src/Virt_SettingsDefineState.c Fri Apr 18 11:49:24 2008 -0700
+++ b/src/Virt_SettingsDefineState.c Tue Apr 22 10:21:11 2008 -0700
@@ -205,6 +205,10 @@ static char* logical_device[] = {
"KVM_Memory",
"KVM_NetworkPort",
"KVM_LogicalDisk",
+ "LXC_Processor",
+ "LXC_Memory",
+ "LXC_NetworkPort",
+ "LXC_LogicalDisk",
NULL
};
@@ -217,24 +221,31 @@ static char* resource_allocation_setting
"KVM_MemResourceAllocationSettingData",
"KVM_NetResourceAllocationSettingData",
"KVM_ProcResourceAllocationSettingData",
+ "LXC_DiskResourceAllocationSettingData",
+ "LXC_MemResourceAllocationSettingData",
+ "LXC_NetResourceAllocationSettingData",
+ "LXC_ProcResourceAllocationSettingData",
NULL
};
static char* computer_system[] = {
"Xen_ComputerSystem",
"KVM_ComputerSystem",
+ "LXC_ComputerSystem",
NULL
};
static char* virtual_system_setting_data[] = {
"Xen_VirtualSystemSettingData",
- "KVM_VirtualSystemSettingData",
+ "KVM_VirtualSystemSettingData",
+ "LXC_VirtualSystemSettingData",
NULL
};
static char* assoc_classname[] = {
"Xen_SettingsDefineState",
- "KVM_SettingsDefineState",
+ "KVM_SettingsDefineState",
+ "LXC_VirtualSystemSettingData",
NULL
};
diff -r c48de3c75412 -r 5713d5e112fc src/Virt_SystemDevice.c
--- a/src/Virt_SystemDevice.c Fri Apr 18 11:49:24 2008 -0700
+++ b/src/Virt_SystemDevice.c Tue Apr 22 10:21:11 2008 -0700
@@ -125,6 +125,7 @@ static char* group_component[] = {
static char* group_component[] = {
"Xen_ComputerSystem",
"KVM_ComputerSystem",
+ "LXC_ComputerSystem",
NULL
};
@@ -137,12 +138,17 @@ static char* part_component[] = {
"KVM_Memory",
"KVM_NetworkPort",
"KVM_LogicalDisk",
+ "LXC_Processor",
+ "LXC_Memory",
+ "LXC_NetworkPort",
+ "LXC_LogicalDisk",
NULL
};
static char* assoc_classname[] = {
"Xen_SystemDevice",
- "KVM_SystemDevice",
+ "KVM_SystemDevice",
+ "LXC_SystemDevice",
NULL
};
diff -r c48de3c75412 -r 5713d5e112fc src/Virt_VSSDComponent.c
--- a/src/Virt_VSSDComponent.c Fri Apr 18 11:49:24 2008 -0700
+++ b/src/Virt_VSSDComponent.c Tue Apr 22 10:21:11 2008 -0700
@@ -122,6 +122,7 @@ static char* group_component[] = {
static char* group_component[] = {
"Xen_VirtualSystemSettingData",
"KVM_VirtualSystemSettingData",
+ "LXC_VirtualSystemSettingData",
NULL
};
@@ -134,12 +135,17 @@ static char* part_component[] = {
"KVM_MemResourceAllocationSettingData",
"KVM_NetResourceAllocationSettingData",
"KVM_ProcResourceAllocationSettingData",
+ "LXC_DiskResourceAllocationSettingData",
+ "LXC_MemResourceAllocationSettingData",
+ "LXC_NetResourceAllocationSettingData",
+ "LXC_ProcResourceAllocationSettingData",
NULL
};
static char* assoc_classname[] = {
"Xen_VirtualSystemSettingDataComponent",
- "KVM_VirtualSystemSettingDataComponent",
+ "KVM_VirtualSystemSettingDataComponent",
+ "LXC_VirtualSystemSettingDataComponent",
NULL
};
More information about the Libvirt-cim
mailing list