Commit 244c6b6d authored by Andrew Jones's avatar Andrew Jones Committed by Paolo Bonzini
Browse files

KVM: selftests: Convert some printf's to pr_info's 



We leave some printf's because they inform the user the test is being
skipped. QUIET should not disable those. We also leave the printf's
used for help text.

Signed-off-by: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3439d886

tools/testing/selftests/kvm/kvm_create_max_vcpus.c

+4 −4
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ void test_vcpu_creation(int first_vcpu_id, int num_vcpus) 
	struct kvm_vm *vm;

	int i;



	printf("Testing creating %d vCPUs, with IDs %d...%d.\n",

	pr_info("Testing creating %d vCPUs, with IDs %d...%d.\n",

		num_vcpus, first_vcpu_id, first_vcpu_id + num_vcpus - 1);



	vm = vm_create(VM_MODE_DEFAULT, DEFAULT_GUEST_PHY_PAGES, O_RDWR);
@@ -41,8 +41,8 @@ int main(int argc, char *argv[]) 
	int kvm_max_vcpu_id = kvm_check_cap(KVM_CAP_MAX_VCPU_ID);

	int kvm_max_vcpus = kvm_check_cap(KVM_CAP_MAX_VCPUS);



	printf("KVM_CAP_MAX_VCPU_ID: %d\n", kvm_max_vcpu_id);

	printf("KVM_CAP_MAX_VCPUS: %d\n", kvm_max_vcpus);

	pr_info("KVM_CAP_MAX_VCPU_ID: %d\n", kvm_max_vcpu_id);

	pr_info("KVM_CAP_MAX_VCPUS: %d\n", kvm_max_vcpus);



	/*

	 * Upstream KVM prior to 4.8 does not support KVM_CAP_MAX_VCPU_ID.

tools/testing/selftests/kvm/s390x/resets.c

+3 −3
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static void inject_irq(int cpu_id) 


static void test_normal(void)

{

	printf("Testing normal reset\n");

	pr_info("Testing normal reset\n");

	/* Create VM */

	vm = vm_create_default(VCPU_ID, 0, guest_code_initial);

	run = vcpu_state(vm, VCPU_ID);
@@ -151,7 +151,7 @@ static void test_normal(void) 


static void test_initial(void)

{

	printf("Testing initial reset\n");

	pr_info("Testing initial reset\n");

	vm = vm_create_default(VCPU_ID, 0, guest_code_initial);

	run = vcpu_state(vm, VCPU_ID);

	regs = &run->s.regs;
@@ -168,7 +168,7 @@ static void test_initial(void) 


static void test_clear(void)

{

	printf("Testing clear reset\n");

	pr_info("Testing clear reset\n");

	vm = vm_create_default(VCPU_ID, 0, guest_code_initial);

	run = vcpu_state(vm, VCPU_ID);

	regs = &run->s.regs;

tools/testing/selftests/kvm/x86_64/mmio_warning_test.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ void *thr(void *arg) 
	struct kvm_run *run = tc->run;



	res = ioctl(kvmcpu, KVM_RUN, 0);

	printf("ret1=%d exit_reason=%d suberror=%d\n",

	pr_info("ret1=%d exit_reason=%d suberror=%d\n",

		res, run->exit_reason, run->internal.suberror);



	return 0;

tools/testing/selftests/kvm/x86_64/smm_test.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ int main(int argc, char *argv[]) 
		vcpu_alloc_vmx(vm, &vmx_pages_gva);

		vcpu_args_set(vm, VCPU_ID, 1, vmx_pages_gva);

	} else {

		printf("will skip SMM test with VMX enabled\n");

		pr_info("will skip SMM test with VMX enabled\n");

		vcpu_args_set(vm, VCPU_ID, 1, 0);

	}

tools/testing/selftests/kvm/x86_64/state_test.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ int main(int argc, char *argv[]) 
		vcpu_alloc_vmx(vm, &vmx_pages_gva);

		vcpu_args_set(vm, VCPU_ID, 1, vmx_pages_gva);

	} else {

		printf("will skip nested state checks\n");

		pr_info("will skip nested state checks\n");

		vcpu_args_set(vm, VCPU_ID, 1, 0);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE