And keep compiler happy about unused parameters.
Signed-off-by: Andrea Bastoni <[email protected]>
---
hypervisor/arch/arm-common/gic-v2.c | 12 +++++++-----
hypervisor/arch/arm-common/gic-v3.c | 9 +++++----
hypervisor/arch/arm-common/irqchip.c | 4 ++--
hypervisor/arch/arm-common/paging.c | 6 +++---
hypervisor/arch/arm-common/pci.c | 13 +++++++++++++
5 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/hypervisor/arch/arm-common/gic-v2.c
b/hypervisor/arch/arm-common/gic-v2.c
index c5ad0607..77e23860 100644
--- a/hypervisor/arch/arm-common/gic-v2.c
+++ b/hypervisor/arch/arm-common/gic-v2.c
@@ -77,7 +77,8 @@ static void gicv2_clear_pending_irqs(void)
mmio_write32(gich_base + GICH_APR, 0);
}
-static void gicv2_cpu_reset(struct per_cpu *cpu_data)
+static void gicv2_cpu_reset(
+ struct per_cpu *cpu_data __attribute__((unused)))
{
unsigned int mnt_irq = system_config->platform_info.arm.maintenance_irq;
@@ -277,7 +278,7 @@ static void gicv2_send_sgi(struct sgi *sgi)
static int gicv2_inject_irq(u16 irq_id, u16 sender)
{
- int i;
+ unsigned int i;
int first_free = -1;
u32 lr;
unsigned long elsr[2];
@@ -377,8 +378,9 @@ static void gicv2_inject_phys_irq(u16 irq_id)
}
}
-static enum mmio_result gicv2_handle_irq_route(struct mmio_access *mmio,
- unsigned int irq)
+static enum mmio_result gicv2_handle_irq_route(
+ struct mmio_access *mmio __attribute__((unused)),
+ unsigned int irq __attribute__((unused)))
{
/* doesn't exist in v2 - ignore access */
return MMIO_HANDLED;
@@ -495,7 +497,7 @@ static int gicv2_get_cpu_target(unsigned int cpu_id)
return gicv2_target_cpu_map[cpu_id];
}
-static u64 gicv2_get_cluster_target(unsigned int cpu_id)
+static u64 gicv2_get_cluster_target(unsigned int cpu_id
__attribute__((unused)))
{
return 0;
}
diff --git a/hypervisor/arch/arm-common/gic-v3.c
b/hypervisor/arch/arm-common/gic-v3.c
index 949c4598..40baaf6b 100644
--- a/hypervisor/arch/arm-common/gic-v3.c
+++ b/hypervisor/arch/arm-common/gic-v3.c
@@ -527,9 +527,9 @@ static void gicv3_eoi_irq(u32 irq_id, bool deactivate)
arm_write_sysreg(ICC_DIR_EL1, irq_id);
}
-static int gicv3_inject_irq(u16 irq_id, u16 sender)
+static int gicv3_inject_irq(u16 irq_id, u16 sender __attribute__((unused)))
{
- int i;
+ unsigned int i;
int free_lr = -1;
u32 elsr;
u64 lr;
@@ -642,8 +642,9 @@ static void gicv3_inject_phys_irq(u16 irq_id)
}
}
-static enum mmio_result gicv3_handle_irq_target(struct mmio_access *mmio,
- unsigned int irq)
+static enum mmio_result gicv3_handle_irq_target(
+ struct mmio_access *mmio __attribute__((unused)),
+ unsigned int irq __attribute__((unused)))
{
/* ignore writes, we are in affinity routing mode */
return MMIO_HANDLED;
diff --git a/hypervisor/arch/arm-common/irqchip.c
b/hypervisor/arch/arm-common/irqchip.c
index eb9ac40f..91b12b8f 100644
--- a/hypervisor/arch/arm-common/irqchip.c
+++ b/hypervisor/arch/arm-common/irqchip.c
@@ -131,7 +131,7 @@ void gic_handle_sgir_write(struct sgi *sgi)
}
}
-static enum mmio_result gic_handle_dist_access(void *arg,
+static enum mmio_result gic_handle_dist_access(void *arg
__attribute__((unused)),
struct mmio_access *mmio)
{
unsigned long reg = mmio->address;
@@ -516,7 +516,7 @@ void irqchip_config_commit(struct cell *cell_added_removed)
}
}
-static unsigned int irqchip_mmio_count_regions(struct cell *cell)
+static unsigned int irqchip_mmio_count_regions(struct cell *cell
__attribute__((unused)))
{
unsigned int regions = 1; /* GICD */
diff --git a/hypervisor/arch/arm-common/paging.c
b/hypervisor/arch/arm-common/paging.c
index be1f7da8..54b86e7d 100644
--- a/hypervisor/arch/arm-common/paging.c
+++ b/hypervisor/arch/arm-common/paging.c
@@ -14,7 +14,7 @@
unsigned int cpu_parange = 0;
-static bool arm_entry_valid(pt_entry_t entry, unsigned long flags)
+static bool arm_entry_valid( pt_entry_t entry, unsigned long flags)
{
// FIXME: validate flags!
return *entry & 1;
@@ -137,7 +137,7 @@ static unsigned long arm_get_l3_phys(pt_entry_t pte,
unsigned long virt)
.clear_entry = arm_clear_entry, \
.page_table_empty = arm_page_table_empty,
-const static struct paging arm_paging[] = {
+static const struct paging arm_paging[] = {
#if MAX_PAGE_TABLE_LEVELS > 3
{
ARM_PAGING_COMMON
@@ -183,7 +183,7 @@ const static struct paging arm_paging[] = {
}
};
-const static struct paging arm_s2_paging_alt[] = {
+static const struct paging arm_s2_paging_alt[] = {
{
ARM_PAGING_COMMON
.get_entry = arm_get_l1_alt_entry,
diff --git a/hypervisor/arch/arm-common/pci.c b/hypervisor/arch/arm-common/pci.c
index 8daccee5..8bec1275 100644
--- a/hypervisor/arch/arm-common/pci.c
+++ b/hypervisor/arch/arm-common/pci.c
@@ -15,26 +15,39 @@
u32 arch_pci_read_config(u16 bdf, u16 address, unsigned int size)
{
+ (void)bdf;
+ (void)address;
+ (void)size;
return -1;
}
void arch_pci_write_config(u16 bdf, u16 address, u32 value, unsigned int size)
{
+ (void)bdf;
+ (void)address;
+ (void)value;
+ (void)size;
}
int arch_pci_add_physical_device(struct cell *cell, struct pci_device *device)
{
+ (void)cell;
+ (void)device;
return 0;
}
void arch_pci_remove_physical_device(struct pci_device *device)
{
+ (void)device;
}
void arch_pci_set_suppress_msi(struct pci_device *device,
const struct jailhouse_pci_capability *cap,
bool suppress)
{
+ (void)device;
+ (void)cap;
+ (void)suppress;
}
int arch_pci_update_msi(struct pci_device *device,
--
2.28.0
--
You received this message because you are subscribed to the Google Groups
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/jailhouse-dev/20201021145404.100463-6-andrea.bastoni%40tum.de.
