From db708fc3e856bf26c98f16580715ee4fdc0b11cd Mon Sep 17 00:00:00 2001 From: Shuo A Liu Date: Tue, 7 Jan 2020 14:30:00 +0800 Subject: [PATCH] hv: rename is_completion_polling to is_polling_ioreq is_polling_ioreq is more straightforward. Rename it. Tracked-On: #4329 Signed-off-by: Shuo A Liu Acked-by: Eddie Dong --- hypervisor/arch/x86/guest/vm.c | 2 +- hypervisor/common/hypercall.c | 2 +- hypervisor/dm/io_req.c | 2 +- hypervisor/include/arch/x86/guest/vm.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hypervisor/arch/x86/guest/vm.c b/hypervisor/arch/x86/guest/vm.c index ff2bb2a3a..0368798b0 100644 --- a/hypervisor/arch/x86/guest/vm.c +++ b/hypervisor/arch/x86/guest/vm.c @@ -575,7 +575,7 @@ int32_t create_vm(uint16_t vm_id, struct acrn_vm_config *vm_config, struct acrn_ vm->sw.io_shared_page = NULL; if ((vm_config->load_order == POST_LAUNCHED_VM) && ((vm_config->guest_flags & GUEST_FLAG_IO_COMPLETION_POLLING) != 0U)) { /* enable IO completion polling mode per its guest flags in vm_config. */ - vm->sw.is_completion_polling = true; + vm->sw.is_polling_ioreq = true; } status = set_vcpuid_entries(vm); if (status == 0) { diff --git a/hypervisor/common/hypercall.c b/hypervisor/common/hypercall.c index dc10689f9..85edf518a 100644 --- a/hypervisor/common/hypercall.c +++ b/hypervisor/common/hypercall.c @@ -552,7 +552,7 @@ int32_t hcall_notify_ioreq_finish(uint16_t vmid, uint16_t vcpu_id) __func__, vcpu_id, target_vm->vm_id); } else { vcpu = vcpu_from_vid(target_vm, vcpu_id); - if (!vcpu->vm->sw.is_completion_polling) { + if (!vcpu->vm->sw.is_polling_ioreq) { signal_event(&vcpu->events[VCPU_EVENT_IOREQ]); } ret = 0; diff --git a/hypervisor/dm/io_req.c b/hypervisor/dm/io_req.c index e113c0c84..3aadd9130 100644 --- a/hypervisor/dm/io_req.c +++ b/hypervisor/dm/io_req.c @@ -97,7 +97,7 @@ int32_t acrn_insert_request(struct acrn_vcpu *vcpu, const struct io_request *io_ vhm_req->type = io_req->io_type; (void)memcpy_s(&vhm_req->reqs, sizeof(union vhm_io_request), &io_req->reqs, sizeof(union vhm_io_request)); - if (vcpu->vm->sw.is_completion_polling) { + if (vcpu->vm->sw.is_polling_ioreq) { vhm_req->completion_polling = 1U; is_polling = true; } diff --git a/hypervisor/include/arch/x86/guest/vm.h b/hypervisor/include/arch/x86/guest/vm.h index 7d1a33f97..1d38fb390 100644 --- a/hypervisor/include/arch/x86/guest/vm.h +++ b/hypervisor/include/arch/x86/guest/vm.h @@ -67,7 +67,7 @@ struct vm_sw_info { /* HVA to IO shared page */ void *io_shared_page; /* If enable IO completion polling mode */ - bool is_completion_polling; + bool is_polling_ioreq; }; struct vm_pm_info {