[PATCH] storage: use local dom_disk parameter

Yi Li posted 1 patch 4 years ago
Test syntax-check failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20200407121029.1697-1-yili@winhong.com
src/qemu/qemu_driver.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
[PATCH] storage: use local dom_disk parameter
Posted by Yi Li 4 years ago
replace vm->def->disks[i]  with dom_disk parameter

Signed-off-by: Yi Li <yili@winhong.com>
---
 src/qemu/qemu_driver.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index daa3cb397d..27f43124ac 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -14841,14 +14841,13 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm,
                                                       active) < 0)
                 return -1;
 
-            if (vm->def->disks[i]->src->format > 0 &&
-                vm->def->disks[i]->src->format != VIR_STORAGE_FILE_QCOW2) {
+            if (dom_disk->src->format > 0 &&
+                dom_disk->src->format != VIR_STORAGE_FILE_QCOW2) {
                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                _("internal snapshot for disk %s unsupported "
                                  "for storage type %s"),
                                disk->name,
-                               virStorageFileFormatTypeToString(
-                                   vm->def->disks[i]->src->format));
+                               virStorageFileFormatTypeToString(dom_disk->src->format));
                 return -1;
             }
             break;
-- 
2.13.6




Re: [PATCH] storage: use local dom_disk parameter
Posted by Pavel Mores 4 years ago
On Tue, Apr 07, 2020 at 08:10:29PM +0800, Yi Li wrote:
> replace vm->def->disks[i]  with dom_disk parameter
> 
> Signed-off-by: Yi Li <yili@winhong.com>
> ---
>  src/qemu/qemu_driver.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index daa3cb397d..27f43124ac 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -14841,14 +14841,13 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm,
>                                                        active) < 0)
>                  return -1;
>  
> -            if (vm->def->disks[i]->src->format > 0 &&
> -                vm->def->disks[i]->src->format != VIR_STORAGE_FILE_QCOW2) {
> +            if (dom_disk->src->format > 0 &&
> +                dom_disk->src->format != VIR_STORAGE_FILE_QCOW2) {
>                  virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
>                                 _("internal snapshot for disk %s unsupported "
>                                   "for storage type %s"),
>                                 disk->name,
> -                               virStorageFileFormatTypeToString(
> -                                   vm->def->disks[i]->src->format));
> +                               virStorageFileFormatTypeToString(dom_disk->src->format));
>                  return -1;
>              }
>              break;
> -- 
> 2.13.6
> 

Reviewed-by: Pavel Mores <pmores@redhat.com>

Re: [PATCH] storage: use local dom_disk parameter
Posted by Michal Prívozník 4 years ago
On 7. 4. 2020 14:10, Yi Li wrote:
> replace vm->def->disks[i]  with dom_disk parameter
> 
> Signed-off-by: Yi Li <yili@winhong.com>
> ---
>  src/qemu/qemu_driver.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 

Tweaked the commit mesage a bit, and pushed.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

Michal