Re: [PATCH REBASE 4/4] vz: cleanup: remove trivial function

[Maxim Nestratov <mnestratov@xxxxxxxxxxxxx>]

14.04.2016 13:45, Nikolay Shirokovskiy пишет:

> ---
>   src/vz/vz_sdk.c | 37 +++++++++++++------------------------
>   1 file changed, 13 insertions(+), 24 deletions(-)
>
> diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
> index 4df2ca0..2e9544b 100644
> --- a/src/vz/vz_sdk.c
> +++ b/src/vz/vz_sdk.c
> @@ -3169,25 +3169,6 @@ int prlsdkDetachNet(vzDriverPtr driver,
>       return ret;
>   }
>   
> -static int prlsdkDelDisk(PRL_HANDLE sdkdom, int idx)
> -{
> -    int ret = -1;
> -    PRL_RESULT pret;
> -    PRL_HANDLE sdkdisk = PRL_INVALID_HANDLE;
> -
> -    pret = PrlVmCfg_GetHardDisk(sdkdom, idx, &sdkdisk);
> -    prlsdkCheckRetGoto(pret, cleanup);
> -
> -    pret = PrlVmDev_Remove(sdkdisk);
> -    prlsdkCheckRetGoto(pret, cleanup);
> -
> -    ret = 0;
> -
> - cleanup:
> -    PrlHandle_Free(sdkdisk);
> -    return ret;
> -}
> -
>   static int prlsdkAddDisk(vzDriverPtr driver,
>                            PRL_HANDLE sdkdom,
>                            virDomainDiskDefPtr disk)
> @@ -3809,6 +3790,7 @@ prlsdkDetachDomainHardDisks(PRL_HANDLE sdkdom)
>       PRL_UINT32 hddCount;
>       PRL_UINT32 i;
>       PRL_HANDLE job;
> +    PRL_HANDLE sdkdisk = PRL_INVALID_HANDLE;
>   
>       job = PrlVm_BeginEdit(sdkdom);
>       if (PRL_FAILED(waitJob(job)))
> @@ -3818,17 +3800,24 @@ prlsdkDetachDomainHardDisks(PRL_HANDLE sdkdom)
>       prlsdkCheckRetGoto(pret, cleanup);
>   
>       for (i = 0; i < hddCount; ++i) {
> -        ret = prlsdkDelDisk(sdkdom, i);
> -        if (ret)
> -            goto cleanup;
> +        pret = PrlVmCfg_GetHardDisk(sdkdom, i, &sdkdisk);
> +        prlsdkCheckRetGoto(pret, cleanup);
> +
> +        pret = PrlVmDev_Remove(sdkdisk);
> +        prlsdkCheckRetGoto(pret, cleanup);
> +
> +        PrlHandle_Free(sdkdisk);
> +        sdkdisk = PRL_INVALID_HANDLE;
>       }
>   
>       job = PrlVm_CommitEx(sdkdom, PVCF_DETACH_HDD_BUNDLE);
>       if (PRL_FAILED(waitJob(job)))
> -        ret = -1;
> +        goto cleanup;
>   
> - cleanup:
> +    ret = 0;
>   
> + cleanup:
> +    PrlHandle_Free(sdkdisk);
>       return ret;
>   }
>   

ACK

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list