From: Paolo Bonzini <pbonzini@redhat.com>
Date: Sun, 12 May 2024 07:18:11 +0000 (-0400)
Subject: Merge tag 'kvm-x86-selftests_utils-6.10' of https://github.com/kvm-x86/linux into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=dee7ea42a1eba18bf4722a27b10773607c66e21d;p=linux.git

Merge tag 'kvm-x86-selftests_utils-6.10' of https://github.com/kvm-x86/linux into HEAD

KVM selftests treewide updates for 6.10:

 - Define _GNU_SOURCE for all selftests to fix a warning that was introduced by
   a change to kselftest_harness.h late in the 6.9 cycle, and because forcing
   every test to #define _GNU_SOURCE is painful.

 - Provide a global psuedo-RNG instance for all tests, so that library code can
   generate random, but determinstic numbers.

 - Use the global pRNG to randomly force emulation of select writes from guest
   code on x86, e.g. to help validate KVM's emulation of locked accesses.

 - Rename kvm_util_base.h back to kvm_util.h, as the weird layer of indirection
   was added purely to avoid manually #including ucall_common.h in a handful of
   locations.

 - Allocate and initialize x86's GDT, IDT, TSS, segments, and default exception
   handlers at VM creation, instead of forcing tests to manually trigger the
   related setup.
---

dee7ea42a1eba18bf4722a27b10773607c66e21d
diff --cc tools/testing/selftests/kvm/aarch64/arch_timer.c
index 89be559cdb7ec,02967318caf45..eeba1cc87ff82
--- a/tools/testing/selftests/kvm/aarch64/arch_timer.c
+++ b/tools/testing/selftests/kvm/aarch64/arch_timer.c
@@@ -12,8 -10,12 +10,9 @@@
  #include "gic.h"
  #include "processor.h"
  #include "timer_test.h"
+ #include "ucall_common.h"
  #include "vgic.h"
  
 -#define GICD_BASE_GPA			0x8000000ULL
 -#define GICR_BASE_GPA			0x80A0000ULL
 -
  enum guest_stage {
  	GUEST_STAGE_VTIMER_CVAL = 1,
  	GUEST_STAGE_VTIMER_TVAL,
diff --cc tools/testing/selftests/kvm/aarch64/psci_test.c
index 9fa3578d47d53,1c8c6f0c1ca30..61731a950def9
--- a/tools/testing/selftests/kvm/aarch64/psci_test.c
+++ b/tools/testing/selftests/kvm/aarch64/psci_test.c
@@@ -10,12 -10,7 +10,10 @@@
   *  - A test for KVM's handling of PSCI SYSTEM_SUSPEND and the associated
   *    KVM_SYSTEM_EVENT_SUSPEND UAPI.
   */
 +
- #define _GNU_SOURCE
- 
 +#include <linux/kernel.h>
  #include <linux/psci.h>
 +#include <asm/cputype.h>
  
  #include "kvm_util.h"
  #include "processor.h"