KVM: selftests: Remove redundant setbuf()

[PATCH] KVM: selftests: Remove redundant setbuf()

Posted by shahuang@redhat.com 2 years, 7 months ago

From: Shaoqin Huang <shahuang@redhat.com>

Since setbuf(stdout, NULL) has been called in kvm_util.c with
__attribute((constructor)). Selftests no need to setup it in their own
code.

Signed-off-by: Shaoqin Huang <shahuang@redhat.com>
---
 tools/testing/selftests/kvm/aarch64/page_fault_test.c          | 2 --
 .../selftests/kvm/x86_64/exit_on_emulation_failure_test.c      | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/tools/testing/selftests/kvm/aarch64/page_fault_test.c b/tools/testing/selftests/kvm/aarch64/page_fault_test.c
index beb944fa6fd4..513b20bec3c2 100644
--- a/tools/testing/selftests/kvm/aarch64/page_fault_test.c
+++ b/tools/testing/selftests/kvm/aarch64/page_fault_test.c
@@ -1093,8 +1093,6 @@ int main(int argc, char *argv[])
 	enum vm_mem_backing_src_type src_type;
 	int opt;
 
-	setbuf(stdout, NULL);
-
 	src_type = DEFAULT_VM_MEM_SRC;
 
 	while ((opt = getopt(argc, argv, "hm:s:")) != -1) {
diff --git a/tools/testing/selftests/kvm/x86_64/exit_on_emulation_failure_test.c b/tools/testing/selftests/kvm/x86_64/exit_on_emulation_failure_test.c
index 37c61f712fd5..e334844d6e1d 100644
--- a/tools/testing/selftests/kvm/x86_64/exit_on_emulation_failure_test.c
+++ b/tools/testing/selftests/kvm/x86_64/exit_on_emulation_failure_test.c
@@ -26,9 +26,6 @@ int main(int argc, char *argv[])
 	struct kvm_vcpu *vcpu;
 	struct kvm_vm *vm;
 
-	/* Tell stdout not to buffer its content */
-	setbuf(stdout, NULL);
-
 	TEST_REQUIRE(kvm_has_cap(KVM_CAP_EXIT_ON_EMULATION_FAILURE));
 
 	vm = vm_create_with_one_vcpu(&vcpu, guest_code);
-- 
2.39.0

Re: [PATCH] KVM: selftests: Remove redundant setbuf()

Posted by Oliver Upton 2 years, 7 months ago

On Fri, 3 Feb 2023 14:10:36 +0800, shahuang@redhat.com wrote:
> From: Shaoqin Huang <shahuang@redhat.com>
> 
> Since setbuf(stdout, NULL) has been called in kvm_util.c with
> __attribute((constructor)). Selftests no need to setup it in their own
> code.
> 
> 
> [...]

Applied to kvmarm/next, thanks!

[1/1] KVM: selftests: Remove redundant setbuf()
      https://git.kernel.org/kvmarm/kvmarm/c/6043829fdb71

--
Best,
Oliver

Re: [PATCH] KVM: selftests: Remove redundant setbuf()

Posted by Sean Christopherson 2 years, 7 months ago

On Fri, Feb 03, 2023, shahuang@redhat.com wrote:
> From: Shaoqin Huang <shahuang@redhat.com>
> 
> Since setbuf(stdout, NULL) has been called in kvm_util.c with
> __attribute((constructor)). Selftests no need to setup it in their own
> code.
> 
> Signed-off-by: Shaoqin Huang <shahuang@redhat.com>
> ---

Reviewed-by: Sean Christopherson <seanjc@google.com>

Oliver/Marc, want to grab this one?  I doubt there will be conflicts, but IIRC
there are a handful of in-flight changes for aarch64/page_fault_test.c.

Re: [PATCH] KVM: selftests: Remove redundant setbuf()

Posted by Oliver Upton 2 years, 7 months ago

On Fri, Feb 03, 2023 at 06:41:27PM +0000, Sean Christopherson wrote:
> On Fri, Feb 03, 2023, shahuang@redhat.com wrote:
> > From: Shaoqin Huang <shahuang@redhat.com>
> > 
> > Since setbuf(stdout, NULL) has been called in kvm_util.c with
> > __attribute((constructor)). Selftests no need to setup it in their own
> > code.
> > 
> > Signed-off-by: Shaoqin Huang <shahuang@redhat.com>
> > ---
> 
> Reviewed-by: Sean Christopherson <seanjc@google.com>

Thanks!

> Oliver/Marc, want to grab this one?  I doubt there will be conflicts, but IIRC
> there are a handful of in-flight changes for aarch64/page_fault_test.c.

That is indeed the plan.

Applying patches for arm64 has taken a bit longer because I don't
yet have push access to kvmarm so I need Marc to pull from me. The net
effect is emailed thankyous are delayed by a few days, but that wont be
an issue going forward.

-- 
Thanks,
Oliver

Re: [PATCH] KVM: selftests: Remove redundant setbuf()

Posted by Oliver Upton 2 years, 7 months ago

On Fri, Feb 03, 2023 at 06:49:45PM +0000, Oliver Upton wrote:
> On Fri, Feb 03, 2023 at 06:41:27PM +0000, Sean Christopherson wrote:
> > On Fri, Feb 03, 2023, shahuang@redhat.com wrote:
> > > From: Shaoqin Huang <shahuang@redhat.com>
> > > 
> > > Since setbuf(stdout, NULL) has been called in kvm_util.c with
> > > __attribute((constructor)). Selftests no need to setup it in their own
> > > code.
> > > 
> > > Signed-off-by: Shaoqin Huang <shahuang@redhat.com>
> > > ---
> > 
> > Reviewed-by: Sean Christopherson <seanjc@google.com>
> 
> Thanks!
> 
> > Oliver/Marc, want to grab this one?  I doubt there will be conflicts, but IIRC
> > there are a handful of in-flight changes for aarch64/page_fault_test.c.
> 
> That is indeed the plan.

Now fully caffeinated I see that this was poking at an x86 selftest too.
Thanks for reviewing it, I'll grab the patch today.

-- 
Thanks,
Oliver