| Message ID | 20230405160454.97436-5-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | accel/kvm: Spring cleaning | expand |
On 4/5/23 09:04, Philippe Mathieu-Daudé wrote: > "hw/core/cpu.h" defines 'first_cpu' as QTAILQ_FIRST_RCU(&cpus). > > arm_gic_common_reset_irq_state() calls its second argument > 'first_cpu', producing a build failure when "hw/core/cpu.h" > is included: > > hw/intc/arm_gic_common.c:238:68: warning: omitting the parameter name in a function definition is a C2x extension [-Wc2x-extensions] > static inline void arm_gic_common_reset_irq_state(GICState *s, int first_cpu, > ^ > include/hw/core/cpu.h:451:26: note: expanded from macro 'first_cpu' > #define first_cpu QTAILQ_FIRST_RCU(&cpus) > ^ > > KISS, rename the function argument. > > Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org> > --- > hw/intc/arm_gic_common.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) Wow, that's ugly. But a reasonable work-around. r~
On 4/7/23 21:23, Richard Henderson wrote: > On 4/5/23 09:04, Philippe Mathieu-Daudé wrote: >> "hw/core/cpu.h" defines 'first_cpu' as QTAILQ_FIRST_RCU(&cpus). >> >> arm_gic_common_reset_irq_state() calls its second argument >> 'first_cpu', producing a build failure when "hw/core/cpu.h" >> is included: >> >> hw/intc/arm_gic_common.c:238:68: warning: omitting the parameter name in a function >> definition is a C2x extension [-Wc2x-extensions] >> static inline void arm_gic_common_reset_irq_state(GICState *s, int first_cpu, >> ^ >> include/hw/core/cpu.h:451:26: note: expanded from macro 'first_cpu' >> #define first_cpu QTAILQ_FIRST_RCU(&cpus) >> ^ >> >> KISS, rename the function argument. >> >> Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org> >> --- >> hw/intc/arm_gic_common.c | 5 +++-- >> 1 file changed, 3 insertions(+), 2 deletions(-) > > Wow, that's ugly. But a reasonable work-around. Duh. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
Philippe Mathieu-Daudé <philmd@linaro.org> writes: > "hw/core/cpu.h" defines 'first_cpu' as QTAILQ_FIRST_RCU(&cpus). > > arm_gic_common_reset_irq_state() calls its second argument > 'first_cpu', producing a build failure when "hw/core/cpu.h" > is included: > > hw/intc/arm_gic_common.c:238:68: warning: omitting the parameter name in a function definition is a C2x extension [-Wc2x-extensions] > static inline void arm_gic_common_reset_irq_state(GICState *s, int first_cpu, > ^ > include/hw/core/cpu.h:451:26: note: expanded from macro 'first_cpu' > #define first_cpu QTAILQ_FIRST_RCU(&cpus) > ^ > > KISS, rename the function argument. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > hw/intc/arm_gic_common.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/hw/intc/arm_gic_common.c b/hw/intc/arm_gic_common.c > index 9702197856..889327a8cf 100644 > --- a/hw/intc/arm_gic_common.c > +++ b/hw/intc/arm_gic_common.c > @@ -235,12 +235,13 @@ static void arm_gic_common_realize(DeviceState *dev, Error **errp) > } > } > > -static inline void arm_gic_common_reset_irq_state(GICState *s, int first_cpu, > +static inline void arm_gic_common_reset_irq_state(GICState *s, > + int > first_cpu_index, I'd have gone for a shorter name like cidx maybe, naming things is hard. Anyway: Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > int resetprio) > { > int i, j; > > - for (i = first_cpu; i < first_cpu + s->num_cpu; i++) { > + for (i = first_cpu_index; i < first_cpu_index + s->num_cpu; i++) { > if (s->revision == REV_11MPCORE) { > s->priority_mask[i] = 0xf0; > } else {
diff --git a/hw/intc/arm_gic_common.c b/hw/intc/arm_gic_common.c index 9702197856..889327a8cf 100644 --- a/hw/intc/arm_gic_common.c +++ b/hw/intc/arm_gic_common.c @@ -235,12 +235,13 @@ static void arm_gic_common_realize(DeviceState *dev, Error **errp) } } -static inline void arm_gic_common_reset_irq_state(GICState *s, int first_cpu, +static inline void arm_gic_common_reset_irq_state(GICState *s, + int first_cpu_index, int resetprio) { int i, j; - for (i = first_cpu; i < first_cpu + s->num_cpu; i++) { + for (i = first_cpu_index; i < first_cpu_index + s->num_cpu; i++) { if (s->revision == REV_11MPCORE) { s->priority_mask[i] = 0xf0; } else {
"hw/core/cpu.h" defines 'first_cpu' as QTAILQ_FIRST_RCU(&cpus). arm_gic_common_reset_irq_state() calls its second argument 'first_cpu', producing a build failure when "hw/core/cpu.h" is included: hw/intc/arm_gic_common.c:238:68: warning: omitting the parameter name in a function definition is a C2x extension [-Wc2x-extensions] static inline void arm_gic_common_reset_irq_state(GICState *s, int first_cpu, ^ include/hw/core/cpu.h:451:26: note: expanded from macro 'first_cpu' #define first_cpu QTAILQ_FIRST_RCU(&cpus) ^ KISS, rename the function argument. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- hw/intc/arm_gic_common.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)