| Message ID | 20210826074928.240942-1-thuth@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 22d7108ce47290d47e1ea83a28fbfc85e0ecf97e |
| Headers | show |
| Series | KVM: selftests: Fix kvm_vm_free() in cr4_cpuid_sync and vmx_tsc_adjust tests | expand |
On 26/08/21 09:49, Thomas Huth wrote: > The kvm_vm_free() statement here is currently dead code, since the loop > in front of it can only be left with the "goto done" that jumps right > after the kvm_vm_free(). Fix it by swapping the locations of the "done" > label and the kvm_vm_free(). > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c | 3 +-- > tools/testing/selftests/kvm/x86_64/vmx_tsc_adjust_test.c | 2 +- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c b/tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c > index f40fd097cb35..6f6fd189dda3 100644 > --- a/tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c > +++ b/tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c > @@ -109,8 +109,7 @@ int main(int argc, char *argv[]) > } > } > > - kvm_vm_free(vm); > - > done: > + kvm_vm_free(vm); > return 0; > } > diff --git a/tools/testing/selftests/kvm/x86_64/vmx_tsc_adjust_test.c b/tools/testing/selftests/kvm/x86_64/vmx_tsc_adjust_test.c > index 7e33a350b053..e683d0ac3e45 100644 > --- a/tools/testing/selftests/kvm/x86_64/vmx_tsc_adjust_test.c > +++ b/tools/testing/selftests/kvm/x86_64/vmx_tsc_adjust_test.c > @@ -161,7 +161,7 @@ int main(int argc, char *argv[]) > } > } > > - kvm_vm_free(vm); > done: > + kvm_vm_free(vm); > return 0; > } > Queued, thanks. Paolo
diff --git a/tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c b/tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c index f40fd097cb35..6f6fd189dda3 100644 --- a/tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c +++ b/tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c @@ -109,8 +109,7 @@ int main(int argc, char *argv[]) } } - kvm_vm_free(vm); - done: + kvm_vm_free(vm); return 0; } diff --git a/tools/testing/selftests/kvm/x86_64/vmx_tsc_adjust_test.c b/tools/testing/selftests/kvm/x86_64/vmx_tsc_adjust_test.c index 7e33a350b053..e683d0ac3e45 100644 --- a/tools/testing/selftests/kvm/x86_64/vmx_tsc_adjust_test.c +++ b/tools/testing/selftests/kvm/x86_64/vmx_tsc_adjust_test.c @@ -161,7 +161,7 @@ int main(int argc, char *argv[]) } } - kvm_vm_free(vm); done: + kvm_vm_free(vm); return 0; }
The kvm_vm_free() statement here is currently dead code, since the loop in front of it can only be left with the "goto done" that jumps right after the kvm_vm_free(). Fix it by swapping the locations of the "done" label and the kvm_vm_free(). Signed-off-by: Thomas Huth <thuth@redhat.com> --- tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c | 3 +-- tools/testing/selftests/kvm/x86_64/vmx_tsc_adjust_test.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)