[libvirt] [PATCH] storage: prefer using newDef to save configfile
When re-defining an active storage pool, the configfile has not changed. This issue was introduced by bfcd8fc9, storage: Use virStoragePoolObjGetDef accessor for driver. So we prefer using newDef to save configfile. Signed-off-by: Changkuo Shi <shi.changkuo@h3c.com> --- src/storage/storage_driver.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index b0de96d..fab3c5b 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -844,13 +844,14 @@ storagePoolDefineXML(virConnectPtr conn, if (!(obj = virStoragePoolObjAssignDef(driver->pools, newDef))) goto cleanup; - newDef = NULL; + newDef = virStoragePoolObjGetNewDef(obj); def = virStoragePoolObjGetDef(obj); - if (virStoragePoolObjSaveDef(driver, obj, def) < 0) { + if (virStoragePoolObjSaveDef(driver, obj, newDef ? newDef : def) < 0) { virStoragePoolObjRemove(driver->pools, obj); virObjectUnref(obj); obj = NULL; + newDef = NULL; goto cleanup; } @@ -860,6 +861,7 @@ storagePoolDefineXML(virConnectPtr conn, VIR_INFO("Defining storage pool '%s'", def->name); pool = virGetStoragePool(conn, def->name, def->uuid, NULL, NULL); + newDef = NULL; cleanup: if (event) -- 1.7.9.5 ------------------------------------------------------------------------------------------------------------------------------------- 本邮件及其附件含有新华三集团的保密信息，仅限于发送给上面地址中列出 的个人或群组。禁止任何其他人以任何形式使用（包括但不限于全部或部分地泄露、复制、 或散发）本邮件中的信息。如果您错收了本邮件，请您立即电话或邮件通知发件人并删除本 邮件！ This e-mail and its attachments contain confidential information from New H3C, which is intended only for the person or entity whose address is listed above. Any use of the information contained herein in any way (including, but not limited to, total or partial disclosure, reproduction, or dissemination) by persons other than the intended recipient(s) is prohibited. If you receive this e-mail in error, please notify the sender by phone or email immediately and delete it!
On 07/10/2018 09:15 AM, Shichangkuo wrote:
When re-defining an active storage pool, the configfile has not changed. This issue was introduced by bfcd8fc9, storage: Use virStoragePoolObjGetDef accessor for driver. So we prefer using newDef to save configfile.
Signed-off-by: Changkuo Shi <shi.changkuo@h3c.com> --- src/storage/storage_driver.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
The commit message seems to have long lines. Also, next time please send patch rebased to the latest HEAD. I had to go all the way down to v4.4.0 only to apply this patch cleanly.
diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index b0de96d..fab3c5b 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -844,13 +844,14 @@ storagePoolDefineXML(virConnectPtr conn,
if (!(obj = virStoragePoolObjAssignDef(driver->pools, newDef))) goto cleanup; - newDef = NULL; + newDef = virStoragePoolObjGetNewDef(obj); def = virStoragePoolObjGetDef(obj);
- if (virStoragePoolObjSaveDef(driver, obj, def) < 0) { + if (virStoragePoolObjSaveDef(driver, obj, newDef ? newDef : def) < 0) {
Why wouldn't newDef be set at this point? It is always going to be a non-NULL pointer. Also, the rest of the function is a bit misleading now. Long story short, I think the proper solution is to: s/virStoragePoolObjGetDef/virStoragePoolObjGetNewDef/ actually and do nothing more. Michal
-----Original Message----- From: Michal Privoznik [mailto:mprivozn@redhat.com] Sent: Tuesday, July 10, 2018 9:27 PM To: shichangkuo (Cloud); 'libvir-list@redhat.com'; 'jferlan@redhat.com' Subject: Re: [libvirt] [PATCH] storage: prefer using newDef to save configfile
On 07/10/2018 09:15 AM, Shichangkuo wrote:
When re-defining an active storage pool, the configfile has not changed. This issue was introduced by bfcd8fc9, storage: Use virStoragePoolObjGetDef accessor for driver. So we prefer using newDef to save configfile.
Signed-off-by: Changkuo Shi <shi.changkuo@h3c.com> --- src/storage/storage_driver.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
The commit message seems to have long lines. Also, next time please send patch rebased to the latest HEAD. I had to go all the way down to v4.4.0 only to apply this patch cleanly.
Hi, Michal Thanks for you reply. I will change the commit message format and use the latest HEAD in patch V1.
diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index b0de96d..fab3c5b 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -844,13 +844,14 @@ storagePoolDefineXML(virConnectPtr conn,
if (!(obj = virStoragePoolObjAssignDef(driver->pools, newDef))) goto cleanup; - newDef = NULL; + newDef = virStoragePoolObjGetNewDef(obj); def = virStoragePoolObjGetDef(obj);
- if (virStoragePoolObjSaveDef(driver, obj, def) < 0) { + if (virStoragePoolObjSaveDef(driver, obj, newDef ? newDef : def) + < 0) {
Why wouldn't newDef be set at this point? It is always going to be a non-NULL pointer.
I think the purpose of bfcd8fc9 'storage: Use virStoragePoolObjGetDef accessor for driver' is avoiding to use newDef directly. so I use virStoragePoolObjGetNewDef to set newDef again, and it will be NULL when we define a storage pool at the first time or the pool is inactive already.
Also, the rest of the function is a bit misleading now.
Long story short, I think the proper solution is to:
s/virStoragePoolObjGetDef/virStoragePoolObjGetNewDef/
actually and do nothing more.
Sorry, I can't follow you, can you explain in more detail? Changkuo
Michal
本邮件及其附件含有新华三集团的保密信息，仅限于发送给上面地址中列出 的个人或群组。禁止任何其他人以任何形式使用（包括但不限于全部或部分地泄露、复制、 或散发）本邮件中的信息。如果您错收了本邮件，请您立即电话或邮件通知发件人并删除本 邮件！ This e-mail and its attachments contain confidential information from New H3C, which is intended only for the person or entity whose address is listed above. Any use of the information contained herein in any way (including, but not limited to, total or partial disclosure, reproduction, or dissemination) by persons other than the intended recipient(s) is prohibited. If you receive this e-mail in error, please notify the sender by phone or email immediately and delete it!
On 07/11/2018 03:51 AM, Shichangkuo wrote:
-----Original Message----- From: Michal Privoznik [mailto:mprivozn@redhat.com] Sent: Tuesday, July 10, 2018 9:27 PM To: shichangkuo (Cloud); 'libvir-list@redhat.com'; 'jferlan@redhat.com' Subject: Re: [libvirt] [PATCH] storage: prefer using newDef to save configfile
On 07/10/2018 09:15 AM, Shichangkuo wrote:
When re-defining an active storage pool, the configfile has not changed. This issue was introduced by bfcd8fc9, storage: Use virStoragePoolObjGetDef accessor for driver. So we prefer using newDef to save configfile.
Signed-off-by: Changkuo Shi <shi.changkuo@h3c.com> --- src/storage/storage_driver.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
The commit message seems to have long lines. Also, next time please send patch rebased to the latest HEAD. I had to go all the way down to v4.4.0 only to apply this patch cleanly.
Hi, Michal Thanks for you reply. I will change the commit message format and use the latest HEAD in patch V1.
diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index b0de96d..fab3c5b 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -844,13 +844,14 @@ storagePoolDefineXML(virConnectPtr conn,
if (!(obj = virStoragePoolObjAssignDef(driver->pools, newDef))) goto cleanup; - newDef = NULL; + newDef = virStoragePoolObjGetNewDef(obj); def = virStoragePoolObjGetDef(obj);
- if (virStoragePoolObjSaveDef(driver, obj, def) < 0) { + if (virStoragePoolObjSaveDef(driver, obj, newDef ? newDef : def) + < 0) {
Why wouldn't newDef be set at this point? It is always going to be a non-NULL pointer.
I think the purpose of bfcd8fc9 'storage: Use virStoragePoolObjGetDef accessor for driver' is avoiding to use newDef directly. so I use virStoragePoolObjGetNewDef to set newDef again, and it will be NULL when we define a storage pool at the first time or the pool is inactive already.
Agrh. Good point. Apparently I was too distracted yesterday. Your patch is correct after all. Tweaked the commit message a bit, ACKed and pushed. Congratulations on your first libvirt contribution! Michal
participants (2)
-
Michal Privoznik -
Shichangkuo