github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-28 16:27:01 +00:00
Code Issues Projects Releases Wiki Activity

hv: vlapic: remove calcvdest

Browse Source 
- remove `calcvdest` and use `vlapic_calcdest` directly

Tracked-On: #861
Signed-off-by: Shiqing Gao <shiqing.gao@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Shiqing Gao 2019-01-23 10:34:06 +08:00 committed by wenlingz
parent fd3279204e
commit 5e94788689
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hypervisor/arch/x86/assign.c
View File

@ -80,7 +80,7 @@ static void ptirq_build_physical_msi(struct acrn_vm *vm, struct ptirq_msi_info *
dest = (uint32_t)(info->vmsi_addr & MSI_ADDR_DEST) >> MSI_ADDR_DEST_SHIFT; dest = (uint32_t)(info->vmsi_addr & MSI_ADDR_DEST) >> MSI_ADDR_DEST_SHIFT;
phys = ((info->vmsi_addr & MSI_ADDR_LOG) != MSI_ADDR_LOG); phys = ((info->vmsi_addr & MSI_ADDR_LOG) != MSI_ADDR_LOG);
calcvdest(vm, &vdmask, dest, phys); vlapic_calcdest(vm, &vdmask, dest, phys, false);
pdmask = vcpumask2pcpumask(vm, vdmask); pdmask = vcpumask2pcpumask(vm, vdmask);
/* get physical delivery mode */ /* get physical delivery mode */
@ -137,7 +137,7 @@ ptirq_build_physical_rte(struct acrn_vm *vm, struct ptirq_remapping_info *entry)
/* physical destination cpu mask */ /* physical destination cpu mask */
phys = ((virt_rte.full & IOAPIC_RTE_DESTMOD) == IOAPIC_RTE_DESTPHY); phys = ((virt_rte.full & IOAPIC_RTE_DESTMOD) == IOAPIC_RTE_DESTPHY);
dest = (uint32_t)(virt_rte.full >> IOAPIC_RTE_DEST_SHIFT); dest = (uint32_t)(virt_rte.full >> IOAPIC_RTE_DEST_SHIFT);
calcvdest(vm, &vdmask, dest, phys); vlapic_calcdest(vm, &vdmask, dest, phys, false);
pdmask = vcpumask2pcpumask(vm, vdmask); pdmask = vcpumask2pcpumask(vm, vdmask);
/* physical delivery mode */ /* physical delivery mode */

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

@ -1028,9 +1028,8 @@ vlapic_trigger_lvt(struct acrn_vlapic *vlapic, uint32_t vector)
* This function populates 'dmask' with the set of vcpus that match the * This function populates 'dmask' with the set of vcpus that match the
* addressing specified by the (dest, phys, lowprio) tuple. * addressing specified by the (dest, phys, lowprio) tuple.
*/ */
static void void
vlapic_calcdest(struct acrn_vm *vm, uint64_t *dmask, uint32_t dest, vlapic_calcdest(struct acrn_vm *vm, uint64_t *dmask, uint32_t dest, bool phys, bool lowprio)
bool phys, bool lowprio)
{ {
struct acrn_vlapic *vlapic; struct acrn_vlapic *vlapic;
struct acrn_vlapic *target = NULL; struct acrn_vlapic *target = NULL;
@ -1139,12 +1138,6 @@ vlapic_calcdest(struct acrn_vm *vm, uint64_t *dmask, uint32_t dest,
} }
} }
void
calcvdest(struct acrn_vm *vm, uint64_t *dmask, uint32_t dest, bool phys)
{
vlapic_calcdest(vm, dmask, dest, phys, false);
}
static void static void
vlapic_set_tpr(struct acrn_vlapic *vlapic, uint32_t val) vlapic_set_tpr(struct acrn_vlapic *vlapic, uint32_t val)
{ {

2
hypervisor/dm/vioapic.c
View File

@ -213,7 +213,7 @@ vioapic_update_eoi_exit(const struct acrn_vioapic *vioapic)
} else { } else {
dest = (uint32_t)((rte.full) >> IOAPIC_RTE_DEST_SHIFT); dest = (uint32_t)((rte.full) >> IOAPIC_RTE_DEST_SHIFT);
phys = ((rte.full & IOAPIC_RTE_DESTLOG) == 0UL); phys = ((rte.full & IOAPIC_RTE_DESTLOG) == 0UL);
calcvdest(vioapic->vm, &mask, dest, phys); vlapic_calcdest(vioapic->vm, &mask, dest, phys, false);
for (vcpu_id = ffs64(mask); vcpu_id != INVALID_BIT_INDEX; vcpu_id = ffs64(mask)) { for (vcpu_id = ffs64(mask); vcpu_id != INVALID_BIT_INDEX; vcpu_id = ffs64(mask)) {
vcpu = vcpu_from_vid(vioapic->vm, vcpu_id); vcpu = vcpu_from_vid(vioapic->vm, vcpu_id);

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

@ -248,7 +248,7 @@ int32_t apic_access_vmexit_handler(struct acrn_vcpu *vcpu);
int32_t apic_write_vmexit_handler(struct acrn_vcpu *vcpu); int32_t apic_write_vmexit_handler(struct acrn_vcpu *vcpu);
int32_t veoi_vmexit_handler(struct acrn_vcpu *vcpu); int32_t veoi_vmexit_handler(struct acrn_vcpu *vcpu);
int32_t tpr_below_threshold_vmexit_handler(__unused struct acrn_vcpu *vcpu); int32_t tpr_below_threshold_vmexit_handler(__unused struct acrn_vcpu *vcpu);
void calcvdest(struct acrn_vm *vm, uint64_t *dmask, uint32_t dest, bool phys); void vlapic_calcdest(struct acrn_vm *vm, uint64_t *dmask, uint32_t dest, bool phys, bool lowprio);
/** /**
* @} * @}