[libvirt] [PATCH 4/4] parallels: minor cleanup

Maxim Nestratov mnestratov at parallels.com
Tue Mar 17 14:53:38 UTC 2015


17.03.2015 17:51, Michal Privoznik пишет:
> On 13.03.2015 16:40, Maxim Nestratov wrote:
>> indentation is fixed, unnecessary error message removed,
>> unnecessary job freeing removed
>>
>> Signed-off-by: Maxim Nestratov <mnestratov at parallels.com>
>> ---
>>   src/parallels/parallels_sdk.c |    5 +----
>>   1 files changed, 1 insertions(+), 4 deletions(-)
>>
>> diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c
>> index 1025da5..f6350df 100644
>> --- a/src/parallels/parallels_sdk.c
>> +++ b/src/parallels/parallels_sdk.c
>> @@ -698,7 +698,7 @@ prlsdkGetNetInfo(PRL_HANDLE netAdapter, virDomainNetDefPtr net, bool isCt)
>>           goto cleanup;
>>   
>>       pret = PrlVmDevNet_GetHostInterfaceName(netAdapter, net->ifname, &buflen);
>> -        prlsdkCheckRetGoto(pret, cleanup);
>> +    prlsdkCheckRetGoto(pret, cleanup);
>>   
>>       pret = PrlVmDev_GetIndex(netAdapter, &netAdapterIndex);
>>       prlsdkCheckRetGoto(pret, cleanup);
>> @@ -1360,7 +1360,6 @@ prlsdkLoadDomains(parallelsConnPtr privconn)
>>   
>>    error:
>>       PrlHandle_Free(result);
>> -    PrlHandle_Free(job);
>>       return -1;
>>   }
>>   
>> @@ -1740,8 +1739,6 @@ prlsdkDomainChangeState(virDomainPtr domain,
>>   
>>       pdom = dom->privateData;
>>       pret = chstate(privconn, pdom->sdkdom);
>> -    virReportError(VIR_ERR_OPERATION_FAILED,
>> -                   _("Can't change domain state: %d"), pret);
>>       if (PRL_FAILED(pret)) {
>>           virResetLastError();
>>   
>>
> I'm having some difficulties applying this patch. Can you rebase to the
> current master and resend? The problem is in the first chunk, I guess.
>
> Michal
Sure. In a minute.




More information about the libvir-list mailing list