Commit c05a0a71 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Paolo Bonzini

KVM: selftests: Move HYPERV_LINUX_OS_ID definition to a common header

HYPERV_LINUX_OS_ID needs to be written to HV_X64_MSR_GUEST_OS_ID by
each Hyper-V specific selftest.
Reviewed-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20221101145426.251680-32-vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 676a863c
...@@ -185,4 +185,7 @@ ...@@ -185,4 +185,7 @@
/* hypercall options */ /* hypercall options */
#define HV_HYPERCALL_FAST_BIT BIT(16) #define HV_HYPERCALL_FAST_BIT BIT(16)
/* Proper HV_X64_MSR_GUEST_OS_ID value */
#define HYPERV_LINUX_OS_ID ((u64)0x8100 << 48)
#endif /* !SELFTEST_KVM_HYPERV_H */ #endif /* !SELFTEST_KVM_HYPERV_H */
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
#include "processor.h" #include "processor.h"
#include "hyperv.h" #include "hyperv.h"
#define LINUX_OS_ID ((u64)0x8100 << 48)
static inline uint8_t hypercall(u64 control, vm_vaddr_t input_address, static inline uint8_t hypercall(u64 control, vm_vaddr_t input_address,
vm_vaddr_t output_address, uint64_t *hv_status) vm_vaddr_t output_address, uint64_t *hv_status)
{ {
...@@ -72,7 +70,7 @@ static void guest_hcall(vm_vaddr_t pgs_gpa, struct hcall_data *hcall) ...@@ -72,7 +70,7 @@ static void guest_hcall(vm_vaddr_t pgs_gpa, struct hcall_data *hcall)
GUEST_ASSERT(hcall->control); GUEST_ASSERT(hcall->control);
wrmsr(HV_X64_MSR_GUEST_OS_ID, LINUX_OS_ID); wrmsr(HV_X64_MSR_GUEST_OS_ID, HYPERV_LINUX_OS_ID);
wrmsr(HV_X64_MSR_HYPERCALL, pgs_gpa); wrmsr(HV_X64_MSR_HYPERCALL, pgs_gpa);
if (!(hcall->control & HV_HYPERCALL_FAST_BIT)) { if (!(hcall->control & HV_HYPERCALL_FAST_BIT)) {
...@@ -170,7 +168,7 @@ static void guest_test_msrs_access(void) ...@@ -170,7 +168,7 @@ static void guest_test_msrs_access(void)
*/ */
msr->idx = HV_X64_MSR_GUEST_OS_ID; msr->idx = HV_X64_MSR_GUEST_OS_ID;
msr->write = 1; msr->write = 1;
msr->write_val = LINUX_OS_ID; msr->write_val = HYPERV_LINUX_OS_ID;
msr->available = 1; msr->available = 1;
break; break;
case 3: case 3:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment