| Message ID | 20230204014547.583711-4-vipinsh@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Common KVM exit reason test assertions and exit reason sync | expand |
On Fri, Feb 3, 2023 at 5:46 PM Vipin Sharma <vipinsh@google.com> wrote: > > From: Sean Christopherson <seanjc@google.com> > > Add and use a macro to generate the KVM exit reason strings array > instead of relying on developers to correctly copy+paste+edit each > string. > > Signed-off-by: Sean Christopherson <seanjc@google.com> > --- > tools/testing/selftests/kvm/lib/kvm_util.c | 52 +++++++++++----------- > 1 file changed, 27 insertions(+), 25 deletions(-) > > diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c > index 56d5ea949cbb..2413ce511d20 100644 > --- a/tools/testing/selftests/kvm/lib/kvm_util.c > +++ b/tools/testing/selftests/kvm/lib/kvm_util.c > @@ -1815,37 +1815,39 @@ void vm_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent) > vcpu_dump(stream, vcpu, indent + 2); > } > > +#define KVM_EXIT_STRING(x) {KVM_EXIT_##x, #x} > + > /* Known KVM exit reasons */ > static struct exit_reason { > unsigned int reason; > const char *name; > } exit_reasons_known[] = { > - {KVM_EXIT_UNKNOWN, "UNKNOWN"}, > - {KVM_EXIT_EXCEPTION, "EXCEPTION"}, > - {KVM_EXIT_IO, "IO"}, > - {KVM_EXIT_HYPERCALL, "HYPERCALL"}, > - {KVM_EXIT_DEBUG, "DEBUG"}, > - {KVM_EXIT_HLT, "HLT"}, > - {KVM_EXIT_MMIO, "MMIO"}, > - {KVM_EXIT_IRQ_WINDOW_OPEN, "IRQ_WINDOW_OPEN"}, > - {KVM_EXIT_SHUTDOWN, "SHUTDOWN"}, > - {KVM_EXIT_FAIL_ENTRY, "FAIL_ENTRY"}, > - {KVM_EXIT_INTR, "INTR"}, > - {KVM_EXIT_SET_TPR, "SET_TPR"}, > - {KVM_EXIT_TPR_ACCESS, "TPR_ACCESS"}, > - {KVM_EXIT_S390_SIEIC, "S390_SIEIC"}, > - {KVM_EXIT_S390_RESET, "S390_RESET"}, > - {KVM_EXIT_DCR, "DCR"}, > - {KVM_EXIT_NMI, "NMI"}, > - {KVM_EXIT_INTERNAL_ERROR, "INTERNAL_ERROR"}, > - {KVM_EXIT_OSI, "OSI"}, > - {KVM_EXIT_PAPR_HCALL, "PAPR_HCALL"}, > - {KVM_EXIT_DIRTY_RING_FULL, "DIRTY_RING_FULL"}, > - {KVM_EXIT_X86_RDMSR, "RDMSR"}, > - {KVM_EXIT_X86_WRMSR, "WRMSR"}, > - {KVM_EXIT_XEN, "XEN"}, > + KVM_EXIT_STRING(UNKNOWN), > + KVM_EXIT_STRING(EXCEPTION), > + KVM_EXIT_STRING(IO), > + KVM_EXIT_STRING(HYPERCALL), > + KVM_EXIT_STRING(DEBUG), > + KVM_EXIT_STRING(HLT), > + KVM_EXIT_STRING(MMIO), > + KVM_EXIT_STRING(IRQ_WINDOW_OPEN), > + KVM_EXIT_STRING(SHUTDOWN), > + KVM_EXIT_STRING(FAIL_ENTRY), > + KVM_EXIT_STRING(INTR), > + KVM_EXIT_STRING(SET_TPR), > + KVM_EXIT_STRING(TPR_ACCESS), > + KVM_EXIT_STRING(S390_SIEIC), > + KVM_EXIT_STRING(S390_RESET), > + KVM_EXIT_STRING(DCR), > + KVM_EXIT_STRING(NMI), > + KVM_EXIT_STRING(INTERNAL_ERROR), > + KVM_EXIT_STRING(OSI), > + KVM_EXIT_STRING(PAPR_HCALL), > + KVM_EXIT_STRING(DIRTY_RING_FULL), > + KVM_EXIT_STRING(X86_RDMSR), > + KVM_EXIT_STRING(X86_WRMSR), > + KVM_EXIT_STRING(XEN), > #ifdef KVM_EXIT_MEMORY_NOT_PRESENT > - {KVM_EXIT_MEMORY_NOT_PRESENT, "MEMORY_NOT_PRESENT"}, > + KVM_EXIT_STRING(MEMORY_NOT_PRESENT), > #endif > }; > > -- > 2.39.1.519.gcb327c4b5f-goog > Sean, I had to manually create this commit in my tree, your patch in the email was complaining about some non-existent SHA. https://lore.kernel.org/lkml/Y9r0q9cuK%2Fifu+OW@google.com/ Only difference from your patch is that KVM_EXIT_STRING(HYPERV) is not present in the patch above. As this exit reason is not available in kvm/queue.
diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 56d5ea949cbb..2413ce511d20 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -1815,37 +1815,39 @@ void vm_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent) vcpu_dump(stream, vcpu, indent + 2); } +#define KVM_EXIT_STRING(x) {KVM_EXIT_##x, #x} + /* Known KVM exit reasons */ static struct exit_reason { unsigned int reason; const char *name; } exit_reasons_known[] = { - {KVM_EXIT_UNKNOWN, "UNKNOWN"}, - {KVM_EXIT_EXCEPTION, "EXCEPTION"}, - {KVM_EXIT_IO, "IO"}, - {KVM_EXIT_HYPERCALL, "HYPERCALL"}, - {KVM_EXIT_DEBUG, "DEBUG"}, - {KVM_EXIT_HLT, "HLT"}, - {KVM_EXIT_MMIO, "MMIO"}, - {KVM_EXIT_IRQ_WINDOW_OPEN, "IRQ_WINDOW_OPEN"}, - {KVM_EXIT_SHUTDOWN, "SHUTDOWN"}, - {KVM_EXIT_FAIL_ENTRY, "FAIL_ENTRY"}, - {KVM_EXIT_INTR, "INTR"}, - {KVM_EXIT_SET_TPR, "SET_TPR"}, - {KVM_EXIT_TPR_ACCESS, "TPR_ACCESS"}, - {KVM_EXIT_S390_SIEIC, "S390_SIEIC"}, - {KVM_EXIT_S390_RESET, "S390_RESET"}, - {KVM_EXIT_DCR, "DCR"}, - {KVM_EXIT_NMI, "NMI"}, - {KVM_EXIT_INTERNAL_ERROR, "INTERNAL_ERROR"}, - {KVM_EXIT_OSI, "OSI"}, - {KVM_EXIT_PAPR_HCALL, "PAPR_HCALL"}, - {KVM_EXIT_DIRTY_RING_FULL, "DIRTY_RING_FULL"}, - {KVM_EXIT_X86_RDMSR, "RDMSR"}, - {KVM_EXIT_X86_WRMSR, "WRMSR"}, - {KVM_EXIT_XEN, "XEN"}, + KVM_EXIT_STRING(UNKNOWN), + KVM_EXIT_STRING(EXCEPTION), + KVM_EXIT_STRING(IO), + KVM_EXIT_STRING(HYPERCALL), + KVM_EXIT_STRING(DEBUG), + KVM_EXIT_STRING(HLT), + KVM_EXIT_STRING(MMIO), + KVM_EXIT_STRING(IRQ_WINDOW_OPEN), + KVM_EXIT_STRING(SHUTDOWN), + KVM_EXIT_STRING(FAIL_ENTRY), + KVM_EXIT_STRING(INTR), + KVM_EXIT_STRING(SET_TPR), + KVM_EXIT_STRING(TPR_ACCESS), + KVM_EXIT_STRING(S390_SIEIC), + KVM_EXIT_STRING(S390_RESET), + KVM_EXIT_STRING(DCR), + KVM_EXIT_STRING(NMI), + KVM_EXIT_STRING(INTERNAL_ERROR), + KVM_EXIT_STRING(OSI), + KVM_EXIT_STRING(PAPR_HCALL), + KVM_EXIT_STRING(DIRTY_RING_FULL), + KVM_EXIT_STRING(X86_RDMSR), + KVM_EXIT_STRING(X86_WRMSR), + KVM_EXIT_STRING(XEN), #ifdef KVM_EXIT_MEMORY_NOT_PRESENT - {KVM_EXIT_MEMORY_NOT_PRESENT, "MEMORY_NOT_PRESENT"}, + KVM_EXIT_STRING(MEMORY_NOT_PRESENT), #endif };