[Libvirt-cim] [libvirt-cim] [PATCH] remove script for bridge network

[Wenchao Xia]

于 2012-7-27 0:01, snmishra at linux.vnet.ibm.com 写道:
> Quoting Wenchao Xia <xiawenc at linux.vnet.ibm.com>:
>
>> Hi, Danial
>>    This is a urgent fix for bug in new release, could u help look at it?
>>
>>>    libvirt0.9.10 will report error if bridge network was defined
>>> with script. This is the fix for it, otherwise VM start would fail.
>>>
>>> Signed-off-by: Wenchao Xia <xiawenc at linux.vnet.ibm.com>
>>> ---
>>>   libxkutil/xmlgen.c |    9 +--------
>>>   1 files changed, 1 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/libxkutil/xmlgen.c b/libxkutil/xmlgen.c
>>> index 2dcd0d2..31619d8 100644
>>> --- a/libxkutil/xmlgen.c
>>> +++ b/libxkutil/xmlgen.c
>>> @@ -269,18 +269,11 @@ static const char *set_net_source(xmlNodePtr nic,
>>>           return NULL;
>>>   }
>>>
>>> -
>>> +/* libvirt 0.9.10 report error if script is set with brdige */
>>>   static const char *bridge_net_to_xml(xmlNodePtr nic, struct
>>> net_device *dev)
>>>   {
>>> -        const char *script = "vif-bridge";
>>> -        xmlNodePtr tmp;
>>>           const char *msg = NULL;
>>>
>>> -        tmp = xmlNewChild(nic, NULL, BAD_CAST "script", NULL);
>>> -        if (tmp == NULL)
>>> -                return XML_ERROR;
>>> -        xmlNewProp(tmp, BAD_CAST "path", BAD_CAST script);
>>> -
>>>           msg = set_net_source(nic, dev, "bridge");
>>>
>>>           return msg;
>
> There is nothing much left in this function after removing those lines.
> So, do you still need this funcion or can the remaining code be moved
> some other place?
>
   It is right to remove the function, but for that this is a bug fix
patch I think we could keep the change minimal for now.

> Also, please make sure that removing "vif-bridge" does not break any
> other code path.
   Searched the code and don't other one called this function except
in VM define, so I think it is OK to removed. I am not sure why this
section was added before, I guess it was dong according libvirt document
which shows vif-bridge as an example.

>
> -Sharad Mishra
>>>
>>
>>
>> --
>> Best Regards
>>
>> Wenchao Xia
>>
>> _______________________________________________
>> Libvirt-cim mailing list
>> Libvirt-cim at redhat.com
>> https://www.redhat.com/mailman/listinfo/libvirt-cim
>
>
>
> _______________________________________________
> Libvirt-cim mailing list
> Libvirt-cim at redhat.com
> https://www.redhat.com/mailman/listinfo/libvirt-cim
>


-- 
Best Regards

Wenchao Xia