From: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu, 31 Aug 2023 17:25:55 +0000 (-0400)
Subject: Merge tag 'kvm-riscv-6.6-1' of https://github.com/kvm-riscv/linux into HEAD
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e43ae8b689f0e6864e0a478477995a887301644b;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'kvm-riscv-6.6-1' of https://github.com/kvm-riscv/linux into HEAD

KVM/riscv changes for 6.6

- Zba, Zbs, Zicntr, Zicsr, Zifencei, and Zihpm support for Guest/VM
- Added ONE_REG interface for SATP mode
- Added ONE_REG interface to enable/disable multiple ISA extensions
- Improved error codes returned by ONE_REG interfaces
- Added KVM_GET_REG_LIST ioctl() implementation for KVM RISC-V
- Added get-reg-list selftest for KVM RISC-V
---

e43ae8b689f0e6864e0a478477995a887301644b
diff --cc tools/testing/selftests/kvm/Makefile
index 6092ccfc49aca,72ba48fcdc66a..a3bb36fb3cfc5
--- a/tools/testing/selftests/kvm/Makefile
+++ b/tools/testing/selftests/kvm/Makefile
@@@ -154,7 -151,7 +153,8 @@@ TEST_GEN_PROGS_aarch64 += access_tracki
  TEST_GEN_PROGS_aarch64 += demand_paging_test
  TEST_GEN_PROGS_aarch64 += dirty_log_test
  TEST_GEN_PROGS_aarch64 += dirty_log_perf_test
 +TEST_GEN_PROGS_aarch64 += guest_print_test
+ TEST_GEN_PROGS_aarch64 += get-reg-list
  TEST_GEN_PROGS_aarch64 += kvm_create_max_vcpus
  TEST_GEN_PROGS_aarch64 += kvm_page_table_test
  TEST_GEN_PROGS_aarch64 += memslot_modification_stress_test
@@@ -181,7 -176,7 +181,8 @@@ TEST_GEN_PROGS_s390x += kvm_binary_stat
  
  TEST_GEN_PROGS_riscv += demand_paging_test
  TEST_GEN_PROGS_riscv += dirty_log_test
 +TEST_GEN_PROGS_riscv += guest_print_test
+ TEST_GEN_PROGS_riscv += get-reg-list
  TEST_GEN_PROGS_riscv += kvm_create_max_vcpus
  TEST_GEN_PROGS_riscv += kvm_page_table_test
  TEST_GEN_PROGS_riscv += set_memory_region_test
diff --cc tools/testing/selftests/kvm/include/test_util.h
index 7a5907da17197,7e0182f837b55..7e614adc6cf47
--- a/tools/testing/selftests/kvm/include/test_util.h
+++ b/tools/testing/selftests/kvm/include/test_util.h
@@@ -185,7 -186,6 +185,9 @@@ static inline uint32_t atoi_non_negativ
  	return num;
  }
  
 +int guest_vsnprintf(char *buf, int n, const char *fmt, va_list args);
 +int guest_snprintf(char *buf, int n, const char *fmt, ...);
 +
+ char *strdup_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2), nonnull(1)));
+ 
  #endif /* SELFTEST_KVM_TEST_UTIL_H */