lkml.org 
[lkml]   [2022]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v2 046/144] KVM: selftests: Rename xAPIC state test's vcpu struct
    From
    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>
    ---
    tools/testing/selftests/kvm/x86_64/xapic_state_test.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    diff --git a/tools/testing/selftests/kvm/x86_64/xapic_state_test.c b/tools/testing/selftests/kvm/x86_64/xapic_state_test.c
    index 0792334ba243..9d8393b6ec75 100644
    --- a/tools/testing/selftests/kvm/x86_64/xapic_state_test.c
    +++ b/tools/testing/selftests/kvm/x86_64/xapic_state_test.c
    @@ -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,
    };
    --
    2.36.1.255.ge46751e96f-goog
    \
     
     \ /
      Last update: 2022-06-03 02:54    [W:5.032 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site