shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 21:34:54 +03:00
Code Releases Activity

vz: fix template ct creation

Browse Source 
First we don't need to add disk in this case. Second flag should
be skipped.

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
This commit is contained in:
Mikhail Feoktistov 2016-04-08 10:41:35 +03:00 committed by Maxim Nestratov
parent 07761f5d39
commit 4aef1a5e3e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/vz/vz_sdk.c
View File

@ -3435,6 +3435,9 @@ prlsdkAddFS(PRL_HANDLE sdkdom, virDomainFSDefPtr fs)
PRL_HANDLE sdkdisk = PRL_INVALID_HANDLE; PRL_HANDLE sdkdisk = PRL_INVALID_HANDLE;
int ret = -1; int ret = -1;
if (fs->type == VIR_DOMAIN_FS_TYPE_TEMPLATE)
return 0;
if (prlsdkCheckFSUnsupportedParams(fs) < 0) if (prlsdkCheckFSUnsupportedParams(fs) < 0)
return -1; return -1;
@ -3733,6 +3736,7 @@ prlsdkCreateCt(vzDriverPtr driver, virDomainDefPtr def)
PRL_HANDLE job = PRL_INVALID_HANDLE; PRL_HANDLE job = PRL_INVALID_HANDLE;
PRL_HANDLE result = PRL_INVALID_HANDLE; PRL_HANDLE result = PRL_INVALID_HANDLE;
PRL_RESULT pret; PRL_RESULT pret;
PRL_UINT32 flags;
int ret = -1; int ret = -1;
int useTemplate = 0; int useTemplate = 0;
size_t i; size_t i;
@ -3777,8 +3781,10 @@ prlsdkCreateCt(vzDriverPtr driver, virDomainDefPtr def)
if (ret) if (ret)
goto cleanup; goto cleanup;
job = PrlVm_RegEx(sdkdom, "", flags = PACF_NON_INTERACTIVE_MODE;
PACF_NON_INTERACTIVE_MODE | PRNVM_PRESERVE_DISK); if (!useTemplate)
flags |= PRNVM_PRESERVE_DISK;
job = PrlVm_RegEx(sdkdom, "", flags);
if (PRL_FAILED(waitJob(job))) if (PRL_FAILED(waitJob(job)))
ret = -1; ret = -1;