| Message ID | 20210720125408.387910-9-armbru@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Various error handling fixes and cleanups | expand |
On Tue, Jul 20, 2021 at 02:54:00PM +0200, Markus Armbruster wrote: > There is nothing to delete after migrate_add_blocker() failed. Trying > anyway is safe, but useless. Don't. > > Cc: Sunil Muthuswamy <sunilmut@microsoft.com> > Cc: Kamil Rytarowski <kamil@netbsd.org> > Cc: Reinoud Zandijk <reinoud@netbsd.org> > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > target/i386/nvmm/nvmm-all.c | 1 - > target/i386/whpx/whpx-all.c | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c > index dfa690d65d..7bb0d9e30e 100644 > --- a/target/i386/nvmm/nvmm-all.c > +++ b/target/i386/nvmm/nvmm-all.c > @@ -929,7 +929,6 @@ nvmm_init_vcpu(CPUState *cpu) > (void)migrate_add_blocker(nvmm_migration_blocker, &local_error); > if (local_error) { > error_report_err(local_error); > - migrate_del_blocker(nvmm_migration_blocker); > error_free(nvmm_migration_blocker); > return -EINVAL; > } Reviewed-by: Reinoud Zandijk <reinoud@NetBSD.org> No problem with it
diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c index dfa690d65d..7bb0d9e30e 100644 --- a/target/i386/nvmm/nvmm-all.c +++ b/target/i386/nvmm/nvmm-all.c @@ -929,7 +929,6 @@ nvmm_init_vcpu(CPUState *cpu) (void)migrate_add_blocker(nvmm_migration_blocker, &local_error); if (local_error) { error_report_err(local_error); - migrate_del_blocker(nvmm_migration_blocker); error_free(nvmm_migration_blocker); return -EINVAL; } diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index f832f286ac..cc8c0b984b 100644 --- a/target/i386/whpx/whpx-all.c +++ b/target/i386/whpx/whpx-all.c @@ -1349,7 +1349,6 @@ int whpx_init_vcpu(CPUState *cpu) (void)migrate_add_blocker(whpx_migration_blocker, &local_error); if (local_error) { error_report_err(local_error); - migrate_del_blocker(whpx_migration_blocker); error_free(whpx_migration_blocker); ret = -EINVAL; goto error;
There is nothing to delete after migrate_add_blocker() failed. Trying anyway is safe, but useless. Don't. Cc: Sunil Muthuswamy <sunilmut@microsoft.com> Cc: Kamil Rytarowski <kamil@netbsd.org> Cc: Reinoud Zandijk <reinoud@netbsd.org> Signed-off-by: Markus Armbruster <armbru@redhat.com> --- target/i386/nvmm/nvmm-all.c | 1 - target/i386/whpx/whpx-all.c | 1 - 2 files changed, 2 deletions(-)