# HG changeset patch # User Dan Smith <danms@us.ibm.com> # Date 1196711744 28800 # Node ID 316176ff9b6325e920a8484d09793c16026d1ce7 # Parent d22f5f8cf494b7d1290e58b337843d2d70fc7f96 Add HostedService support for VirtualSystemMigrationService Signed-off-by: Dan Smith <danms@us.ibm.com> diff -r d22f5f8cf494 -r 316176ff9b63 src/Makefile.am --- a/src/Makefile.am Mon Dec 03 11:55:44 2007 -0800 +++ b/src/Makefile.am Mon Dec 03 11:55:44 2007 -0800 @@ -133,9 +133,9 @@ libVirt_ElementAllocatedFromPool_la_SOUR 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_HostedService_la_DEPENDENCIES = libVirt_VirtualSystemManagementService.la libVirt_ResourcePoolConfigurationService.la libVirt_VSMigrationService.la libVirt_HostedService_la_SOURCES = Virt_HostedService.c -libVirt_HostedService_la_LIBADD = -lVirt_VirtualSystemManagementService -lVirt_ResourcePoolConfigurationService +libVirt_HostedService_la_LIBADD = -lVirt_VirtualSystemManagementService -lVirt_ResourcePoolConfigurationService -lVirt_VSMigrationService libVirt_ElementSettingData_la_DEPENDENCIES = libVirt_VSSD.la libVirt_RASD.la libVirt_ElementSettingData_la_SOURCES = Virt_ElementSettingData.c diff -r d22f5f8cf494 -r 316176ff9b63 src/Virt_HostedService.c --- a/src/Virt_HostedService.c Mon Dec 03 11:55:44 2007 -0800 +++ b/src/Virt_HostedService.c Mon Dec 03 11:55:44 2007 -0800 @@ -33,6 +33,7 @@ #include "Virt_HostSystem.h" #include "Virt_VirtualSystemManagementService.h" #include "Virt_ResourcePoolConfigurationService.h" +#include "Virt_VSMigrationService.h" const static CMPIBroker *_BROKER; @@ -72,6 +73,12 @@ static CMPIStatus host_to_service(const return s; if (!CMIsNullObject(inst)) inst_list_add(list, inst); + + s = get_migration_service(ref, &inst, _BROKER); + if (s.rc != CMPI_RC_OK) + return s; + if (!CMIsNullObject(inst)) + inst_list_add(list, inst); return s; } @@ -116,8 +123,10 @@ char* dependent[] = { char* dependent[] = { "Xen_ResourcePoolConfigurationService", "Xen_VirtualSystemManagementService", + "Xen_VirtualSystemMigrationService", "KVM_ResourcePoolConfigurationService", "KVM_VirtualSystemManagementService", + "KVM_VirtualSystemMigrationService", NULL };