OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

hv:rename several APIs in vlapic.c 

rename 4 APIs:
  x2apic_msr -> is_ x2apic_msr
  vlapic_msr -> is_vlapic_msr
  vlapic_mmio_write -> vlapic_write_mmio_reg
  vlapic_mmio_read -> vlapic_read_mmio_reg

Signed-off-by: Mingqiang Chi <mingqiang.chi@intel.com>
This commit is contained in:
Mingqiang Chi 2018-07-04 18:40:39 +08:00 committed by lijinxia
parent cc7167026b
commit 9d8893e499
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hypervisor/arch/x86/guest/vlapic.c
View File

@ -1807,7 +1807,7 @@ vlapic_intr_msi(struct vm *vm, uint64_t addr, uint64_t msg)
} }
static bool static bool
x2apic_msr(uint32_t msr) is_x2apic_msr(uint32_t msr)
{ {
if (msr >= 0x800 && msr <= 0xBFF) if (msr >= 0x800 && msr <= 0xBFF)
return true; return true;
@ -1823,10 +1823,10 @@ x2apic_msr_to_regoff(uint32_t msr)
} }
bool bool
vlapic_msr(uint32_t msr) is_vlapic_msr(uint32_t msr)
{ {
if (x2apic_msr(msr) || (msr == MSR_IA32_APIC_BASE)) if (is_x2apic_msr(msr) || (msr == MSR_IA32_APIC_BASE))
return true; return true;
else else
return false; return false;
@ -1910,7 +1910,7 @@ vlapic_wrmsr(struct vcpu *vcpu, uint32_t msr, uint64_t val)
} }
int int
vlapic_mmio_write(struct vcpu *vcpu, uint64_t gpa, uint64_t wval, int size) vlapic_write_mmio_reg(struct vcpu *vcpu, uint64_t gpa, uint64_t wval, int size)
{ {
int error; int error;
uint64_t off; uint64_t off;
@ -1931,7 +1931,7 @@ vlapic_mmio_write(struct vcpu *vcpu, uint64_t gpa, uint64_t wval, int size)
} }
int int
vlapic_mmio_read(struct vcpu *vcpu, uint64_t gpa, uint64_t *rval, vlapic_read_mmio_reg(struct vcpu *vcpu, uint64_t gpa, uint64_t *rval,
__unused int size) __unused int size)
{ {
int error; int error;
@ -1965,14 +1965,14 @@ int vlapic_mmio_access_handler(struct vcpu *vcpu, struct mem_io *mmio,
"All RW to LAPIC must be 32-bits in size"); "All RW to LAPIC must be 32-bits in size");
if (mmio->read_write == HV_MEM_IO_READ) { if (mmio->read_write == HV_MEM_IO_READ) {
ret = vlapic_mmio_read(vcpu, ret = vlapic_read_mmio_reg(vcpu,
gpa, gpa,
&mmio->value, &mmio->value,
mmio->access_size); mmio->access_size);
mmio->mmio_status = MMIO_TRANS_VALID; mmio->mmio_status = MMIO_TRANS_VALID;
} else if (mmio->read_write == HV_MEM_IO_WRITE) { } else if (mmio->read_write == HV_MEM_IO_WRITE) {
ret = vlapic_mmio_write(vcpu, ret = vlapic_write_mmio_reg(vcpu,
gpa, gpa,
mmio->value, mmio->value,
mmio->access_size); mmio->access_size);

8
hypervisor/include/arch/x86/guest/vlapic.h
View File

@ -58,12 +58,14 @@ void vlapic_intr_accepted(struct vlapic *vlapic, uint32_t vector);
struct vlapic *vm_lapic_from_vcpuid(struct vm *vm, uint16_t vcpu_id); struct vlapic *vm_lapic_from_vcpuid(struct vm *vm, uint16_t vcpu_id);
struct vlapic *vm_lapic_from_pcpuid(struct vm *vm, uint16_t pcpu_id); struct vlapic *vm_lapic_from_pcpuid(struct vm *vm, uint16_t pcpu_id);
bool vlapic_msr(uint32_t num); bool is_vlapic_msr(uint32_t num);
int vlapic_rdmsr(struct vcpu *vcpu, uint32_t msr, uint64_t *rval); int vlapic_rdmsr(struct vcpu *vcpu, uint32_t msr, uint64_t *rval);
int vlapic_wrmsr(struct vcpu *vcpu, uint32_t msr, uint64_t wval); int vlapic_wrmsr(struct vcpu *vcpu, uint32_t msr, uint64_t wval);
int vlapic_mmio_read(struct vcpu *vcpu, uint64_t gpa, uint64_t *rval, int size); int vlapic_read_mmio_reg(struct vcpu *vcpu, uint64_t gpa,
int vlapic_mmio_write(struct vcpu *vcpu, uint64_t gpa, uint64_t wval, int size); uint64_t *rval, int size);
int vlapic_write_mmio_reg(struct vcpu *vcpu, uint64_t gpa,
uint64_t wval, int size);
/* /*
* Signals to the LAPIC that an interrupt at 'vector' needs to be generated * Signals to the LAPIC that an interrupt at 'vector' needs to be generated