Commit 65612e99 authored by Andrew Jones's avatar Andrew Jones Committed by Sean Christopherson
Browse files

KVM: selftests: x86_64: Remove redundant newlines 



TEST_* functions append their own newline. Remove newlines from
TEST_* callsites to avoid extra newlines in output.

Signed-off-by: default avatarAndrew Jones <ajones@ventanamicro.com>
Link: https://lore.kernel.org/r/20231206170241.82801-12-ajones@ventanamicro.com


[sean: keep the newline in the "tsc\n" strncmp()]
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent a38125f1

tools/testing/selftests/kvm/lib/x86_64/processor.c

+5 −5
Original line number Diff line number Diff line
@@ -170,10 +170,10 @@ static uint64_t *virt_create_upper_pte(struct kvm_vm *vm, 
		 * this level.

		 */

		TEST_ASSERT(current_level != target_level,

			    "Cannot create hugepage at level: %u, vaddr: 0x%lx\n",

			    "Cannot create hugepage at level: %u, vaddr: 0x%lx",

			    current_level, vaddr);

		TEST_ASSERT(!(*pte & PTE_LARGE_MASK),

			    "Cannot create page table at level: %u, vaddr: 0x%lx\n",

			    "Cannot create page table at level: %u, vaddr: 0x%lx",

			    current_level, vaddr);

	}

	return pte;
@@ -220,7 +220,7 @@ void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, int level) 
	/* Fill in page table entry. */

	pte = virt_get_pte(vm, pde, vaddr, PG_LEVEL_4K);

	TEST_ASSERT(!(*pte & PTE_PRESENT_MASK),

		    "PTE already present for 4k page at vaddr: 0x%lx\n", vaddr);

		    "PTE already present for 4k page at vaddr: 0x%lx", vaddr);

	*pte = PTE_PRESENT_MASK | PTE_WRITABLE_MASK | (paddr & PHYSICAL_PAGE_MASK);

}
@@ -253,7 +253,7 @@ static bool vm_is_target_pte(uint64_t *pte, int *level, int current_level) 
	if (*pte & PTE_LARGE_MASK) {

		TEST_ASSERT(*level == PG_LEVEL_NONE ||

			    *level == current_level,

			    "Unexpected hugepage at level %d\n", current_level);

			    "Unexpected hugepage at level %d", current_level);

		*level = current_level;

	}
@@ -825,7 +825,7 @@ void vcpu_args_set(struct kvm_vcpu *vcpu, unsigned int num, ...) 
	struct kvm_regs regs;



	TEST_ASSERT(num >= 1 && num <= 6, "Unsupported number of args,\n"

		    "  num: %u\n",

		    "  num: %u",

		    num);



	va_start(ap, num);

tools/testing/selftests/kvm/lib/x86_64/vmx.c

+3 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ int vcpu_enable_evmcs(struct kvm_vcpu *vcpu) 
	/* KVM should return supported EVMCS version range */

	TEST_ASSERT(((evmcs_ver >> 8) >= (evmcs_ver & 0xff)) &&

		    (evmcs_ver & 0xff) > 0,

		    "Incorrect EVMCS version range: %x:%x\n",

		    "Incorrect EVMCS version range: %x:%x",

		    evmcs_ver & 0xff, evmcs_ver >> 8);



	return evmcs_ver;
@@ -387,10 +387,10 @@ static void nested_create_pte(struct kvm_vm *vm, 
		 * this level.

		 */

		TEST_ASSERT(current_level != target_level,

			    "Cannot create hugepage at level: %u, nested_paddr: 0x%lx\n",

			    "Cannot create hugepage at level: %u, nested_paddr: 0x%lx",

			    current_level, nested_paddr);

		TEST_ASSERT(!pte->page_size,

			    "Cannot create page table at level: %u, nested_paddr: 0x%lx\n",

			    "Cannot create page table at level: %u, nested_paddr: 0x%lx",

			    current_level, nested_paddr);

	}

}

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

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ int main(int argc, char *argv[]) 
				void *tiles_data = (void *)addr_gva2hva(vm, tiledata);

				/* Only check TMM0 register, 1 tile */

				ret = memcmp(amx_start, tiles_data, TILE_SIZE);

				TEST_ASSERT(ret == 0, "memcmp failed, ret=%d\n", ret);

				TEST_ASSERT(ret == 0, "memcmp failed, ret=%d", ret);

				kvm_x86_state_cleanup(state);

				break;

			case 9:

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

+2 −2
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static void compare_cpuids(const struct kvm_cpuid2 *cpuid1, 


		TEST_ASSERT(e1->function == e2->function &&

			    e1->index == e2->index && e1->flags == e2->flags,

			    "CPUID entries[%d] mismtach: 0x%x.%d.%x vs. 0x%x.%d.%x\n",

			    "CPUID entries[%d] mismtach: 0x%x.%d.%x vs. 0x%x.%d.%x",

			    i, e1->function, e1->index, e1->flags,

			    e2->function, e2->index, e2->flags);
@@ -170,7 +170,7 @@ static void test_get_cpuid2(struct kvm_vcpu *vcpu) 


	vcpu_ioctl(vcpu, KVM_GET_CPUID2, cpuid);

	TEST_ASSERT(cpuid->nent == vcpu->cpuid->nent,

		    "KVM didn't update nent on success, wanted %u, got %u\n",

		    "KVM didn't update nent on success, wanted %u, got %u",

		    vcpu->cpuid->nent, cpuid->nent);



	for (i = 0; i < vcpu->cpuid->nent; i++) {

tools/testing/selftests/kvm/x86_64/flds_emulation.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static inline void handle_flds_emulation_failure_exit(struct kvm_vcpu *vcpu) 


	insn_bytes = run->emulation_failure.insn_bytes;

	TEST_ASSERT(insn_bytes[0] == 0xd9 && insn_bytes[1] == 0,

		    "Expected 'flds [eax]', opcode '0xd9 0x00', got opcode 0x%02x 0x%02x\n",

		    "Expected 'flds [eax]', opcode '0xd9 0x00', got opcode 0x%02x 0x%02x",

		    insn_bytes[0], insn_bytes[1]);



	vcpu_regs_get(vcpu, &regs);