# HG changeset patch
# User Kaitlin Rupert <karupert(a)us.ibm.com>
# Date 1228154445 28800
# Node ID 674c576418932981ae96a810c7083753cd7786bc
# Parent fe6053054641c236a51fe3ebe861f7ddeb7aaaa2
Add input support to Mod/Del/Add methods.
Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com>
diff -r fe6053054641 -r 674c57641893 src/Makefile.am
--- a/src/Makefile.am Tue Nov 25 09:41:16 2008 -0800
+++ b/src/Makefile.am Mon Dec 01 10:00:45 2008 -0800
@@ -87,9 +87,9 @@
libVirt_ComputerSystemMigrationIndication_la_SOURCES =
Virt_ComputerSystemMigrationIndication.c
libVirt_ComputerSystemMigrationIndication_la_LIBADD = -lVirt_ComputerSystem
-libVirt_VirtualSystemManagementService_la_DEPENDENCIES = libVirt_ComputerSystem.la
libVirt_ComputerSystemIndication.la libVirt_RASD.la libVirt_HostSystem.la
libVirt_DevicePool.la
+libVirt_VirtualSystemManagementService_la_DEPENDENCIES = libVirt_ComputerSystem.la
libVirt_ComputerSystemIndication.la libVirt_RASD.la libVirt_HostSystem.la
libVirt_DevicePool.la libVirt_Device.la
libVirt_VirtualSystemManagementService_la_SOURCES =
Virt_VirtualSystemManagementService.c
-libVirt_VirtualSystemManagementService_la_LIBADD = -lVirt_ComputerSystem
-lVirt_ComputerSystemIndication -lVirt_RASD -lVirt_HostSystem -lVirt_DevicePool
+libVirt_VirtualSystemManagementService_la_LIBADD = -lVirt_ComputerSystem
-lVirt_ComputerSystemIndication -lVirt_RASD -lVirt_HostSystem -lVirt_DevicePool
-lVirt_Device
libVirt_VirtualSystemManagementCapabilities_la_DEPENDENCIES = libVirt_HostSystem.la
libVirt_VirtualSystemManagementCapabilities_la_SOURCES =
Virt_VirtualSystemManagementCapabilities.c
diff -r fe6053054641 -r 674c57641893 src/Virt_VirtualSystemManagementService.c
--- a/src/Virt_VirtualSystemManagementService.c Tue Nov 25 09:41:16 2008 -0800
+++ b/src/Virt_VirtualSystemManagementService.c Mon Dec 01 10:00:45 2008 -0800
@@ -50,6 +50,7 @@
#include "Virt_RASD.h"
#include "Virt_HostSystem.h"
#include "Virt_DevicePool.h"
+#include "Virt_Device.h"
#include "svpc_types.h"
#include "config.h"
@@ -1404,6 +1405,9 @@
} else if (type == CIM_RES_TYPE_GRAPHICS) {
list = &dominfo->dev_graphics;
*count = &dominfo->dev_graphics_ct;
+ } else if (type == CIM_RES_TYPE_INPUT) {
+ list = &dominfo->dev_input;
+ *count = &dominfo->dev_input_ct;
}
return list;
@@ -1522,7 +1526,8 @@
if (STREQ(dev->id, devid)) {
dev->type = CIM_RES_TYPE_UNKNOWN;
- if (type == CIM_RES_TYPE_GRAPHICS)
+ if ((type == CIM_RES_TYPE_GRAPHICS) ||
+ (type == CIM_RES_TYPE_INPUT))
cu_statusf(_BROKER, &s, CMPI_RC_OK, "");
else {
s = _resource_dynamic(dominfo,
@@ -1598,7 +1603,7 @@
dev->type = type;
rasd_to_vdev(rasd, dominfo, dev, ns);
- if (type == CIM_RES_TYPE_GRAPHICS) {
+ if ((type == CIM_RES_TYPE_GRAPHICS) || (type == CIM_RES_TYPE_INPUT)) {
(*count)++;
cu_statusf(_BROKER, &s, CMPI_RC_OK, "");
goto out;
@@ -1661,7 +1666,8 @@
if (STREQ(dev->id, devid)) {
rasd_to_vdev(rasd, dominfo, dev, ns);
- if (type == CIM_RES_TYPE_GRAPHICS)
+ if ((type == CIM_RES_TYPE_GRAPHICS) ||
+ (type == CIM_RES_TYPE_INPUT))
cu_statusf(_BROKER, &s, CMPI_RC_OK, "");
else {
s = _resource_dynamic(dominfo,