[libvirt] [PATCH 1/3] qemuProcessStop: Set @def early
The @def variable holds pointer to the domain defintion, but is set only somewhere in the middle of the function. This is suboptimal. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 90ebdb43a0..8cb12ac9a6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7365,6 +7365,8 @@ void qemuProcessStop(virQEMUDriverPtr driver, goto endjob; } + def = vm->def; + qemuProcessBuildDestroyMemoryPaths(driver, vm, NULL, false); if (virAtomicIntDecAndTest(&driver->nactive) && driver->inhibitCallback) @@ -7386,7 +7388,6 @@ void qemuProcessStop(virQEMUDriverPtr driver, virDomainConfVMNWFilterTeardown(vm); if (cfg->macFilter) { - def = vm->def; for (i = 0; i < def->nnets; i++) { virDomainNetDefPtr net = def->nets[i]; if (net->ifname == NULL) @@ -7483,7 +7484,6 @@ void qemuProcessStop(virQEMUDriverPtr driver, qemuHostdevReAttachDomainDevices(driver, vm->def); - def = vm->def; for (i = 0; i < def->nnets; i++) { virDomainNetDefPtr net = def->nets[i]; vport = virDomainNetGetActualVirtPortProfile(net); -- 2.23.0
On Tue, Nov 19, 2019 at 09:58:42AM +0100, Michal Privoznik wrote:
The @def variable holds pointer to the domain defintion, but is set only somewhere in the middle of the function. This is suboptimal.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 90ebdb43a0..8cb12ac9a6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7365,6 +7365,8 @@ void qemuProcessStop(virQEMUDriverPtr driver, goto endjob; }
+ def = vm->def;
Maybe even less confusing - how about initializing it during the variable declaration at the very beginning of the function? Reviewed-by: Erik Skultety <eskultet@redhat.com>
On 11/19/19 10:04 AM, Erik Skultety wrote:
On Tue, Nov 19, 2019 at 09:58:42AM +0100, Michal Privoznik wrote:
The @def variable holds pointer to the domain defintion, but is set only somewhere in the middle of the function. This is suboptimal.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 90ebdb43a0..8cb12ac9a6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7365,6 +7365,8 @@ void qemuProcessStop(virQEMUDriverPtr driver, goto endjob; }
+ def = vm->def;
Maybe even less confusing - how about initializing it during the variable declaration at the very beginning of the function?
Reviewed-by: Erik Skultety <eskultet@redhat.com>
Good point, fixed and pushed. Thanks, Michal
participants (2)
-
Erik Skultety -
Michal Privoznik