github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-07-02 02:03:20 +00:00
Code Issues Projects Releases Wiki Activity

HV:guest:add suffix U to the numeric constant

Browse Source 
Add suffix U to the numeric constant

Signed-off-by: Huihuang Shi <huihuang.shi@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Huihuang Shi 2018-07-04 16:04:19 +08:00 committed by lijinxia
parent b74358d08e
commit 98c49c71b7
4 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hypervisor/arch/x86/guest/instr_emul.c
View File

@ -691,7 +691,7 @@ emulate_movs(struct vcpu *vcpu, __unused uint64_t gpa, struct vie *vie,
* The count register is %rcx, %ecx or %cx depending on the * The count register is %rcx, %ecx or %cx depending on the
* address size of the instruction. * address size of the instruction.
*/ */
if ((rcx & vie_size2mask(vie->addrsize)) == 0) { if ((rcx & vie_size2mask(vie->addrsize)) == 0UL) {
error = 0; error = 0;
goto done; goto done;
} }
@ -745,7 +745,7 @@ emulate_movs(struct vcpu *vcpu, __unused uint64_t gpa, struct vie *vie,
/* /*
* Repeat the instruction if the count register is not zero. * Repeat the instruction if the count register is not zero.
*/ */
if ((rcx & vie_size2mask(vie->addrsize)) != 0) if ((rcx & vie_size2mask(vie->addrsize)) != 0UL)
VCPU_RETAIN_RIP(vcpu); VCPU_RETAIN_RIP(vcpu);
} }
done: done:
@ -763,7 +763,7 @@ emulate_stos(struct vcpu *vcpu, uint64_t gpa, struct vie *vie,
uint64_t val; uint64_t val;
uint64_t rcx, rdi, rflags; uint64_t rcx, rdi, rflags;
opsize = (vie->op.op_byte == 0xAA) ? 1 : vie->opsize; opsize = (vie->op.op_byte == 0xAAU) ? 1 : vie->opsize;
repeat = vie->repz_present | vie->repnz_present; repeat = vie->repz_present | vie->repnz_present;
if (repeat != 0) { if (repeat != 0) {

10
hypervisor/arch/x86/guest/vioapic.c
View File

@ -244,9 +244,9 @@ vioapic_read(struct vioapic *vioapic, uint32_t addr)
(regnum < IOAPIC_REDTBL + vioapic_pincount(vioapic->vm) * 2) != 0) { (regnum < IOAPIC_REDTBL + vioapic_pincount(vioapic->vm) * 2) != 0) {
pin = (regnum - IOAPIC_REDTBL) / 2; pin = (regnum - IOAPIC_REDTBL) / 2;
if (((regnum - IOAPIC_REDTBL) % 2) != 0) if (((regnum - IOAPIC_REDTBL) % 2) != 0)
rshift = 32; rshift = 32U;
else else
rshift = 0; rshift = 0U;
return vioapic->rtbl[pin].reg >> rshift; return vioapic->rtbl[pin].reg >> rshift;
} }
@ -427,7 +427,7 @@ vioapic_mmio_rw(struct vioapic *vioapic, uint64_t gpa,
if (size != 4 || (offset != IOREGSEL && offset != IOWIN && if (size != 4 || (offset != IOREGSEL && offset != IOWIN &&
offset != IOEOI)) { offset != IOEOI)) {
if (doread) if (doread)
*data = 0; *data = 0UL;
return 0; return 0;
} }
@ -581,7 +581,7 @@ int vioapic_mmio_access_handler(struct vcpu *vcpu, struct mem_io *mmio,
int ret = 0; int ret = 0;
/* Note all RW to IOAPIC are 32-Bit in size */ /* Note all RW to IOAPIC are 32-Bit in size */
ASSERT(mmio->access_size == 4, ASSERT(mmio->access_size == 4U,
"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) {
@ -637,7 +637,7 @@ void get_vioapic_info(char *str, int str_max, int vmid)
size -= len; size -= len;
str += len; str += len;
rte = 0; rte = 0UL;
for (pin = 0 ; pin < vioapic_pincount(vm); pin++) { for (pin = 0 ; pin < vioapic_pincount(vm); pin++) {
vioapic_get_rte(vm, pin, (void *)&rte); vioapic_get_rte(vm, pin, (void *)&rte);
low = rte; low = rte;

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

@ -279,8 +279,8 @@ static void vlapic_reset_timer(struct vlapic *vlapic)
timer = &vlapic->vlapic_timer.timer; timer = &vlapic->vlapic_timer.timer;
del_timer(timer); del_timer(timer);
timer->mode = 0; timer->mode = 0;
timer->fire_tsc = 0; timer->fire_tsc = 0UL;
timer->period_in_cycle = 0; timer->period_in_cycle = 0UL;
} }
static bool static bool
@ -296,7 +296,7 @@ set_expiration(struct vlapic *vlapic)
tmicr = vlapic_timer->tmicr; tmicr = vlapic_timer->tmicr;
divisor_shift = vlapic_timer->divisor_shift; divisor_shift = vlapic_timer->divisor_shift;
if (!tmicr || divisor_shift > 8) if (!tmicr || divisor_shift > 8U)
return false; return false;
delta = tmicr << divisor_shift; delta = tmicr << divisor_shift;
@ -325,8 +325,8 @@ static void vlapic_update_lvtt(struct vlapic *vlapic,
del_timer(timer); del_timer(timer);
timer->mode = (timer_mode == APIC_LVTT_TM_PERIODIC) ? timer->mode = (timer_mode == APIC_LVTT_TM_PERIODIC) ?
TICK_MODE_PERIODIC: TICK_MODE_ONESHOT; TICK_MODE_PERIODIC: TICK_MODE_ONESHOT;
timer->fire_tsc = 0; timer->fire_tsc = 0UL;
timer->period_in_cycle = 0; timer->period_in_cycle = 0UL;
vlapic_timer->mode = timer_mode; vlapic_timer->mode = timer_mode;
} }
@ -385,7 +385,7 @@ static uint64_t vlapic_get_tsc_deadline_msr(struct vlapic *vlapic)
if (!vlapic_lvtt_tsc_deadline(vlapic)) if (!vlapic_lvtt_tsc_deadline(vlapic))
return 0; return 0;
return (vlapic->vlapic_timer.timer.fire_tsc == 0) ? 0 : return (vlapic->vlapic_timer.timer.fire_tsc == 0UL) ? 0UL :
vlapic->vcpu->guest_msrs[IDX_TSC_DEADLINE]; vlapic->vcpu->guest_msrs[IDX_TSC_DEADLINE];
} }
@ -412,7 +412,7 @@ static void vlapic_set_tsc_deadline_msr(struct vlapic *vlapic,
add_timer(timer); add_timer(timer);
} else } else
timer->fire_tsc = 0; timer->fire_tsc = 0UL;
} }
static void static void
@ -422,7 +422,7 @@ vlapic_esr_write_handler(struct vlapic *vlapic)
lapic = vlapic->apic_page; lapic = vlapic->apic_page;
lapic->esr = vlapic->esr_pending; lapic->esr = vlapic->esr_pending;
vlapic->esr_pending = 0; vlapic->esr_pending = 0U;
} }
/* /*
@ -652,7 +652,7 @@ vlapic_fire_lvt(struct vlapic *vlapic, uint32_t lvt)
switch (mode) { switch (mode) {
case APIC_LVT_DM_FIXED: case APIC_LVT_DM_FIXED:
if (vec < 16) { if (vec < 16U) {
vlapic_set_error(vlapic, APIC_ESR_SEND_ILLEGAL_VECTOR); vlapic_set_error(vlapic, APIC_ESR_SEND_ILLEGAL_VECTOR);
return 0; return 0;
} }
@ -876,7 +876,7 @@ vlapic_calcdest(struct vm *vm, uint64_t *dmask, uint32_t dest,
uint64_t amask; uint64_t amask;
uint16_t vcpu_id; uint16_t vcpu_id;
if (dest == 0xff) { if (dest == 0xffU) {
/* /*
* Broadcast in both logical and physical modes. * Broadcast in both logical and physical modes.
*/ */
@ -888,7 +888,7 @@ vlapic_calcdest(struct vm *vm, uint64_t *dmask, uint32_t dest,
/* /*
* Physical mode: destination is LAPIC ID. * Physical mode: destination is LAPIC ID.
*/ */
*dmask = 0; *dmask = 0UL;
vcpu_id = vm_apicid2vcpu_id(vm, dest); vcpu_id = vm_apicid2vcpu_id(vm, dest);
if (vcpu_id < phys_cpu_num) if (vcpu_id < phys_cpu_num)
bitmap_set(vcpu_id, dmask); bitmap_set(vcpu_id, dmask);
@ -910,7 +910,7 @@ vlapic_calcdest(struct vm *vm, uint64_t *dmask, uint32_t dest,
* Logical mode: match each APIC that has a bit set * Logical mode: match each APIC that has a bit set
* in its LDR that matches a bit in the ldest. * in its LDR that matches a bit in the ldest.
*/ */
*dmask = 0; *dmask = 0UL;
amask = vm_active_cpus(vm); amask = vm_active_cpus(vm);
while ((vcpu_id = ffs64(amask)) != INVALID_BIT_INDEX) { while ((vcpu_id = ffs64(amask)) != INVALID_BIT_INDEX) {
bitmap_clear(vcpu_id, &amask); bitmap_clear(vcpu_id, &amask);
@ -995,7 +995,7 @@ vlapic_set_cr8(struct vlapic *vlapic, uint64_t val)
uint8_t tpr; uint8_t tpr;
if ((val & ~0xfUL) != 0U) { if ((val & ~0xfUL) != 0U) {
vcpu_inject_gp(vlapic->vcpu, 0); vcpu_inject_gp(vlapic->vcpu, 0U);
return; return;
} }
@ -1030,10 +1030,10 @@ vlapic_icrlo_write_handler(struct vlapic *vlapic)
dest = icrval >> (32 + 24); dest = icrval >> (32 + 24);
vec = icrval & APIC_VECTOR_MASK; vec = icrval & APIC_VECTOR_MASK;
mode = icrval & APIC_DELMODE_MASK; mode = icrval & APIC_DELMODE_MASK;
phys = ((icrval & APIC_DESTMODE_LOG) == 0); phys = ((icrval & APIC_DESTMODE_LOG) == 0UL);
shorthand = icrval & APIC_DEST_MASK; shorthand = icrval & APIC_DEST_MASK;
if (mode == APIC_DELMODE_FIXED && vec < 16) { if (mode == APIC_DELMODE_FIXED && vec < 16U) {
vlapic_set_error(vlapic, APIC_ESR_SEND_ILLEGAL_VECTOR); vlapic_set_error(vlapic, APIC_ESR_SEND_ILLEGAL_VECTOR);
dev_dbg(ACRN_DBG_LAPIC, "Ignoring invalid IPI %d", vec); dev_dbg(ACRN_DBG_LAPIC, "Ignoring invalid IPI %d", vec);
return 0; return 0;
@ -1248,12 +1248,12 @@ vlapic_read(struct vlapic *vlapic, int mmio_access, uint64_t offset,
dev_dbg(ACRN_DBG_LAPIC, dev_dbg(ACRN_DBG_LAPIC,
"x2APIC MSR read from offset %#lx in xAPIC mode", "x2APIC MSR read from offset %#lx in xAPIC mode",
offset); offset);
*data = 0; *data = 0UL;
goto done; goto done;
} }
if (offset > sizeof(*lapic)) { if (offset > sizeof(*lapic)) {
*data = 0; *data = 0UL;
goto done; goto done;
} }
@ -1346,7 +1346,7 @@ vlapic_read(struct vlapic *vlapic, int mmio_access, uint64_t offset,
case APIC_OFFSET_TIMER_ICR: case APIC_OFFSET_TIMER_ICR:
/* if TSCDEADLINE mode always return 0*/ /* if TSCDEADLINE mode always return 0*/
if (vlapic_lvtt_tsc_deadline(vlapic)) if (vlapic_lvtt_tsc_deadline(vlapic))
*data = 0; *data = 0UL;
else else
*data = lapic->icr_timer; *data = lapic->icr_timer;
break; break;
@ -1360,11 +1360,11 @@ vlapic_read(struct vlapic *vlapic, int mmio_access, uint64_t offset,
/* /*
* XXX generate a GP fault if vlapic is in x2apic mode * XXX generate a GP fault if vlapic is in x2apic mode
*/ */
*data = 0; *data = 0UL;
break; break;
case APIC_OFFSET_RRR: case APIC_OFFSET_RRR:
default: default:
*data = 0; *data = 0UL;
break; break;
} }
done: done:

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

@ -57,10 +57,10 @@ void disable_msr_interception(uint8_t *bitmap, uint32_t msr)
uint8_t *write_map; uint8_t *write_map;
uint8_t value; uint8_t value;
/* low MSR */ /* low MSR */
if (msr < 0x1FFF) { if (msr < 0x1FFFU) {
read_map = bitmap; read_map = bitmap;
write_map = bitmap + 2048; write_map = bitmap + 2048;
} else if ((msr >= 0xc0000000) && (msr <= 0xc0001fff)) { } else if ((msr >= 0xc0000000U) && (msr <= 0xc0001fffU)) {
read_map = bitmap + 1024; read_map = bitmap + 1024;
write_map = bitmap + 3072; write_map = bitmap + 3072;
} else { } else {
@ -177,7 +177,7 @@ int rdmsr_vmexit_handler(struct vcpu *vcpu)
#ifdef CONFIG_MTRR_ENABLED #ifdef CONFIG_MTRR_ENABLED
v = mtrr_rdmsr(vcpu, msr); v = mtrr_rdmsr(vcpu, msr);
#else #else
vcpu_inject_gp(vcpu, 0); vcpu_inject_gp(vcpu, 0U);
#endif #endif
break; break;
} }
@ -232,7 +232,7 @@ int rdmsr_vmexit_handler(struct vcpu *vcpu)
msr <= MSR_IA32_VMX_TRUE_ENTRY_CTLS))) { msr <= MSR_IA32_VMX_TRUE_ENTRY_CTLS))) {
pr_warn("rdmsr: %lx should not come here!", msr); pr_warn("rdmsr: %lx should not come here!", msr);
} }
vcpu_inject_gp(vcpu, 0); vcpu_inject_gp(vcpu, 0U);
v = 0UL; v = 0UL;
break; break;
} }
@ -293,13 +293,13 @@ int wrmsr_vmexit_handler(struct vcpu *vcpu)
#ifdef CONFIG_MTRR_ENABLED #ifdef CONFIG_MTRR_ENABLED
mtrr_wrmsr(vcpu, msr, v); mtrr_wrmsr(vcpu, msr, v);
#else #else
vcpu_inject_gp(vcpu, 0); vcpu_inject_gp(vcpu, 0U);
#endif #endif
break; break;
} }
case MSR_IA32_MTRR_CAP: case MSR_IA32_MTRR_CAP:
{ {
vcpu_inject_gp(vcpu, 0); vcpu_inject_gp(vcpu, 0U);
break; break;
} }
case MSR_IA32_BIOS_SIGN_ID: case MSR_IA32_BIOS_SIGN_ID:
@ -366,7 +366,7 @@ int wrmsr_vmexit_handler(struct vcpu *vcpu)
msr <= MSR_IA32_VMX_TRUE_ENTRY_CTLS))) { msr <= MSR_IA32_VMX_TRUE_ENTRY_CTLS))) {
pr_warn("rdmsr: %lx should not come here!", msr); pr_warn("rdmsr: %lx should not come here!", msr);
} }
vcpu_inject_gp(vcpu, 0); vcpu_inject_gp(vcpu, 0U);
break; break;
} }
} }