[Libvirt-cim] [PATCH V5 01/15] Remove property CreationClassName in some instance

Wenchao Xia xiawenc at linux.vnet.ibm.com
Sun Mar 24 07:11:16 UTC 2013


于 2013-3-22 0:36, John Ferlan 写道:
> On 03/20/2013 11:39 PM, Wenchao Xia wrote:
>>    There are some instances which did not register this property, so this
>> patch added a parameter in get_typed_instance(). The caller must set it
>> clearly whether to set the property.
>>    When tog-pegasus > 2.12 and its log >= WARNING, tog-pegasus will
>> report this problem in log.
>>
>> Signed-off-by: Wenchao Xia <xiawenc at linux.vnet.ibm.com>
>> ---
>>   libxkutil/misc_util.c                              |   12 ++++++++----
>>   libxkutil/misc_util.h                              |    3 ++-
>>   src/Virt_AllocationCapabilities.c                  |    3 ++-
>>   src/Virt_ComputerSystem.c                          |    6 ++++--
>>   src/Virt_ComputerSystemIndication.c                |    3 ++-
>>   src/Virt_ConsoleRedirectionService.c               |    3 ++-
>>   src/Virt_ConsoleRedirectionServiceCapabilities.c   |    3 ++-
>>   src/Virt_Device.c                                  |   18 ++++++++++++------
>>   src/Virt_DevicePool.c                              |   20 +++++++++++++-------
>>   src/Virt_EnabledLogicalElementCapabilities.c       |    3 ++-
>>   src/Virt_FilterEntry.c                             |    3 ++-
>>   src/Virt_FilterList.c                              |    3 ++-
>>   src/Virt_HostSystem.c                              |    3 ++-
>>   src/Virt_KVMRedirectionSAP.c                       |    3 ++-
>>   src/Virt_RASD.c                                    |    3 ++-
>>   src/Virt_ReferencedProfile.c                       |    3 ++-
>>   src/Virt_RegisteredProfile.c                       |    3 ++-
>>   src/Virt_ResourcePoolConfigurationCapabilities.c   |    3 ++-
>>   src/Virt_ResourcePoolConfigurationService.c        |    8 ++++++--
>>   src/Virt_SettingsDefineCapabilities.c              |    6 ++++--
>>   src/Virt_SwitchService.c                           |    3 ++-
>>   src/Virt_VSMigrationCapabilities.c                 |    3 ++-
>>   src/Virt_VSMigrationService.c                      |    6 ++++--
>>   src/Virt_VSMigrationSettingData.c                  |    3 ++-
>>   src/Virt_VSSD.c                                    |    3 ++-
>>   src/Virt_VirtualSystemManagementCapabilities.c     |    3 ++-
>>   src/Virt_VirtualSystemManagementService.c          |    6 ++++--
>>   src/Virt_VirtualSystemSnapshotService.c            |    3 ++-
>>   ...Virt_VirtualSystemSnapshotServiceCapabilities.c |    3 ++-
>>   29 files changed, 97 insertions(+), 48 deletions(-)
>>
>> diff --git a/libxkutil/misc_util.c b/libxkutil/misc_util.c
>> index 2d149ae..f1b93e4 100644
>> --- a/libxkutil/misc_util.c
>> +++ b/libxkutil/misc_util.c
>> @@ -341,7 +341,8 @@ char *get_typed_class(const char *refcn, const char *new_base)
>>   CMPIInstance *get_typed_instance(const CMPIBroker *broker,
>>                                    const char *refcn,
>>                                    const char *base,
>> -                                 const char *namespace)
>> +                                 const char *namespace,
>> +                                 bool ccn_flag)
>
> While it may seem obvious to you why one would want to provide 'true' or
> 'false' here, could the function header elaborate a bit so that in the
> future when someone "adds" a call to this function they will know
> whether they should pass true or false.  IOW which type of instances
> need this and which do not.
>
> If the answer is "as according to the DSP" - I think that's fine.  I
> don't know where to find the DSP (yet) or at least where/how to make the
> determination that the caller would (or not) need the property.
>
   There is a standard for virtulization with CIM, whether setting it
depends on that. http://dmtf.org/standards/vman
the path is:
DSP standard doc->cim schema file->libvirt-cim code.
   At least schema need to be consistent with libvirt-cim code, when not
sure the standard doc can be checked.

>>From my scan of these - it sems *Capabilities, *Indications, *Filter,
> *Profiles, & *RASDs type classes don't need the property, while specific
> element classes (ComputerSystem, HostSystem, LogicalDisk, NetworkPort,
> etc) and *Service classes need the property.  Is that a "fair" summary?
>
   I think so.

> ACK with description
>
> the remainder looks fine.
>
>
> John
>>   {
>>           char *new_cn;
>>           CMPIObjectPath *op;
>> @@ -360,8 +361,10 @@ CMPIInstance *get_typed_instance(const CMPIBroker *broker,
>>           if ((s.rc != CMPI_RC_OK) || CMIsNullObject(inst))
>>                   goto out;
>>
>> -        CMSetProperty(inst, "CreationClassName",
>> -                      (CMPIValue *)new_cn, CMPI_chars);
>> +        if (ccn_flag) {
>> +                CMSetProperty(inst, "CreationClassName",
>> +                              (CMPIValue *)new_cn, CMPI_chars);
>> +        }
>>
>>    out:
>>           free(new_cn);
>> @@ -467,7 +470,8 @@ CMPIInstance *make_reference(const CMPIBroker *broker,
>>           ref_inst = get_typed_instance(broker,
>>                                         CLASSNAME(source_ref),
>>                                         assoc_classname,
>> -                                      NAMESPACE(source_ref));
>> +                                      NAMESPACE(source_ref),
>> +                                      false);
>>
>>           if (ref_inst != NULL) {
>>                   CMPIObjectPath *target_ref;
>> diff --git a/libxkutil/misc_util.h b/libxkutil/misc_util.h
>> index c7a2122..90fb2da 100644
>> --- a/libxkutil/misc_util.h
>> +++ b/libxkutil/misc_util.h
>> @@ -85,7 +85,8 @@ char *get_typed_class(const char *refcn, const char *new_base);
>>   CMPIInstance *get_typed_instance(const CMPIBroker *broker,
>>                                    const char *refcn,
>>                                    const char *base,
>> -                                 const char *namespace);
>> +                                 const char *namespace,
>> +                                 bool ccn_flag);
>>
>>   /* Parse an OrgID:LocID string into its constituent parts */
>>   int parse_instance_id(char *iid, char **orgid, char **locid);
>> diff --git a/src/Virt_AllocationCapabilities.c b/src/Virt_AllocationCapabilities.c
>> index 970abeb..b358fac 100644
>> --- a/src/Virt_AllocationCapabilities.c
>> +++ b/src/Virt_AllocationCapabilities.c
>> @@ -46,7 +46,8 @@ static CMPIStatus ac_from_pool(const CMPIBroker *broker,
>>           *alloc_cap = get_typed_instance(broker,
>>                                           CLASSNAME(ref),
>>                                           "AllocationCapabilities",
>> -                                        NAMESPACE(ref));
>> +                                        NAMESPACE(ref),
>> +                                        false);
>>           if (*alloc_cap == NULL) {
>>                   cu_statusf(broker, &s,
>>                              CMPI_RC_ERR_FAILED,
>> diff --git a/src/Virt_ComputerSystem.c b/src/Virt_ComputerSystem.c
>> index e6c7e55..4a9b26d 100644
>> --- a/src/Virt_ComputerSystem.c
>> +++ b/src/Virt_ComputerSystem.c
>> @@ -440,7 +440,8 @@ CMPIStatus instance_from_dominfo(const CMPIBroker *broker,
>>           inst = get_typed_instance(broker,
>>                                     prefix,
>>                                     "ComputerSystem",
>> -                                  namespace);
>> +                                  namespace,
>> +                                  true);
>>
>>           if (inst == NULL) {
>>                   CU_DEBUG("Could not init CS instance. "
>> @@ -560,7 +561,8 @@ static CMPIStatus instance_from_dom(const CMPIBroker *broker,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "ComputerSystem",
>> -                                  NAMESPACE(reference));
>> +                                  NAMESPACE(reference),
>> +                                  true);
>>           if (inst == NULL) {
>>                   cu_statusf(broker, &s,
>>                              CMPI_RC_ERR_FAILED,
>> diff --git a/src/Virt_ComputerSystemIndication.c b/src/Virt_ComputerSystemIndication.c
>> index 2d0a94e..3096683 100644
>> --- a/src/Virt_ComputerSystemIndication.c
>> +++ b/src/Virt_ComputerSystemIndication.c
>> @@ -239,7 +239,8 @@ static bool _do_indication(const CMPIBroker *broker,
>>           ind = get_typed_instance(broker,
>>                                    prefix,
>>                                    ind_type_name,
>> -                                 args->ns);
>> +                                 args->ns,
>> +                                 false);
>>
>>           /* Generally report errors and hope to continue, since we have no one
>>              to actually return status to. */
>> diff --git a/src/Virt_ConsoleRedirectionService.c b/src/Virt_ConsoleRedirectionService.c
>> index 7b20c0d..16cade8 100644
>> --- a/src/Virt_ConsoleRedirectionService.c
>> +++ b/src/Virt_ConsoleRedirectionService.c
>> @@ -129,7 +129,8 @@ CMPIStatus get_console_rs(const CMPIObjectPath *reference,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "ConsoleRedirectionService",
>> -                                  NAMESPACE(reference));
>> +                                  NAMESPACE(reference),
>> +                                  true);
>>
>>           if (inst == NULL) {
>>                   CU_DEBUG("Failed to get typed instance");
>> diff --git a/src/Virt_ConsoleRedirectionServiceCapabilities.c b/src/Virt_ConsoleRedirectionServiceCapabilities.c
>> index 11f2986..88fb3a4 100644
>> --- a/src/Virt_ConsoleRedirectionServiceCapabilities.c
>> +++ b/src/Virt_ConsoleRedirectionServiceCapabilities.c
>> @@ -91,7 +91,8 @@ CMPIStatus get_console_rs_caps(const CMPIBroker *broker,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "ConsoleRedirectionServiceCapabilities",
>> -                                  NAMESPACE(ref));
>> +                                  NAMESPACE(ref),
>> +                                  false);
>>           if (inst == NULL) {
>>                   cu_statusf(broker, &s,
>>                              CMPI_RC_ERR_FAILED,
>> diff --git a/src/Virt_Device.c b/src/Virt_Device.c
>> index e047a94..c7dcbc3 100644
>> --- a/src/Virt_Device.c
>> +++ b/src/Virt_Device.c
>> @@ -100,7 +100,8 @@ static CMPIInstance *net_instance(const CMPIBroker *broker,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "NetworkPort",
>> -                                  ns);
>> +                                  ns,
>> +                                  true);
>>
>>           if (inst == NULL) {
>>                   CU_DEBUG("Failed to get instance for NetworkPort");
>> @@ -138,7 +139,8 @@ static CMPIInstance *disk_instance(const CMPIBroker *broker,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "LogicalDisk",
>> -                                  ns);
>> +                                  ns,
>> +                                  true);
>>
>>           if (inst == NULL) {
>>                   CU_DEBUG("Failed to get instance for LogicalDisk");
>> @@ -185,7 +187,8 @@ static CMPIInstance *mem_instance(const CMPIBroker *broker,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "Memory",
>> -                                  ns);
>> +                                  ns,
>> +                                  true);
>>
>>           if (inst == NULL) {
>>                   CU_DEBUG("Failed to get instance for Memory");
>> @@ -234,7 +237,8 @@ static CMPIInstance *graphics_instance(const CMPIBroker *broker,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "DisplayController",
>> -                                  ns);
>> +                                  ns,
>> +                                  true);
>>
>>           if (inst == NULL) {
>>                   CU_DEBUG("Failed to get instance for DisplayController");
>> @@ -320,7 +324,8 @@ static CMPIInstance *input_instance(const CMPIBroker *broker,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "PointingDevice",
>> -                                  ns);
>> +                                  ns,
>> +                                  true);
>>           if (inst == NULL) {
>>                   CU_DEBUG("Failed to get instance of %s_PointingDevice",
>>                            pfx_from_conn(conn));
>> @@ -407,7 +412,8 @@ static bool vcpu_inst(const CMPIBroker *broker,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "Processor",
>> -                                  ns);
>> +                                  ns,
>> +                                  true);
>>           if (inst == NULL)
>>                   return false;
>>
>> diff --git a/src/Virt_DevicePool.c b/src/Virt_DevicePool.c
>> index 202e509..56c9715 100644
>> --- a/src/Virt_DevicePool.c
>> +++ b/src/Virt_DevicePool.c
>> @@ -803,7 +803,8 @@ static CMPIStatus mempool_instance(virConnectPtr conn,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "MemoryPool",
>> -                                  ns);
>> +                                  ns,
>> +                                  false);
>>
>>           if (inst == NULL) {
>>                   cu_statusf(broker, &s,
>> @@ -842,7 +843,8 @@ static CMPIStatus procpool_instance(virConnectPtr conn,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "ProcessorPool",
>> -                                  ns);
>> +                                  ns,
>> +                                  false);
>>
>>           if (inst == NULL) {
>>                   cu_statusf(broker, &s,
>> @@ -872,7 +874,8 @@ static CMPIStatus _netpool_for_parent(struct inst_list *list,
>>           inst = get_typed_instance(broker,
>>                                     refcn,
>>                                     "NetworkPool",
>> -                                  ns);
>> +                                  ns,
>> +                                  false);
>>           if (inst == NULL) {
>>                   CU_DEBUG("Unable to get instance: %s:%s_NetworkPool",
>>                            ns, refcn);
>> @@ -928,7 +931,8 @@ static CMPIStatus _netpool_for_network(struct inst_list *list,
>>           inst = get_typed_instance(broker,
>>                                     refcn,
>>                                     "NetworkPool",
>> -                                  ns);
>> +                                  ns,
>> +                                  false);
>>           if (inst == NULL) {
>>                   CU_DEBUG("Unable to get instance: %s:%s_NetworkPool",
>>                            ns, refcn);
>> @@ -1046,7 +1050,7 @@ static CMPIInstance *diskpool_from_path(struct tmp_disk_pool *pool,
>>           CMPIInstance *inst;
>>           char *poolid = NULL;
>>
>> -        inst = get_typed_instance(broker, refcn, "DiskPool", ns);
>> +        inst = get_typed_instance(broker, refcn, "DiskPool", ns, false);
>>
>>           if (inst == NULL) {
>>                   cu_statusf(broker, &s,
>> @@ -1136,7 +1140,8 @@ static CMPIStatus graphicspool_instance(virConnectPtr conn,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "GraphicsPool",
>> -                                  ns);
>> +                                  ns,
>> +                                  false);
>>           if (inst == NULL) {
>>                   cu_statusf(broker, &s,
>>                              CMPI_RC_ERR_FAILED,
>> @@ -1172,7 +1177,8 @@ static CMPIStatus inputpool_instance(virConnectPtr conn,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "InputPool",
>> -                                  ns);
>> +                                  ns,
>> +                                  false);
>>           if (inst == NULL) {
>>                   cu_statusf(broker, &s,
>>                              CMPI_RC_ERR_FAILED,
>> diff --git a/src/Virt_EnabledLogicalElementCapabilities.c b/src/Virt_EnabledLogicalElementCapabilities.c
>> index 7ba5eae..2fcdef1 100644
>> --- a/src/Virt_EnabledLogicalElementCapabilities.c
>> +++ b/src/Virt_EnabledLogicalElementCapabilities.c
>> @@ -61,7 +61,8 @@ static CMPIInstance *_get_elec(const CMPIBroker *broker,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "EnabledLogicalElementCapabilities",
>> -                                  NAMESPACE(reference));
>> +                                  NAMESPACE(reference),
>> +                                  false);
>>           if (inst == NULL) {
>>                   cu_statusf(broker, s,
>>                              CMPI_RC_ERR_FAILED,
>> diff --git a/src/Virt_FilterEntry.c b/src/Virt_FilterEntry.c
>> index 126615b..3c4a3e6 100644
>> --- a/src/Virt_FilterEntry.c
>> +++ b/src/Virt_FilterEntry.c
>> @@ -546,7 +546,8 @@ static CMPIInstance *convert_rule_to_instance(
>>           inst = get_typed_instance(broker,
>>                                     CLASSNAME(reference),
>>                                     basename,
>> -                                  NAMESPACE(reference));
>> +                                  NAMESPACE(reference),
>> +                                  true);
>>
>>           if (inst == NULL) {
>>                   cu_statusf(broker, s,
>> diff --git a/src/Virt_FilterList.c b/src/Virt_FilterList.c
>> index 9b5dbae..79776cd 100644
>> --- a/src/Virt_FilterList.c
>> +++ b/src/Virt_FilterList.c
>> @@ -50,7 +50,8 @@ static CMPIInstance *convert_filter_to_instance(
>>           inst = get_typed_instance(broker,
>>                                     CLASSNAME(reference),
>>                                     "FilterList",
>> -                                  NAMESPACE(reference));
>> +                                  NAMESPACE(reference),
>> +                                  true);
>>           if (inst == NULL) {
>>                   cu_statusf(broker, s,
>>                              CMPI_RC_ERR_FAILED,
>> diff --git a/src/Virt_HostSystem.c b/src/Virt_HostSystem.c
>> index 724a5ea..c31d6cf 100644
>> --- a/src/Virt_HostSystem.c
>> +++ b/src/Virt_HostSystem.c
>> @@ -135,7 +135,8 @@ static CMPIStatus fake_host(const CMPIBroker *broker,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "HostSystem",
>> -                                  NAMESPACE(reference));
>> +                                  NAMESPACE(reference),
>> +                                  true);
>>
>>           if (inst == NULL) {
>>                   cu_statusf(broker, &s,
>> diff --git a/src/Virt_KVMRedirectionSAP.c b/src/Virt_KVMRedirectionSAP.c
>> index db34d57..38ad468 100644
>> --- a/src/Virt_KVMRedirectionSAP.c
>> +++ b/src/Virt_KVMRedirectionSAP.c
>> @@ -125,7 +125,8 @@ static CMPIInstance *get_console_sap(const CMPIBroker *broker,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "KVMRedirectionSAP",
>> -                                  NAMESPACE(reference));
>> +                                  NAMESPACE(reference),
>> +                                  true);
>>
>>           if (inst == NULL) {
>>                   cu_statusf(broker, s,
>> diff --git a/src/Virt_RASD.c b/src/Virt_RASD.c
>> index 9493077..6e8a244 100644
>> --- a/src/Virt_RASD.c
>> +++ b/src/Virt_RASD.c
>> @@ -716,7 +716,8 @@ CMPIInstance *rasd_from_vdev(const CMPIBroker *broker,
>>           inst = get_typed_instance(broker,
>>                                     CLASSNAME(ref),
>>                                     base,
>> -                                  NAMESPACE(ref));
>> +                                  NAMESPACE(ref),
>> +                                  false);
>>           if (inst == NULL)
>>                   return inst;
>>
>> diff --git a/src/Virt_ReferencedProfile.c b/src/Virt_ReferencedProfile.c
>> index 150be1f..e78a8d3 100644
>> --- a/src/Virt_ReferencedProfile.c
>> +++ b/src/Virt_ReferencedProfile.c
>> @@ -242,7 +242,8 @@ static CMPIInstance *make_ref(const CMPIObjectPath *source_ref,
>>           ref_inst = get_typed_instance(_BROKER,
>>                                         CLASSNAME(source_ref),
>>                                         assoc_classname,
>> -                                      NAMESPACE(source_ref));
>> +                                      NAMESPACE(source_ref),
>> +                                      false);
>>
>>           source = get_reg_prof_by_ref(source_ref);
>>           if (source->scoping_profile != NULL)
>> diff --git a/src/Virt_RegisteredProfile.c b/src/Virt_RegisteredProfile.c
>> index 389a179..e644708 100644
>> --- a/src/Virt_RegisteredProfile.c
>> +++ b/src/Virt_RegisteredProfile.c
>> @@ -54,7 +54,8 @@ CMPIStatus get_profile(const CMPIBroker *broker,
>>           instance = get_typed_instance(broker,
>>                                         pfx,
>>                                         "RegisteredProfile",
>> -                                      CIM_INTEROP_NS);
>> +                                      CIM_INTEROP_NS,
>> +                                      false);
>>
>>           if (instance == NULL) {
>>                   cu_statusf(broker, &s,
>> diff --git a/src/Virt_ResourcePoolConfigurationCapabilities.c b/src/Virt_ResourcePoolConfigurationCapabilities.c
>> index 32274ed..2dcbbcf 100644
>> --- a/src/Virt_ResourcePoolConfigurationCapabilities.c
>> +++ b/src/Virt_ResourcePoolConfigurationCapabilities.c
>> @@ -69,7 +69,8 @@ static CMPIStatus get_rpc_cap(const CMPIObjectPath *reference,
>>           inst = get_typed_instance(_BROKER,
>>                                     pfx_from_conn(conn),
>>                                     "ResourcePoolConfigurationCapabilities",
>> -                                  NAMESPACE(reference));
>> +                                  NAMESPACE(reference),
>> +                                  false);
>>           if (inst == NULL) {
>>                   cu_statusf(_BROKER, &s,
>>                              CMPI_RC_ERR_FAILED,
>> diff --git a/src/Virt_ResourcePoolConfigurationService.c b/src/Virt_ResourcePoolConfigurationService.c
>> index 751d016..0c0cc06 100644
>> --- a/src/Virt_ResourcePoolConfigurationService.c
>> +++ b/src/Virt_ResourcePoolConfigurationService.c
>> @@ -781,6 +781,8 @@ static const char *rasd_to_res(CMPIInstance *inst,
>>           return msg;
>>   }
>>
>> +/* Warning: returned instance is not freed manually in caller, need confirm
>> +   if server will auto free it. */
>>   static CMPIInstance *get_resource_rasd(struct virt_pool_res *res,
>>                                          const CMPIObjectPath *ref,
>>                                          CMPIStatus *s)
>> @@ -798,7 +800,8 @@ static CMPIInstance *get_resource_rasd(struct virt_pool_res *res,
>>           inst = get_typed_instance(_BROKER,
>>                                     CLASSNAME(ref),
>>                                     "StorageVolumeResourceAllocationSettingData",
>> -                                  NAMESPACE(ref));
>> +                                  NAMESPACE(ref),
>> +                                  false);
>>           if (inst == NULL) {
>>                   cu_statusf(_BROKER, s,
>>                              CMPI_RC_ERR_FAILED,
>> @@ -1279,7 +1282,8 @@ CMPIStatus get_rpcs(const CMPIObjectPath *reference,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "ResourcePoolConfigurationService",
>> -                                  NAMESPACE(reference));
>> +                                  NAMESPACE(reference),
>> +                                  true);
>>           if (inst == NULL) {
>>                   cu_statusf(broker, &s,
>>                              CMPI_RC_ERR_FAILED,
>> diff --git a/src/Virt_SettingsDefineCapabilities.c b/src/Virt_SettingsDefineCapabilities.c
>> index 9eb9e57..5091205 100644
>> --- a/src/Virt_SettingsDefineCapabilities.c
>> +++ b/src/Virt_SettingsDefineCapabilities.c
>> @@ -113,7 +113,8 @@ static CMPIInstance *default_vssd_instance(const char *prefix,
>>           inst = get_typed_instance(_BROKER,
>>                                     prefix,
>>                                     "VirtualSystemSettingData",
>> -                                  ns);
>> +                                  ns,
>> +                                  false);
>>           if (inst == NULL) {
>>                   CU_DEBUG("Failed to create default VSSD instance");
>>                   goto out;
>> @@ -303,7 +304,8 @@ static CMPIInstance *sdc_rasd_inst(CMPIStatus *s,
>>           inst = get_typed_instance(_BROKER,
>>                                     CLASSNAME(ref),
>>                                     base,
>> -                                  NAMESPACE(ref));
>> +                                  NAMESPACE(ref),
>> +                                  false);
>>
>>           if (inst == NULL) {
>>                   cu_statusf(_BROKER, s,
>> diff --git a/src/Virt_SwitchService.c b/src/Virt_SwitchService.c
>> index 7e59d38..8991426 100644
>> --- a/src/Virt_SwitchService.c
>> +++ b/src/Virt_SwitchService.c
>> @@ -229,7 +229,8 @@ static CMPIStatus get_switchservice(const CMPIObjectPath *reference,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "SwitchService",
>> -                                  NAMESPACE(reference));
>> +                                  NAMESPACE(reference),
>> +                                  true);
>>
>>           if (inst == NULL) {
>>                   CU_DEBUG("Failed to get typed instance");
>> diff --git a/src/Virt_VSMigrationCapabilities.c b/src/Virt_VSMigrationCapabilities.c
>> index 4f0e434..3e53f68 100644
>> --- a/src/Virt_VSMigrationCapabilities.c
>> +++ b/src/Virt_VSMigrationCapabilities.c
>> @@ -134,7 +134,8 @@ CMPIStatus get_migration_caps(const CMPIObjectPath *ref,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "VirtualSystemMigrationCapabilities",
>> -                                  NAMESPACE(ref));
>> +                                  NAMESPACE(ref),
>> +                                  false);
>>           if (inst == NULL) {
>>                   cu_statusf(broker, &s,
>>                              CMPI_RC_ERR_FAILED,
>> diff --git a/src/Virt_VSMigrationService.c b/src/Virt_VSMigrationService.c
>> index 76e3d25..1f6659d 100644
>> --- a/src/Virt_VSMigrationService.c
>> +++ b/src/Virt_VSMigrationService.c
>> @@ -831,7 +831,8 @@ static CMPIInstance *prepare_indication(const CMPIBroker *broker,
>>           ind = get_typed_instance(broker,
>>                                    pfx,
>>                                    ind_name,
>> -                                 job->ref_ns);
>> +                                 job->ref_ns,
>> +                                 false);
>>           if (ind == NULL) {
>>                   CU_DEBUG("Failed to create ind, type '%s:%s_%s'",
>>                            job->ref_ns, pfx, ind_name);
>> @@ -1686,7 +1687,8 @@ CMPIStatus get_migration_service(const CMPIObjectPath *ref,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "VirtualSystemMigrationService",
>> -                                  NAMESPACE(ref));
>> +                                  NAMESPACE(ref),
>> +                                  true);
>>           if (inst == NULL) {
>>                   cu_statusf(broker, &s,
>>                              CMPI_RC_ERR_FAILED,
>> diff --git a/src/Virt_VSMigrationSettingData.c b/src/Virt_VSMigrationSettingData.c
>> index a6707bd..eb545f1 100644
>> --- a/src/Virt_VSMigrationSettingData.c
>> +++ b/src/Virt_VSMigrationSettingData.c
>> @@ -79,7 +79,8 @@ CMPIStatus get_migration_sd(const CMPIObjectPath *ref,
>>           inst = get_typed_instance(broker,
>>                                     CLASSNAME(ref),
>>                                     "VirtualSystemMigrationSettingData",
>> -                                  NAMESPACE(ref));
>> +                                  NAMESPACE(ref),
>> +                                  false);
>>           if (inst == NULL) {
>>                   cu_statusf(broker, &s,
>>                              CMPI_RC_ERR_FAILED,
>> diff --git a/src/Virt_VSSD.c b/src/Virt_VSSD.c
>> index 499b157..975623b 100644
>> --- a/src/Virt_VSSD.c
>> +++ b/src/Virt_VSSD.c
>> @@ -285,7 +285,8 @@ static CMPIInstance *_get_vssd(const CMPIBroker *broker,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "VirtualSystemSettingData",
>> -                                  NAMESPACE(reference));
>> +                                  NAMESPACE(reference),
>> +                                  false);
>>
>>           if (inst == NULL) {
>>                   cu_statusf(broker, s,
>> diff --git a/src/Virt_VirtualSystemManagementCapabilities.c b/src/Virt_VirtualSystemManagementCapabilities.c
>> index 020ce8a..51738ee 100644
>> --- a/src/Virt_VirtualSystemManagementCapabilities.c
>> +++ b/src/Virt_VirtualSystemManagementCapabilities.c
>> @@ -129,7 +129,8 @@ CMPIStatus get_vsm_cap(const CMPIBroker *broker,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "VirtualSystemManagementCapabilities",
>> -                                  NAMESPACE(ref));
>> +                                  NAMESPACE(ref),
>> +                                  false);
>>           if (inst == NULL) {
>>                   cu_statusf(broker, &s,
>>                              CMPI_RC_ERR_FAILED,
>> diff --git a/src/Virt_VirtualSystemManagementService.c b/src/Virt_VirtualSystemManagementService.c
>> index 10adf8b..96c8a03 100644
>> --- a/src/Virt_VirtualSystemManagementService.c
>> +++ b/src/Virt_VirtualSystemManagementService.c
>> @@ -1928,7 +1928,8 @@ static CMPIStatus raise_rasd_indication(const CMPIContext *context,
>>                   ind = get_typed_instance(_BROKER,
>>                                            CLASSNAME(ref),
>>                                            base_type,
>> -                                         NAMESPACE(ref));
>> +                                         NAMESPACE(ref),
>> +                                         false);
>>                   if (ind == NULL)  {
>>                           CU_DEBUG("Failed to get indication instance");
>>                           s.rc = CMPI_RC_ERR_FAILED;
>> @@ -3293,7 +3294,8 @@ CMPIStatus get_vsms(const CMPIObjectPath *reference,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "VirtualSystemManagementService",
>> -                                  NAMESPACE(reference));
>> +                                  NAMESPACE(reference),
>> +                                  true);
>>
>>           if (inst == NULL) {
>>                   CU_DEBUG("Failed to get typed instance");
>> diff --git a/src/Virt_VirtualSystemSnapshotService.c b/src/Virt_VirtualSystemSnapshotService.c
>> index aae628f..8c0889d 100644
>> --- a/src/Virt_VirtualSystemSnapshotService.c
>> +++ b/src/Virt_VirtualSystemSnapshotService.c
>> @@ -681,7 +681,8 @@ CMPIStatus get_vsss(const CMPIBroker *broker,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "VirtualSystemSnapshotService",
>> -                                  NAMESPACE(ref));
>> +                                  NAMESPACE(ref),
>> +                                  true);
>>           if (inst == NULL) {
>>                   cu_statusf(broker, &s,
>>                              CMPI_RC_ERR_FAILED,
>> diff --git a/src/Virt_VirtualSystemSnapshotServiceCapabilities.c b/src/Virt_VirtualSystemSnapshotServiceCapabilities.c
>> index 69c8e97..04a9c7a 100644
>> --- a/src/Virt_VirtualSystemSnapshotServiceCapabilities.c
>> +++ b/src/Virt_VirtualSystemSnapshotServiceCapabilities.c
>> @@ -117,7 +117,8 @@ CMPIStatus get_vss_cap(const CMPIBroker *broker,
>>           inst = get_typed_instance(broker,
>>                                     pfx_from_conn(conn),
>>                                     "VirtualSystemSnapshotServiceCapabilities",
>> -                                  NAMESPACE(ref));
>> +                                  NAMESPACE(ref),
>> +                                  false);
>>           if (inst == NULL) {
>>                   cu_statusf(broker, &s,
>>                              CMPI_RC_ERR_FAILED,
>>
>
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
>


-- 
Best Regards

Wenchao Xia




More information about the Libvirt-cim mailing list