[Libvirt-cim] [PATCH 1/2] VirtualSystemManagementService: Remove dead code

Chip Vincent cvincent at linux.vnet.ibm.com
Thu Jan 12 14:02:16 UTC 2012


Pushed.

On 12/30/2011 11:15 AM, Chip Vincent wrote:
> +1. Thanks.
>
> On 12/29/2011 12:55 PM, Eduardo Lima (Etrunko) wrote:
>> From: Eduardo Lima (Etrunko)<eblima at br.ibm.com>
>>
>> Signed-off-by: Eduardo Lima (Etrunko)<eblima at br.ibm.com>
>> ---
>>   src/Virt_VirtualSystemManagementService.c |   64 -----------------------------
>>   1 files changed, 0 insertions(+), 64 deletions(-)
>>
>> diff --git a/src/Virt_VirtualSystemManagementService.c 
>> b/src/Virt_VirtualSystemManagementService.c
>> index 0141515..4d26429 100644
>> --- a/src/Virt_VirtualSystemManagementService.c
>> +++ b/src/Virt_VirtualSystemManagementService.c
>> @@ -768,70 +768,6 @@ static const char *_net_rand_mac(const CMPIObjectPath *ref)
>>           return _mac;
>>   }
>>
>> -/*
>> -static const char *filter_by_address(struct inst_list *src,
>> -                                    const char *address)
>> -{
>> -        int i;
>> -        CMPIrc ret;
>> -        const char *addr;
>> -        const char *msg = NULL;
>> -        CMPIInstance *inst;
>> -
>> -        for (i = 0; i<  src->cur; i++) {
>> -                inst = src->list[i];
>> -                ret = cu_get_str_prop(inst, "Address",&addr);
>> -
>> -                if (ret != CMPI_RC_OK)
>> -                        continue;
>> -
>> -                if (STREQ(addr, address)) {
>> -                        msg = "Conflicting MAC Addresses";
>> -                        goto out;
>> -                }
>> -        }
>> -out:
>> -    return msg;
>> -
>> -}
>> -
>> -static const char *check_duplicate_mac(CMPIInstance *inst,
>> -                                       const char *mac,
>> -                                       const char *ns)
>> -{
>> -        CMPIObjectPath *op = NULL;
>> -        CMPIStatus s;
>> -        const char *msg = NULL;
>> -        const char *props[] = {"Address", NULL};
>> -        struct inst_list in_list;
>> -
>> -        op = CMGetObjectPath(inst,&s);
>> -        if ((op == NULL) || (s.rc != CMPI_RC_OK)) {
>> -                msg = "Unable to get a reference to the guest";
>> -                goto out;
>> -        }
>> -
>> -         FIXME:  This is a Pegasus work around. Pegsus loses the namespace
>> -                   when an ObjectPath is pulled from an instance
>> -
>> -        if (STREQ(NAMESPACE(op), ""))
>> -                CMSetNameSpace(op, ns);
>> -
>> -        inst_list_init(&in_list);
>> -        s = enum_rasds(_BROKER, op, NULL, CIM_RES_TYPE_NET, props,&in_list);
>> -        if (s.rc != CMPI_RC_OK) {
>> -                msg = "Failed to enumerate network instances";
>> -                goto out;
>> -        }
>> -
>> -        msg = filter_by_address(&in_list, mac);
>> -
>> -out:
>> -        inst_list_free(&in_list);
>> -        return msg;
>> -}
>> -*/
>> -
>>   static const char *net_rasd_to_vdev(CMPIInstance *inst,
>>                                       struct virt_device *dev,
>>                                       const char *ns)
>
>


-- 
Chip Vincent
Open Virtualization
IBM Linux Technology Center
cvincent at linux.vnet.ibm.com




More information about the Libvirt-cim mailing list