[PATCH 0 of 4] Add ResoucePool support for input and graphics devices
Having a resource pool for both input and graphics devices doesn't really make sense (as we won't be allocating these devices from a pool). But a pool instances is need to get the AC instances, which is then used to get the template RASDs of a device. So, for consistency with other devices, pools for graphics and input devices is added here.
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1226694598 28800 # Node ID d80817bf94080daa8acc341794565868f4c58ac5 # Parent 5680eb18d7ea2971acf4fbdb50e3e69f5c014ef0 Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r 5680eb18d7ea -r d80817bf9408 Makefile.am --- a/Makefile.am Wed Nov 05 15:13:38 2008 -0800 +++ b/Makefile.am Fri Nov 14 12:29:58 2008 -0800 @@ -49,7 +49,9 @@ schema/ServiceAffectsElement.mof \ schema/KVMRedirectionSAP.mof \ schema/DisplayController.mof \ - schema/PointingDevice.mof + schema/PointingDevice.mof \ + schema/GraphicsPool.mof \ + schema/InputPool.mof INTEROP_MOFS = \ schema/ComputerSystem.mof \ @@ -113,7 +115,9 @@ schema/ServiceAffectsElement.registration \ schema/KVMRedirectionSAP.registration \ schema/DisplayController.registration \ - schema/PointingDevice.registration + schema/PointingDevice.registration \ + schema/GraphicsPool.registration \ + schema/InputPool.registration INTEROP_REGS = \ schema/RegisteredProfile.registration \ diff -r 5680eb18d7ea -r d80817bf9408 schema/GraphicsPool.mof --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/GraphicsPool.mof Fri Nov 14 12:29:58 2008 -0800 @@ -0,0 +1,16 @@ +// Copyright IBM Corp. 2007 + +[Provider("cmpi::Virt_DevicePool")] +class Xen_GraphicsPool : CIM_ResourcePool +{ +}; + +[Provider("cmpi::Virt_DevicePool")] +class KVM_GraphicsPool : CIM_ResourcePool +{ +}; + +[Provider("cmpi::Virt_DevicePool")] +class LXC_GraphicsPool : CIM_ResourcePool +{ +}; diff -r 5680eb18d7ea -r d80817bf9408 schema/GraphicsPool.registration --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/GraphicsPool.registration Fri Nov 14 12:29:58 2008 -0800 @@ -0,0 +1,5 @@ +# Copyright IBM Corp. 2007 +# Classname Namespace ProviderName ProviderModule ProviderTypes +Xen_GraphicsPool root/virt Virt_DevicePool Virt_DevicePool instance +KVM_GraphicsPool root/virt Virt_DevicePool Virt_DevicePool instance +LXC_GraphicsPool root/virt Virt_DevicePool Virt_DevicePool instance diff -r 5680eb18d7ea -r d80817bf9408 schema/InputPool.mof --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/InputPool.mof Fri Nov 14 12:29:58 2008 -0800 @@ -0,0 +1,16 @@ +// Copyright IBM Corp. 2007 + +[Provider("cmpi::Virt_DevicePool")] +class Xen_InputPool : CIM_ResourcePool +{ +}; + +[Provider("cmpi::Virt_DevicePool")] +class KVM_InputPool : CIM_ResourcePool +{ +}; + +[Provider("cmpi::Virt_DevicePool")] +class LXC_InputPool : CIM_ResourcePool +{ +}; diff -r 5680eb18d7ea -r d80817bf9408 schema/InputPool.registration --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/InputPool.registration Fri Nov 14 12:29:58 2008 -0800 @@ -0,0 +1,5 @@ +# Copyright IBM Corp. 2007 +# Classname Namespace ProviderName ProviderModule ProviderTypes +Xen_InputPool root/virt Virt_DevicePool Virt_DevicePool instance +KVM_InputPool root/virt Virt_DevicePool Virt_DevicePool instance +LXC_InputPool root/virt Virt_DevicePool Virt_DevicePool instance diff -r 5680eb18d7ea -r d80817bf9408 src/Virt_DevicePool.c --- a/src/Virt_DevicePool.c Wed Nov 05 15:13:38 2008 -0800 +++ b/src/Virt_DevicePool.c Fri Nov 14 12:29:58 2008 -0800 @@ -478,6 +478,10 @@ poolid = netpool_member_of(broker, id, refcn); else if (type == CIM_RES_TYPE_DISK) poolid = diskpool_member_of(broker, id, refcn); + else if (type == CIM_RES_TYPE_GRAPHICS) + poolid = strdup("GraphicsPool/0"); + else if (type == CIM_RES_TYPE_INPUT) + poolid = strdup("InputPool/0"); else return NULL; @@ -494,6 +498,10 @@ return CIM_RES_TYPE_MEM; else if (strstr(classname, "ProcessorPool")) return CIM_RES_TYPE_PROC; + else if (strstr(classname, "GraphicsPool")) + return CIM_RES_TYPE_GRAPHICS; + else if (strstr(classname, "InputPool")) + return CIM_RES_TYPE_INPUT; else return CIM_RES_TYPE_UNKNOWN; } @@ -508,6 +516,10 @@ return CIM_RES_TYPE_MEM; else if (STARTS_WITH(id, "ProcessorPool")) return CIM_RES_TYPE_PROC; + else if (strstr(id, "GraphicsPool")) + return CIM_RES_TYPE_GRAPHICS; + else if (strstr(id, "InputPool")) + return CIM_RES_TYPE_INPUT; else return CIM_RES_TYPE_UNKNOWN; } @@ -841,6 +853,78 @@ return s; } +static CMPIStatus graphicspool_instance(virConnectPtr conn, + struct inst_list *list, + const char *ns, + const char *_id, + const CMPIBroker *broker) +{ + const char *id = "GraphicsPool/0"; + CMPIInstance *inst; + CMPIStatus s = {CMPI_RC_OK, NULL}; + + if ((_id != NULL) && (!STREQC(_id, "0"))) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "No such graphics pool `%s'", id); + return s; + } + + inst = get_typed_instance(broker, + pfx_from_conn(conn), + "GraphicsPool", + ns); + if (inst == NULL) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Failed to get instance of %s_GraphicsPool", + pfx_from_conn(conn)); + return s; + } + + set_params(inst, CIM_RES_TYPE_GRAPHICS, id, NULL, NULL); + + inst_list_add(list, inst); + + return s; +} + +static CMPIStatus inputpool_instance(virConnectPtr conn, + struct inst_list *list, + const char *ns, + const char *_id, + const CMPIBroker *broker) +{ + const char *id = "InputPool/0"; + CMPIInstance *inst; + CMPIStatus s = {CMPI_RC_OK, NULL}; + + if ((_id != NULL) && (!STREQC(_id, "0"))) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "No such input pool `%s'", id); + return s; + } + + inst = get_typed_instance(broker, + pfx_from_conn(conn), + "InputPool", + ns); + if (inst == NULL) { + cu_statusf(broker, &s, + CMPI_RC_ERR_FAILED, + "Failed to get instance of %s_InputPool", + pfx_from_conn(conn)); + return s; + } + + set_params(inst, CIM_RES_TYPE_INPUT, id, NULL, NULL); + + inst_list_add(list, inst); + + return s; +} + static CMPIStatus _get_pools(const CMPIBroker *broker, const CMPIObjectPath *reference, const uint16_t type, @@ -885,6 +969,22 @@ NAMESPACE(reference), id, broker); + + if ((type == CIM_RES_TYPE_GRAPHICS) || + (type == CIM_RES_TYPE_ALL)) + s = graphicspool_instance(conn, + list, + NAMESPACE(reference), + id, + broker); + + if ((type == CIM_RES_TYPE_INPUT) || + (type == CIM_RES_TYPE_ALL)) + s = inputpool_instance(conn, + list, + NAMESPACE(reference), + id, + broker); if (type == CIM_RES_TYPE_UNKNOWN) cu_statusf(broker, &s, @@ -1029,6 +1129,16 @@ *s = enum_pools(broker, reference, type, &list); if ((s->rc == CMPI_RC_OK) && (list.cur > 0)) inst = list.list[0]; + } else if (type == CIM_RES_TYPE_GRAPHICS) { + *s = get_pool_by_name(broker, + reference, + "GraphicsPool/0", + &inst); + } else if (type == CIM_RES_TYPE_INPUT) { + *s = get_pool_by_name(broker, + reference, + "InputPool/0", + &inst); } else { cu_statusf(broker, s, CMPI_RC_ERR_INVALID_PARAMETER,
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1225483570 25200 # Node ID fade4a5c8030670699dc72d6f971d163612935be # Parent d80817bf94080daa8acc341794565868f4c58ac5 Update SDC to support GraphicsRASD and InputRASD. There is no updates that need to be done to AllocationCapabilities (the appropriate instances are generated once the proper pool support is in place). The template RASD for input devices doesn't have any additional properties set because there's else meaningful to set. Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r d80817bf9408 -r fade4a5c8030 src/Virt_SettingsDefineCapabilities.c --- a/src/Virt_SettingsDefineCapabilities.c Fri Nov 14 12:29:58 2008 -0800 +++ b/src/Virt_SettingsDefineCapabilities.c Fri Oct 31 13:06:10 2008 -0700 @@ -48,6 +48,7 @@ #include "Virt_VSMigrationSettingData.h" #include "Virt_VirtualSystemManagementService.h" #include "Virt_AllocationCapabilities.h" +#include "Virt_Device.h" const static CMPIBroker *_BROKER; @@ -711,6 +712,127 @@ return s; } +static CMPIStatus graphics_template(const CMPIObjectPath *ref, + int template_type, + struct inst_list *list) +{ + const char *id; + const char *addr; + CMPIInstance *inst; + CMPIStatus s = {CMPI_RC_OK, NULL}; + + switch(template_type) { + case SDC_RASD_MIN: + id = "Minimum"; + break; + case SDC_RASD_MAX: + id = "Maximum"; + break; + case SDC_RASD_INC: + id = "Increment"; + break; + case SDC_RASD_DEF: + id = "Default"; + break; + default: + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unsupported sdc_rasd type"); + goto out; + } + + inst = sdc_rasd_inst(&s, ref, CIM_RES_TYPE_GRAPHICS); + + CMSetProperty(inst, "InstanceID", (CMPIValue *)id, CMPI_chars); + + addr = "127.0.0.1:-1"; + CMSetProperty(inst, "Address", (CMPIValue *)addr, CMPI_chars); + + inst_list_add(list, inst); + + out: + return s; +} + +static CMPIStatus set_input_props(const CMPIObjectPath *ref, + const char *id, + const char *type, + const char *bus, + struct inst_list *list) +{ + CMPIStatus s = {CMPI_RC_OK, NULL}; + CMPIInstance *inst; + char *cap; + + if (get_input_dev_caption(type, bus, &cap) != 1) { + free(cap); + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_NOT_FOUND, + "Unable to build input caption"); + return s; + } + + inst = sdc_rasd_inst(&s, ref, CIM_RES_TYPE_INPUT); + if ((inst == NULL) || (s.rc != CMPI_RC_OK)) + goto out; + + CMSetProperty(inst, "InstanceID", (CMPIValue *)id, CMPI_chars); + + CMSetProperty(inst, "ResourceSubType", (CMPIValue *)type, CMPI_chars); + + CMSetProperty(inst, "Caption", (CMPIValue *)cap, CMPI_chars); + + inst_list_add(list, inst); + + out: + free(cap); + + return s; +} + +static CMPIStatus input_template(const CMPIObjectPath *ref, + int template_type, + struct inst_list *list) +{ + const char *id; + CMPIStatus s = {CMPI_RC_OK, NULL}; + const char *inputs[4][2] = { {"mouse", "ps2"}, + {"mouse", "usb"}, + {"tablet", "usb"}, + {NULL, NULL} + }; + int i; + + switch(template_type) { + case SDC_RASD_MIN: + id = "Minimum"; + break; + case SDC_RASD_MAX: + id = "Maximum"; + break; + case SDC_RASD_INC: + id = "Increment"; + break; + case SDC_RASD_DEF: + id = "Default"; + break; + default: + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Unsupported sdc_rasd type"); + goto out; + } + + for(i = 0; inputs[i][0] != NULL; i++) { + s = set_input_props(ref, id, inputs[i][0], inputs[i][1], list); + if (s.rc != CMPI_RC_OK) + goto out; + } + + out: + return s; +} + static CMPIStatus sdc_rasds_for_type(const CMPIObjectPath *ref, struct inst_list *list, uint16_t type) @@ -727,6 +849,10 @@ s = net_template(ref, i, list); else if (type == CIM_RES_TYPE_DISK) s = disk_template(ref, i, list); + else if (type == CIM_RES_TYPE_GRAPHICS) + s = graphics_template(ref, i, list); + else if (type == CIM_RES_TYPE_INPUT) + s = input_template(ref, i, list); else { cu_statusf(_BROKER, &s, CMPI_RC_ERR_FAILED, @@ -897,14 +1023,20 @@ "Xen_MemResourceAllocationSettingData", "Xen_NetResourceAllocationSettingData", "Xen_ProcResourceAllocationSettingData", + "Xen_GraphicsResourceAllocationSettingData", + "Xen_InputResourceAllocationSettingData", "KVM_DiskResourceAllocationSettingData", "KVM_MemResourceAllocationSettingData", "KVM_NetResourceAllocationSettingData", "KVM_ProcResourceAllocationSettingData", + "KVM_GraphicsResourceAllocationSettingData", + "KVM_InputResourceAllocationSettingData", "LXC_DiskResourceAllocationSettingData", "LXC_MemResourceAllocationSettingData", "LXC_NetResourceAllocationSettingData", "LXC_ProcResourceAllocationSettingData", + "LXC_GraphicsResourceAllocationSettingData", + "LXC_InputResourceAllocationSettingData", NULL };
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1226427777 28800 # Node ID f2431416f37653b1aa1b7f728824ac884e986779 # Parent fade4a5c8030670699dc72d6f971d163612935be Fix EC bugs and support graphics / input resource pools. Fix bugs with AC -> HS and AC -> RP. Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r fade4a5c8030 -r f2431416f376 src/Virt_ElementCapabilities.c --- a/src/Virt_ElementCapabilities.c Fri Oct 31 13:06:10 2008 -0700 +++ b/src/Virt_ElementCapabilities.c Tue Nov 11 10:22:57 2008 -0800 @@ -55,14 +55,36 @@ const static CMPIBroker *_BROKER; -static CMPIStatus validate_caps_get_service(const CMPIContext *context, - const CMPIObjectPath *ref, - CMPIInstance **inst) +static CMPIStatus validate_ac_get_rp(const CMPIObjectPath *ref, + CMPIInstance **inst) +{ + CMPIStatus s = {CMPI_RC_OK, NULL}; + const char *poolid; + + if (cu_get_str_path(ref, "InstanceID", &poolid) != CMPI_RC_OK) { + cu_statusf(_BROKER, &s, + CMPI_RC_ERR_FAILED, + "Missing InstanceID"); + goto out; + } + + s = get_alloc_cap_by_id(_BROKER, ref, poolid, inst); + if ((inst == NULL) || (s.rc != CMPI_RC_OK)) + goto out; + + s = get_pool_by_name(_BROKER, ref, poolid, inst); + + out: + return s; +} + +static CMPIStatus validate_caps_get_service_or_rp(const CMPIContext *context, + const CMPIObjectPath *ref, + CMPIInstance **inst) { CMPIStatus s = {CMPI_RC_OK, NULL}; CMPIInstance *_inst; char* classname; - classname = class_base_name(CLASSNAME(ref)); if (STREQC(classname, "VirtualSystemManagementCapabilities")) { @@ -83,6 +105,8 @@ goto out; s = get_console_rs(ref, &_inst, _BROKER, context, false); + } else if (STREQC(classname, "AllocationCapabilities")) { + s = validate_ac_get_rp(ref, &_inst); } else cu_statusf(_BROKER, &s, CMPI_RC_ERR_NOT_FOUND, @@ -181,9 +205,9 @@ return s; } -static CMPIStatus cap_to_sys_or_service(const CMPIObjectPath *ref, - struct std_assoc_info *info, - struct inst_list *list) +static CMPIStatus cap_to_sys_or_service_or_rp(const CMPIObjectPath *ref, + struct std_assoc_info *info, + struct inst_list *list) { CMPIInstance *inst = NULL; CMPIStatus s = {CMPI_RC_OK, NULL}; @@ -191,7 +215,7 @@ if (!match_hypervisor_prefix(ref, info)) goto out; - s = validate_caps_get_service(info->context, ref, &inst); + s = validate_caps_get_service_or_rp(info->context, ref, &inst); if (s.rc != CMPI_RC_OK) goto out; @@ -290,44 +314,6 @@ return s; } -static CMPIStatus alloc_to_pool_and_sys(const CMPIObjectPath *ref, - struct std_assoc_info *info, - struct inst_list *list) -{ - CMPIStatus s = {CMPI_RC_OK, NULL}; - CMPIInstance *host; - CMPIInstance *ac; - CMPIInstance *pool; - const char *poolid; - - if (!match_hypervisor_prefix(ref, info)) - goto out; - - if (cu_get_str_path(ref, "InstanceID", &poolid) != CMPI_RC_OK) { - cu_statusf(_BROKER, &s, - CMPI_RC_ERR_FAILED, - "Missing InstanceID"); - goto out; - } - - s = get_pool_by_name(_BROKER, ref, poolid, &pool); - if ((pool == NULL) || (s.rc != CMPI_RC_OK)) - goto out; - - s = get_alloc_cap_by_id(_BROKER, ref, poolid, &ac); - if ((ac == NULL) || (s.rc != CMPI_RC_OK)) - goto out; - - s = get_host(_BROKER, info->context, ref, &host, false); - if (s.rc != CMPI_RC_OK) - goto out; - - inst_list_add(list, host); - inst_list_add(list, pool); - out: - return s; -} - static CMPIStatus pool_to_alloc(const CMPIObjectPath *ref, struct std_assoc_info *info, struct inst_list *list) @@ -403,7 +389,7 @@ NULL }; -static char* host_sys_and_service[] = { +static char* host_sys_and_service_and_rp[] = { "Xen_HostSystem", "Xen_VirtualSystemManagementService", "Xen_VirtualSystemMigrationService", @@ -417,6 +403,24 @@ "LXC_VirtualSystemMigrationService", "LXC_ConsoleRedirectionService", "Linux_ComputerSystem", + "Xen_ProcessorPool", + "Xen_MemoryPool", + "Xen_NetworkPool", + "Xen_DiskPool", + "Xen_GraphicsPool", + "Xen_InputPool", + "KVM_ProcessorPool", + "KVM_MemoryPool", + "KVM_NetworkPool", + "KVM_DiskPool", + "KVM_GraphicsPool", + "KVM_InputPool", + "LXC_ProcessorPool", + "LXC_MemoryPool", + "LXC_NetworkPool", + "LXC_DiskPool", + "LXC_GraphicsPool", + "LXC_InputPool", NULL }; @@ -449,16 +453,16 @@ .make_ref = make_ref_default }; -static struct std_assoc vsm_cap_to_sys_or_service = { +static struct std_assoc vsm_cap_to_sys_or_service_or_rp = { .source_class = (char**)&host_caps, .source_prop = "Capabilities", - .target_class = (char**)&host_sys_and_service, + .target_class = (char**)&host_sys_and_service_and_rp, .target_prop = "ManagedElement", .assoc_class = (char**)&assoc_classname, - .handler = cap_to_sys_or_service, + .handler = cap_to_sys_or_service_or_rp, .make_ref = make_ref }; @@ -540,48 +544,21 @@ "Xen_MemoryPool", "Xen_NetworkPool", "Xen_DiskPool", + "Xen_GraphicsPool", + "Xen_InputPool", "KVM_ProcessorPool", "KVM_MemoryPool", "KVM_NetworkPool", "KVM_DiskPool", + "KVM_GraphicsPool", + "KVM_InputPool", "LXC_ProcessorPool", "LXC_MemoryPool", "LXC_NetworkPool", "LXC_DiskPool", + "LXC_GraphicsPool", + "LXC_InputPool", NULL -}; - -static char* resource_pool_and_host[] = { - "Xen_ProcessorPool", - "Xen_MemoryPool", - "Xen_NetworkPool", - "Xen_DiskPool", - "Xen_HostSystem", - "KVM_ProcessorPool", - "KVM_MemoryPool", - "KVM_NetworkPool", - "KVM_DiskPool", - "KVM_HostSystem", - "LXC_ProcessorPool", - "LXC_MemoryPool", - "LXC_NetworkPool", - "LXC_DiskPool", - "LXC_HostSystem", - NULL -}; - - -static struct std_assoc alloc_cap_to_resource_pool = { - .source_class = (char**)&allocation_capabilities, - .source_prop = "Capabilities", - - .target_class = (char**)&resource_pool_and_host, - .target_prop = "ManagedElement", - - .assoc_class = (char**)&assoc_classname, - - .handler = alloc_to_pool_and_sys, - .make_ref = make_ref }; static struct std_assoc resource_pool_to_alloc_cap = { @@ -599,11 +576,10 @@ static struct std_assoc *assoc_handlers[] = { &system_to_vsm_cap, - &vsm_cap_to_sys_or_service, + &vsm_cap_to_sys_or_service_or_rp, &_service_to_cap, &ele_cap_to_cs, &cs_to_ele_cap, - &alloc_cap_to_resource_pool, &resource_pool_to_alloc_cap, NULL };
KR> CMPIStatus s = {CMPI_RC_OK, NULL}; KR> CMPIInstance *_inst; KR> char* classname; KR> - You alter a random line here and break the style too :) -- Dan Smith IBM Linux Technology Center Open Hypervisor Team email: danms@us.ibm.com
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1226427777 28800 # Node ID aad0a4f3a99cc53a9e61e4c0e6e8e31194cc27fe # Parent f2431416f37653b1aa1b7f728824ac884e986779 Updated ResourcePool related associations to support Graphics/Input pools. Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r f2431416f376 -r aad0a4f3a99c src/Virt_ElementAllocatedFromPool.c --- a/src/Virt_ElementAllocatedFromPool.c Tue Nov 11 10:22:57 2008 -0800 +++ b/src/Virt_ElementAllocatedFromPool.c Tue Nov 11 10:22:57 2008 -0800 @@ -171,14 +171,20 @@ "Xen_MemoryPool", "Xen_NetworkPool", "Xen_DiskPool", + "Xen_GraphicsPool", + "Xen_InputPool", "KVM_ProcessorPool", "KVM_MemoryPool", "KVM_NetworkPool", "KVM_DiskPool", + "KVM_GraphicsPool", + "KVM_InputPool", "LXC_ProcessorPool", "LXC_MemoryPool", "LXC_NetworkPool", "LXC_DiskPool", + "LXC_GraphicsPool", + "LXC_InputPool", NULL }; @@ -187,14 +193,20 @@ "Xen_Memory", "Xen_NetworkPort", "Xen_LogicalDisk", + "Xen_DisplayController", + "Xen_PointingDevice", "KVM_Processor", "KVM_Memory", "KVM_NetworkPort", "KVM_LogicalDisk", + "KVM_DisplayController", + "KVM_PointingDevice", "LXC_Processor", "LXC_Memory", "LXC_NetworkPort", "LXC_LogicalDisk", + "LXC_DisplayController", + "LXC_PointingDevice", NULL }; diff -r f2431416f376 -r aad0a4f3a99c src/Virt_HostedResourcePool.c --- a/src/Virt_HostedResourcePool.c Tue Nov 11 10:22:57 2008 -0800 +++ b/src/Virt_HostedResourcePool.c Tue Nov 11 10:22:57 2008 -0800 @@ -105,14 +105,20 @@ "Xen_MemoryPool", "Xen_NetworkPool", "Xen_DiskPool", + "Xen_GraphicsPool", + "Xen_InputPool", "KVM_ProcessorPool", "KVM_MemoryPool", "KVM_NetworkPool", "KVM_DiskPool", + "KVM_GraphicsPool", + "KVM_InputPool", "LXC_ProcessorPool", "LXC_MemoryPool", "LXC_NetworkPool", "LXC_DiskPool", + "LXC_GraphicsPool", + "LXC_InputPool", NULL }; diff -r f2431416f376 -r aad0a4f3a99c src/Virt_ResourceAllocationFromPool.c --- a/src/Virt_ResourceAllocationFromPool.c Tue Nov 11 10:22:57 2008 -0800 +++ b/src/Virt_ResourceAllocationFromPool.c Tue Nov 11 10:22:57 2008 -0800 @@ -179,14 +179,20 @@ "Xen_MemoryPool", "Xen_NetworkPool", "Xen_DiskPool", + "Xen_GraphicsPool", + "Xen_InputPool", "KVM_ProcessorPool", "KVM_MemoryPool", "KVM_NetworkPool", "KVM_DiskPool", + "KVM_GraphicsPool", + "KVM_InputPool", "LXC_ProcessorPool", "LXC_MemoryPool", "LXC_NetworkPool", "LXC_DiskPool", + "LXC_GraphicsPool", + "LXC_InputPool", NULL }; @@ -195,14 +201,20 @@ "Xen_MemResourceAllocationSettingData", "Xen_NetResourceAllocationSettingData", "Xen_ProcResourceAllocationSettingData", + "Xen_GraphicsResourceAllocationSettingData", + "Xen_InputResourceAllocationSettingData", "KVM_DiskResourceAllocationSettingData", "KVM_MemResourceAllocationSettingData", "KVM_NetResourceAllocationSettingData", "KVM_ProcResourceAllocationSettingData", + "KVM_GraphicsResourceAllocationSettingData", + "KVM_InputResourceAllocationSettingData", "LXC_DiskResourceAllocationSettingData", "LXC_MemResourceAllocationSettingData", "LXC_NetResourceAllocationSettingData", "LXC_ProcResourceAllocationSettingData", + "LXC_GraphicsResourceAllocationSettingData", + "LXC_InputResourceAllocationSettingData", NULL };
participants (2)
-
Dan Smith -
Kaitlin Rupert