Message ID | 20210323085303.1347449-1-vkuznets@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | selftests: kvm: make hardware_disable_test less verbose | expand |
On Tue, Mar 23, 2021 at 09:53:03AM +0100, Vitaly Kuznetsov wrote: > hardware_disable_test produces 512 snippets like > ... > main: [511] waiting semaphore > run_test: [511] start vcpus > run_test: [511] all threads launched > main: [511] waiting 368us > main: [511] killing child > > and this doesn't have much value, let's just drop these fprintf(). > Restoring them for debugging purposes shouldn't be too hard. Changing them to pr_debug() allows you to keep them and restore with -DDEBUG Thanks, drew > > Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com> > --- > tools/testing/selftests/kvm/hardware_disable_test.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/tools/testing/selftests/kvm/hardware_disable_test.c b/tools/testing/selftests/kvm/hardware_disable_test.c > index 2f2eeb8a1d86..d6d4517c4a8a 100644 > --- a/tools/testing/selftests/kvm/hardware_disable_test.c > +++ b/tools/testing/selftests/kvm/hardware_disable_test.c > @@ -108,7 +108,6 @@ static void run_test(uint32_t run) > kvm_vm_elf_load(vm, program_invocation_name, 0, 0); > vm_create_irqchip(vm); > > - fprintf(stderr, "%s: [%d] start vcpus\n", __func__, run); > for (i = 0; i < VCPU_NUM; ++i) { > vm_vcpu_add_default(vm, i, guest_code); > payloads[i].vm = vm; > @@ -124,7 +123,6 @@ static void run_test(uint32_t run) > check_set_affinity(throw_away, &cpu_set); > } > } > - fprintf(stderr, "%s: [%d] all threads launched\n", __func__, run); > sem_post(sem); > for (i = 0; i < VCPU_NUM; ++i) > check_join(threads[i], &b); > @@ -147,16 +145,13 @@ int main(int argc, char **argv) > if (pid == 0) > run_test(i); /* This function always exits */ > > - fprintf(stderr, "%s: [%d] waiting semaphore\n", __func__, i); > sem_wait(sem); > r = (rand() % DELAY_US_MAX) + 1; > - fprintf(stderr, "%s: [%d] waiting %dus\n", __func__, i, r); > usleep(r); > r = waitpid(pid, &s, WNOHANG); > TEST_ASSERT(r != pid, > "%s: [%d] child exited unexpectedly status: [%d]", > __func__, i, s); > - fprintf(stderr, "%s: [%d] killing child\n", __func__, i); > kill(pid, SIGKILL); > } > > -- > 2.30.2 >
Andrew Jones <drjones@redhat.com> writes: > On Tue, Mar 23, 2021 at 09:53:03AM +0100, Vitaly Kuznetsov wrote: >> hardware_disable_test produces 512 snippets like >> ... >> main: [511] waiting semaphore >> run_test: [511] start vcpus >> run_test: [511] all threads launched >> main: [511] waiting 368us >> main: [511] killing child >> >> and this doesn't have much value, let's just drop these fprintf(). >> Restoring them for debugging purposes shouldn't be too hard. > > Changing them to pr_debug() allows you to keep them and restore > with -DDEBUG Ah, missed that we have this for selftests! v2 is coming.
diff --git a/tools/testing/selftests/kvm/hardware_disable_test.c b/tools/testing/selftests/kvm/hardware_disable_test.c index 2f2eeb8a1d86..d6d4517c4a8a 100644 --- a/tools/testing/selftests/kvm/hardware_disable_test.c +++ b/tools/testing/selftests/kvm/hardware_disable_test.c @@ -108,7 +108,6 @@ static void run_test(uint32_t run) kvm_vm_elf_load(vm, program_invocation_name, 0, 0); vm_create_irqchip(vm); - fprintf(stderr, "%s: [%d] start vcpus\n", __func__, run); for (i = 0; i < VCPU_NUM; ++i) { vm_vcpu_add_default(vm, i, guest_code); payloads[i].vm = vm; @@ -124,7 +123,6 @@ static void run_test(uint32_t run) check_set_affinity(throw_away, &cpu_set); } } - fprintf(stderr, "%s: [%d] all threads launched\n", __func__, run); sem_post(sem); for (i = 0; i < VCPU_NUM; ++i) check_join(threads[i], &b); @@ -147,16 +145,13 @@ int main(int argc, char **argv) if (pid == 0) run_test(i); /* This function always exits */ - fprintf(stderr, "%s: [%d] waiting semaphore\n", __func__, i); sem_wait(sem); r = (rand() % DELAY_US_MAX) + 1; - fprintf(stderr, "%s: [%d] waiting %dus\n", __func__, i, r); usleep(r); r = waitpid(pid, &s, WNOHANG); TEST_ASSERT(r != pid, "%s: [%d] child exited unexpectedly status: [%d]", __func__, i, s); - fprintf(stderr, "%s: [%d] killing child\n", __func__, i); kill(pid, SIGKILL); }
hardware_disable_test produces 512 snippets like ... main: [511] waiting semaphore run_test: [511] start vcpus run_test: [511] all threads launched main: [511] waiting 368us main: [511] killing child and this doesn't have much value, let's just drop these fprintf(). Restoring them for debugging purposes shouldn't be too hard. Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com> --- tools/testing/selftests/kvm/hardware_disable_test.c | 5 ----- 1 file changed, 5 deletions(-)