# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1222703580 25200 # Node ID 5ace6f8e52c796000cdc1b6795d2075df248299b # Parent 6ad8bd7d0ed88752f9f15db7e1bed692956a4484 (#2) Add RedirectionService to HostSystem support to HostedService. Updates: -Change get_rs() to get_console_rs(). -Change references to RedirectionService to ConsoleRedirectionService. Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r 6ad8bd7d0ed8 -r 5ace6f8e52c7 src/Makefile.am --- a/src/Makefile.am Thu Sep 25 14:14:56 2008 -0700 +++ b/src/Makefile.am Mon Sep 29 08:53:00 2008 -0700 @@ -167,9 +167,9 @@ libVirt_ElementAllocatedFromPool_la_SOURCES = Virt_ElementAllocatedFromPool.c libVirt_ElementAllocatedFromPool_la_LIBADD = -lVirt_DevicePool -lVirt_Device -libVirt_HostedService_la_DEPENDENCIES = libVirt_VirtualSystemManagementService.la libVirt_ResourcePoolConfigurationService.la libVirt_VSMigrationService.la libVirt_HostSystem.la +libVirt_HostedService_la_DEPENDENCIES = libVirt_VirtualSystemManagementService.la libVirt_ResourcePoolConfigurationService.la libVirt_VSMigrationService.la libVirt_HostSystem.la libVirt_ConsoleRedirectionService.la libVirt_HostedService_la_SOURCES = Virt_HostedService.c -libVirt_HostedService_la_LIBADD = -lVirt_VirtualSystemManagementService -lVirt_ResourcePoolConfigurationService -lVirt_VSMigrationService -lVirt_HostSystem +libVirt_HostedService_la_LIBADD = -lVirt_VirtualSystemManagementService -lVirt_ResourcePoolConfigurationService -lVirt_VSMigrationService -lVirt_HostSystem -lVirt_ConsoleRedirectionService libVirt_ElementSettingData_la_DEPENDENCIES = libVirt_VSSD.la libVirt_RASD.la libVirt_ElementSettingData_la_SOURCES = Virt_ElementSettingData.c diff -r 6ad8bd7d0ed8 -r 5ace6f8e52c7 src/Virt_HostedService.c --- a/src/Virt_HostedService.c Thu Sep 25 14:14:56 2008 -0700 +++ b/src/Virt_HostedService.c Mon Sep 29 08:53:00 2008 -0700 @@ -34,6 +34,7 @@ #include "Virt_VirtualSystemManagementService.h" #include "Virt_ResourcePoolConfigurationService.h" #include "Virt_VSMigrationService.h" +#include "Virt_ConsoleRedirectionService.h" const static CMPIBroker *_BROKER; @@ -52,6 +53,8 @@ s = get_rpcs(ref, &inst, _BROKER, context, true); } else if (STREQC(classname, "VirtualSystemMigrationService")) { s = get_migration_service(ref, &inst, _BROKER, context, true); + } else if (STREQC(classname, "ConsoleRedirectionService")) { + s = get_console_rs(ref, &inst, _BROKER, context, true); } free(classname); @@ -112,6 +115,12 @@ if (!CMIsNullObject(inst)) inst_list_add(list, inst); + s = get_console_rs(ref, &inst, _BROKER, info->context, false); + if (s.rc != CMPI_RC_OK) + return s; + if (!CMIsNullObject(inst)) + inst_list_add(list, inst); + return s; } @@ -128,12 +137,15 @@ "Xen_ResourcePoolConfigurationService", "Xen_VirtualSystemManagementService", "Xen_VirtualSystemMigrationService", + "Xen_ConsoleRedirectionService", "KVM_ResourcePoolConfigurationService", "KVM_VirtualSystemManagementService", "KVM_VirtualSystemMigrationService", + "KVM_ConsoleRedirectionService", "LXC_ResourcePoolConfigurationService", "LXC_VirtualSystemManagementService", "LXC_VirtualSystemMigrationService", + "LXC_ConsoleRedirectionService", NULL };