[libvirt] [PATCH 3/6] vz: handle sourceless cdroms

[Maxim Nestratov]

17.05.2016 13:47, Maxim Nestratov пишет:

> From: Mikhail Feoktistov <mfeoktistov at virtuozzo.com>
>
> SDK handles empty cdroms all right. We just need to
> pass "" instead of NULL (not setting is good too).
>
> However we can get problems here. Disk detaching treats source
> as ids. Fortunately disk detaching is not supported for cdroms
> yet and for hard disks we can not get empty source - this is prohibitited
> by xml parsing code.
>
> Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy at virtuozzo.com>
> Signed-off-by: Maxim Nestratov <mnestratov at virtuozzo.com>
> ---
>   src/vz/vz_sdk.c | 10 ++++++----
>   1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
> index b321d39..e373748 100644
> --- a/src/vz/vz_sdk.c
> +++ b/src/vz/vz_sdk.c
> @@ -3216,11 +3216,13 @@ static int prlsdkAddDisk(vzDriverPtr driver,
>       pret = PrlVmDev_SetEmulatedType(sdkdisk, emutype);
>       prlsdkCheckRetGoto(pret, cleanup);
>   
> -    pret = PrlVmDev_SetSysName(sdkdisk, path);
> -    prlsdkCheckRetGoto(pret, cleanup);
> +    if (disk->src->path) {
> +        pret = PrlVmDev_SetSysName(sdkdisk, path);
> +        prlsdkCheckRetGoto(pret, cleanup);
>   
> -    pret = PrlVmDev_SetFriendlyName(sdkdisk, path);
> -    prlsdkCheckRetGoto(pret, cleanup);
> +        pret = PrlVmDev_SetFriendlyName(sdkdisk, path);
> +        prlsdkCheckRetGoto(pret, cleanup);
> +    }
>   
>       drive = &disk->info.addr.drive;
>       if (drive->controller > 0) {

Ooops. This should haven't been pushed.
Reverted and pushed as trivial.