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

HV:fix expression is not boolean 

Expression should be boolean immediate before 'if','while' key-words.
V1->V2 add () to bool expression

Tracked-On: #861
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-09-29 16:12:39 +08:00 committed by wenlingz
parent 25db6b7917
commit 723c22fc7f
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hypervisor/arch/x86/ept.c
View File

@ -68,7 +68,7 @@ uint64_t local_gpa2hpa(struct vm *vm, uint64_t gpa, uint32_t *size)
void *eptp;
struct vcpu *vcpu = vcpu_from_pid(vm, get_cpu_id());
if (vcpu && (vcpu->arch_vcpu.cur_context == SECURE_WORLD)) {
if ((vcpu != NULL) && (vcpu->arch_vcpu.cur_context == SECURE_WORLD)) {
eptp = vm->arch_vm.sworld_eptp;
} else {
eptp = vm->arch_vm.nworld_eptp;

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

@ -2330,7 +2330,7 @@ int decode_instruction(struct vcpu *vcpu)
* by VMX itself before hit EPT violation.
*
*/
if (emul_ctxt->vie.op.op_flags & VIE_OP_F_CHECK_GVA_DI) {
if ((emul_ctxt->vie.op.op_flags & VIE_OP_F_CHECK_GVA_DI) != 0U) {
retval = instr_check_di(vcpu, emul_ctxt);
if (retval < 0)
return retval;

2
hypervisor/arch/x86/mtrr.c
View File

@ -65,7 +65,7 @@ get_subrange_start_of_fixed_mtrr(uint32_t index, uint32_t subrange_id)
static inline bool is_mtrr_enabled(struct vcpu *vcpu)
{
return vcpu->mtrr.def_type.bits.enable;
return (vcpu->mtrr.def_type.bits.enable != 0U);
}
static inline bool is_fixed_range_mtrr_enabled(struct vcpu *vcpu)

11
hypervisor/debug/npk_log.c
View File

@ -5,7 +5,8 @@
#include <hypervisor.h>
static int32_t npk_log_enabled, npk_log_setup_ref;
static int32_t npk_log_setup_ref;
static bool npk_log_enabled;
static uint64_t base;
static inline int npk_write(const char *value, void *addr, size_t sz)
@ -42,15 +43,15 @@ void npk_log_setup(struct hv_npk_log_param *param)
switch (param->cmd) {
case HV_NPK_LOG_CMD_CONF:
if (param->mmio_addr || param->loglevel != 0xffffU)
if ((param->mmio_addr != 0UL) || (param->loglevel != 0xffffU))
param->res = HV_NPK_LOG_RES_OK;
/* falls through */
case HV_NPK_LOG_CMD_ENABLE:
if (param->mmio_addr)
if (param->mmio_addr != 0UL)
base = param->mmio_addr;
if (param->loglevel != 0xffffU)
npk_loglevel = param->loglevel;
if (base && param->cmd == HV_NPK_LOG_CMD_ENABLE) {
if ((base != 0UL) && (param->cmd == HV_NPK_LOG_CMD_ENABLE)) {
if (!npk_log_enabled)
for (i = 0; i < phys_cpu_num; i++)
per_cpu(npk_log_ref, i) = 0;
@ -87,7 +88,7 @@ void npk_log_write(const char *buf, size_t buf_len)
uint32_t ref;
uint16_t len;
if (!npk_log_enabled || !channel)
if (!npk_log_enabled || (channel == NULL))
return;
/* calculate the channel offset based on cpu_id and npk_log_ref */

2
hypervisor/lib/crypto/hkdf_wrap.c
View File

@ -15,7 +15,7 @@ int hkdf_sha256(uint8_t *out_key, size_t out_len,
const mbedtls_md_info_t *md;
md = mbedtls_md_info_from_type(MBEDTLS_MD_SHA256);
if (!md) {
if (md == NULL) {
return 0;
}