[libvirt] [PATCH] python: Properly report errors if virStreamRecv fails

Cole Robinson crobinso at redhat.com
Tue Jul 26 23:34:19 UTC 2011


On 07/26/2011 07:27 PM, Eric Blake wrote:
> On 07/26/2011 05:26 PM, Cole Robinson wrote:
>> We only want to raise the special value -2. -1 should return None
>> which tells the bindings to throw an exception.
>> ---
>>   python/libvirt-override.c |    4 +++-
>>   1 files changed, 3 insertions(+), 1 deletions(-)
>>
>> diff --git a/python/libvirt-override.c b/python/libvirt-override.c
>> index 70e0238..bdff0e9 100644
>> --- a/python/libvirt-override.c
>> +++ b/python/libvirt-override.c
>> @@ -4138,8 +4138,10 @@ libvirt_virStreamRecv(PyObject *self ATTRIBUTE_UNUSED,
>>       buf[ret>  -1 ? ret : 0] = '\0';
>>       DEBUG("StreamRecv ret=%d strlen=%d\n", ret, (int) strlen(buf));
>>
>> -    if (ret<  0)
>> +    if (ret == -2)
>>           return libvirt_intWrap(ret);
>> +    if (ret<  0)
>> +        return VIR_PY_NONE;
>>       return libvirt_charPtrSizeWrap((char *) buf, (Py_ssize_t) ret);
> 
> ACK.
> 

Speedy! Pushed now.

- Cole




More information about the libvir-list mailing list