From 1caf58f2218e3e3b582477785528b2607d2fdcfe Mon Sep 17 00:00:00 2001 From: Huihuang Shi Date: Wed, 19 Dec 2018 11:30:09 +0800 Subject: [PATCH] hv:clean io_request.c misra violations Clean the io_request.c's violations reported by the misra tools. V1->V2: remove violations which checked with NULL. Tracked-On: #861 Signed-off-by: Huihuang Shi Acked-by: Eddie Dong --- hypervisor/common/io_request.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/hypervisor/common/io_request.c b/hypervisor/common/io_request.c index ace9a0873..ce0b923a7 100644 --- a/hypervisor/common/io_request.c +++ b/hypervisor/common/io_request.c @@ -73,7 +73,7 @@ void reset_vm_ioreqs(struct acrn_vm *vm) } } -static inline bool has_complete_ioreq(struct acrn_vcpu *vcpu) +static inline bool has_complete_ioreq(const struct acrn_vcpu *vcpu) { return (get_vhm_req_state(vcpu->vm, vcpu->vcpu_id) == REQ_STATE_COMPLETE); } @@ -169,14 +169,14 @@ uint32_t get_vhm_req_state(struct acrn_vm *vm, uint16_t vhm_req_id) req_buf = (union vhm_request_buffer *)vm->sw.io_shared_page; if (req_buf == NULL) { - return (uint32_t)-1; + state = 0xffffffffU; + } else { + stac(); + vhm_req = &req_buf->req_queue[vhm_req_id]; + state = atomic_load32(&vhm_req->processed); + clac(); } - stac(); - vhm_req = &req_buf->req_queue[vhm_req_id]; - state = atomic_load32(&vhm_req->processed); - clac(); - return state; } @@ -186,12 +186,10 @@ void set_vhm_req_state(struct acrn_vm *vm, uint16_t vhm_req_id, uint32_t state) struct vhm_request *vhm_req; req_buf = (union vhm_request_buffer *)vm->sw.io_shared_page; - if (req_buf == NULL) { - return; + if (req_buf != NULL) { + stac(); + vhm_req = &req_buf->req_queue[vhm_req_id]; + atomic_store32(&vhm_req->processed, state); + clac(); } - - stac(); - vhm_req = &req_buf->req_queue[vhm_req_id]; - atomic_store32(&vhm_req->processed, state); - clac(); }