refactor: rename struct interrupt
Trivial patch that renames struct interrupt to struct interrupt_info.
vcpu.h already has a struct interrupts which makes the two struct names
differ by one letter that makes it confusing to read code.
Signed-off-by: Raghu Krishnamurthy <raghu.ncstate@gmail.com>
Change-Id: I6d6dfd502a3664b0024242a0e0d387ea229bf642
diff --git a/inc/hf/manifest.h b/inc/hf/manifest.h
index 30d79cc..69955e2 100644
--- a/inc/hf/manifest.h
+++ b/inc/hf/manifest.h
@@ -64,7 +64,7 @@
struct string name;
};
-struct interrupt {
+struct interrupt_info {
uint32_t id;
uint32_t attributes;
};
@@ -80,7 +80,7 @@
/** Memory attributes - mandatory */
uint32_t attributes;
/** List of physical interrupt ID's and their attributes - optional */
- struct interrupt interrupts[PARTITION_MAX_INTERRUPTS_PER_DEVICE];
+ struct interrupt_info interrupts[PARTITION_MAX_INTERRUPTS_PER_DEVICE];
/** Count of physical interrupts - optional */
uint8_t interrupt_count;
/** SMMU ID - optional */
diff --git a/src/load.c b/src/load.c
index 431d82c..9c6ec61 100644
--- a/src/load.c
+++ b/src/load.c
@@ -127,7 +127,7 @@
return true;
}
-static void infer_interrupt(struct interrupt interrupt,
+static void infer_interrupt(struct interrupt_info interrupt,
struct interrupt_descriptor *int_desc)
{
uint32_t attr = interrupt.attributes;
@@ -156,7 +156,7 @@
struct mpool *ppool)
{
struct device_region dev_region;
- struct interrupt interrupt;
+ struct interrupt_info interrupt;
uint32_t k = 0;
vm_locked.vm->smc_whitelist = manifest_vm->smc_whitelist;