[libvirt] [PATCH 1/1] vz: fix raise in vzDomainBlock
Need begin job before lookup disk in config, because it can be edited at this moment. Signed-off-by: Konstantin Neumoin <kneumoin@virtuozzo.com> --- src/vz/vz_driver.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 8f94326..954ca6a 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -4000,12 +4000,6 @@ vzDomainBlockResize(virDomainPtr domain, size /= 1024; size /= 1024; - if (!(disk = virDomainDiskByName(dom->def, path, false))) { - virReportError(VIR_ERR_INVALID_ARG, - _("invalid path: %s"), path); - goto cleanup; - } - if (vzDomainObjBeginJob(dom) < 0) goto cleanup; job = true; @@ -4019,6 +4013,12 @@ vzDomainBlockResize(virDomainPtr domain, goto cleanup; } + if (!(disk = virDomainDiskByName(dom->def, path, false))) { + virReportError(VIR_ERR_INVALID_ARG, + _("invalid path: %s"), path); + goto cleanup; + } + ret = prlsdkResizeImage(dom, disk, size); cleanup: -- 2.7.4
No need begin job for asynchronous operation. Signed-off-by: Konstantin Neumoin <kneumoin@virtuozzo.com> --- src/vz/vz_sdk.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 138aea3..bc1a9eb 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -3926,30 +3926,18 @@ prlsdkDomainSetUserPassword(virDomainObjPtr dom, const char *user, const char *password) { - int ret = -1; vzDomObjPtr privdom = dom->privateData; PRL_HANDLE job = PRL_INVALID_HANDLE; - job = PrlVm_BeginEdit(privdom->sdkdom); - if (PRL_FAILED(waitDomainJob(job, dom))) - goto cleanup; - job = PrlVm_SetUserPasswd(privdom->sdkdom, user, password, 0); if (PRL_FAILED(waitDomainJob(job, dom))) - goto cleanup; - - job = PrlVm_CommitEx(privdom->sdkdom, 0); - if (PRL_FAILED(waitDomainJob(job, dom))) - goto cleanup; - - ret = 0; + return -1; - cleanup: - return ret; + return 0; } static int -- 2.7.4
On 03.05.2017 13:44, Konstantin Neumoin wrote:
No need begin job for asynchronous operation.
Signed-off-by: Konstantin Neumoin <kneumoin@virtuozzo.com> --- src/vz/vz_sdk.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-)
diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 138aea3..bc1a9eb 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -3926,30 +3926,18 @@ prlsdkDomainSetUserPassword(virDomainObjPtr dom, const char *user, const char *password) { - int ret = -1; vzDomObjPtr privdom = dom->privateData; PRL_HANDLE job = PRL_INVALID_HANDLE;
- job = PrlVm_BeginEdit(privdom->sdkdom); - if (PRL_FAILED(waitDomainJob(job, dom))) - goto cleanup; - job = PrlVm_SetUserPasswd(privdom->sdkdom, user, password, 0);
if (PRL_FAILED(waitDomainJob(job, dom))) - goto cleanup; - - job = PrlVm_CommitEx(privdom->sdkdom, 0); - if (PRL_FAILED(waitDomainJob(job, dom))) - goto cleanup; - - ret = 0; + return -1;
- cleanup: - return ret; + return 0; }
static int
ACK
On 05/03/2017 04:18 PM, Nikolay Shirokovskiy wrote:
On 03.05.2017 13:44, Konstantin Neumoin wrote:
No need begin job for asynchronous operation.
Signed-off-by: Konstantin Neumoin <kneumoin@virtuozzo.com> --- src/vz/vz_sdk.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-)
ACK
Now pushed. Michal
On 03.05.2017 13:44, Konstantin Neumoin wrote:
Need begin job before lookup disk in config, because it can be edited at this moment.
I would slightly change commit message to something like: Put domain access after acquiring job condition, otherwise another job can change it meanwhile. Otherwise ACK.
Signed-off-by: Konstantin Neumoin <kneumoin@virtuozzo.com> --- src/vz/vz_driver.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 8f94326..954ca6a 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -4000,12 +4000,6 @@ vzDomainBlockResize(virDomainPtr domain, size /= 1024; size /= 1024;
- if (!(disk = virDomainDiskByName(dom->def, path, false))) { - virReportError(VIR_ERR_INVALID_ARG, - _("invalid path: %s"), path); - goto cleanup; - } - if (vzDomainObjBeginJob(dom) < 0) goto cleanup; job = true; @@ -4019,6 +4013,12 @@ vzDomainBlockResize(virDomainPtr domain, goto cleanup; }
+ if (!(disk = virDomainDiskByName(dom->def, path, false))) { + virReportError(VIR_ERR_INVALID_ARG, + _("invalid path: %s"), path); + goto cleanup; + } + ret = prlsdkResizeImage(dom, disk, size);
cleanup:
On 05/03/2017 04:10 PM, Nikolay Shirokovskiy wrote:
On 03.05.2017 13:44, Konstantin Neumoin wrote:
Need begin job before lookup disk in config, because it can be edited at this moment.
I would slightly change commit message to something like:
Put domain access after acquiring job condition, otherwise another job can change it meanwhile.
Otherwise ACK.
Fixed and pushed. Michal
participants (3)
-
Konstantin Neumoin -
Michal Privoznik -
Nikolay Shirokovskiy