Skip to content

Commit 1f8f1a4

Browse files
KaigeFulijinxia
authored andcommitted
HV: fix unused warning at RELEASE version
We will get following warnings when build acrn as release version. This patch fix those warnings. No functional change. ... arch/x86/cpu.c: In function ‘stop_cpus’: arch/x86/cpu.c:727:20: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] if (get_cpu_id() == i) /* avoid offline itself */ ^~ arch/x86/vtd.c: In function ‘dmar_enable_translation’: arch/x86/vtd.c:84:12: warning: unused variable ‘start’ [-Wunused-variable] uint64_t start = rdtsc(); \ ... arch/x86/guest/instr_emul.c: In function ‘get_gla’: arch/x86/guest/instr_emul.c:615:6: warning: variable ‘error’ set but not used [-Wunused-but-set-variable] int error; ... Signed-off-by: Kaige Fu <kaige.fu@intel.com> Acked-by: Eddie Dong <eddie.dong@intel.com>
1 parent e84d4de commit 1f8f1a4

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

hypervisor/arch/x86/guest/instr_emul.c

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -615,18 +615,15 @@ get_gla(struct vcpu *vcpu, __unused struct vie *vie,
615615
int error;
616616

617617
error = vie_read_register(vcpu, VM_REG_GUEST_CR0, &cr0);
618-
ASSERT(error == 0, "%s: error %d getting cr0", __func__, error);
619-
620-
error = vie_read_register(vcpu, VM_REG_GUEST_RFLAGS, &rflags);
621-
ASSERT(error == 0, "%s: error %d getting rflags", __func__, error);
618+
error |= vie_read_register(vcpu, VM_REG_GUEST_RFLAGS, &rflags);
619+
error |= vm_get_seg_desc(vcpu, seg, &desc);
620+
error |= vie_read_register(vcpu, gpr, &val);
622621

623-
error = vm_get_seg_desc(vcpu, seg, &desc);
624-
ASSERT(error == 0, "%s: error %d getting segment descriptor %d",
625-
__func__, error, seg);
626-
627-
error = vie_read_register(vcpu, gpr, &val);
628-
ASSERT(error == 0, "%s: error %d getting register %d", __func__,
629-
error, gpr);
622+
if (error) {
623+
pr_err("%s: error(%d) happens when getting cr0/rflags/segment"
624+
"desc/gpr", __func__, error);
625+
return -1;
626+
}
630627

631628
if (vie_calculate_gla(paging->cpu_mode, seg, &desc, val, opsize,
632629
addrsize, prot, gla)) {

hypervisor/arch/x86/vtd.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@
8181

8282
#define DMAR_WAIT_COMPLETION(offset, condition, status) \
8383
do { \
84-
uint64_t start = rdtsc(); \
84+
/* variable start isn't used when built as release version */ \
85+
__unused uint64_t start = rdtsc(); \
8586
while (1) { \
8687
status = iommu_read32(dmar_uint, offset); \
8788
if (condition) \

0 commit comments

Comments
 (0)