korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-02 11:54:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

KVM: selftests: Rename xAPIC state test's vcpu struct

Browse Source 
Rename xapic_state_test's kvm_vcpu struct to xapic_vcpu to avoid a
collision when the common 'struct vcpu' is renamed to 'struct kvm_vcpu'
in a future patch.

Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Sean Christopherson 2022-04-18 10:08:40 -07:00 committed by Paolo Bonzini
parent 3f44e7fdca
commit 70ca149be6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/testing/selftests/kvm/x86_64/xapic_state_test.c
View File

@ -11,7 +11,7 @@
#include "processor.h"
#include "test_util.h"
struct kvm_vcpu {
struct xapic_vcpu {
uint32_t id;
bool is_x2apic;
};
@ -47,7 +47,7 @@ static void x2apic_guest_code(void)
} while (1);
}
static void ____test_icr(struct kvm_vm *vm, struct kvm_vcpu *vcpu, uint64_t val)
static void ____test_icr(struct kvm_vm *vm, struct xapic_vcpu *vcpu, uint64_t val)
{
struct kvm_lapic_state xapic;
struct ucall uc;
@ -75,13 +75,13 @@ static void ____test_icr(struct kvm_vm *vm, struct kvm_vcpu *vcpu, uint64_t val)
ASSERT_EQ(icr, val & ~APIC_ICR_BUSY);
}
static void __test_icr(struct kvm_vm *vm, struct kvm_vcpu *vcpu, uint64_t val)
static void __test_icr(struct kvm_vm *vm, struct xapic_vcpu *vcpu, uint64_t val)
{
____test_icr(vm, vcpu, val | APIC_ICR_BUSY);
____test_icr(vm, vcpu, val & ~(u64)APIC_ICR_BUSY);
}
static void test_icr(struct kvm_vm *vm, struct kvm_vcpu *vcpu)
static void test_icr(struct kvm_vm *vm, struct xapic_vcpu *vcpu)
{
uint64_t icr, i, j;
@ -116,7 +116,7 @@ static void test_icr(struct kvm_vm *vm, struct kvm_vcpu *vcpu)
int main(int argc, char *argv[])
{
struct kvm_vcpu vcpu = {
struct xapic_vcpu vcpu = {
.id = 0,
.is_x2apic = true,
};