Rename interrupt APIs to adhere to hf_noun_verb convention.
Change-Id: Iff781fdbbe6d7cc60d1ecf8b124a9cfe8fed44a7
diff --git a/src/api.c b/src/api.c
index e1d36ae..74c45c7 100644
--- a/src/api.c
+++ b/src/api.c
@@ -618,7 +618,7 @@
*
* Returns 0 on success, or -1 if the intid is invalid.
*/
-int64_t api_enable_interrupt(uint32_t intid, bool enable, struct vcpu *current)
+int64_t api_interrupt_enable(uint32_t intid, bool enable, struct vcpu *current)
{
uint32_t intid_index = intid / INTERRUPT_REGISTER_BITS;
uint32_t intid_mask = 1u << (intid % INTERRUPT_REGISTER_BITS);
@@ -662,7 +662,7 @@
* acknowledges it (i.e. marks it as no longer pending). Returns
* HF_INVALID_INTID if there are no pending interrupts.
*/
-uint32_t api_get_and_acknowledge_interrupt(struct vcpu *current)
+uint32_t api_interrupt_get(struct vcpu *current)
{
uint8_t i;
uint32_t first_interrupt = HF_INVALID_INTID;
@@ -725,7 +725,7 @@
* - 1 if it was called by the primary VM and the primary VM now needs to wake
* up or kick the target vCPU.
*/
-int64_t api_inject_interrupt(uint32_t target_vm_id, uint32_t target_vcpu_idx,
+int64_t api_interrupt_inject(uint32_t target_vm_id, uint32_t target_vcpu_idx,
uint32_t intid, struct vcpu *current,
struct vcpu **next)
{
diff --git a/src/arch/aarch64/handler.c b/src/arch/aarch64/handler.c
index d341580..c43759e 100644
--- a/src/arch/aarch64/handler.c
+++ b/src/arch/aarch64/handler.c
@@ -290,16 +290,16 @@
ret.user_ret = api_mailbox_clear(current());
break;
- case HF_ENABLE_INTERRUPT:
- ret.user_ret = api_enable_interrupt(arg1, arg2, current());
+ case HF_INTERRUPT_ENABLE:
+ ret.user_ret = api_interrupt_enable(arg1, arg2, current());
break;
- case HF_GET_AND_ACKNOWLEDGE_INTERRUPT:
- ret.user_ret = api_get_and_acknowledge_interrupt(current());
+ case HF_INTERRUPT_GET:
+ ret.user_ret = api_interrupt_get(current());
break;
- case HF_INJECT_INTERRUPT:
- ret.user_ret = api_inject_interrupt(arg1, arg2, arg3, current(),
+ case HF_INTERRUPT_INJECT:
+ ret.user_ret = api_interrupt_inject(arg1, arg2, arg3, current(),
&ret.new);
break;