Message ID | 20241213190750.2513964-65-richard.henderson@linaro.org |
---|---|
State | Superseded |
Headers | show |
Series | whole-tree: Constify Property structures | expand |
On 12/13/24 20:07, Richard Henderson wrote: > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > hw/timer/a9gtimer.c | 2 +- > hw/timer/allwinner-a10-pit.c | 2 +- > hw/timer/arm_mptimer.c | 2 +- > hw/timer/arm_timer.c | 2 +- > hw/timer/aspeed_timer.c | 2 +- > hw/timer/avr_timer16.c | 2 +- > hw/timer/grlib_gptimer.c | 2 +- > hw/timer/hpet.c | 2 +- > hw/timer/i8254_common.c | 2 +- > hw/timer/ibex_timer.c | 2 +- > hw/timer/mss-timer.c | 2 +- > hw/timer/nrf51_timer.c | 2 +- > hw/timer/pxa2xx_timer.c | 2 +- > hw/timer/renesas_cmt.c | 2 +- > hw/timer/renesas_tmr.c | 2 +- > hw/timer/sifive_pwm.c | 2 +- > hw/timer/slavio_timer.c | 2 +- > hw/timer/sse-timer.c | 2 +- > hw/timer/stm32f2xx_timer.c | 2 +- > hw/timer/xilinx_timer.c | 2 +- > 20 files changed, 20 insertions(+), 20 deletions(-) For the aspeed part, Reviewed-by: Cédric Le Goater <clg@redhat.com> Thanks, C. > > diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c > index 8091ec18c7..c0a91bab0c 100644 > --- a/hw/timer/a9gtimer.c > +++ b/hw/timer/a9gtimer.c > @@ -373,7 +373,7 @@ static const VMStateDescription vmstate_a9_gtimer = { > } > }; > > -static Property a9_gtimer_properties[] = { > +static const Property a9_gtimer_properties[] = { > DEFINE_PROP_UINT32("num-cpu", A9GTimerState, num_cpu, 0), > DEFINE_PROP_END_OF_LIST() > }; > diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c > index d488e9782b..2904ccfb42 100644 > --- a/hw/timer/allwinner-a10-pit.c > +++ b/hw/timer/allwinner-a10-pit.c > @@ -188,7 +188,7 @@ static const MemoryRegionOps a10_pit_ops = { > .endianness = DEVICE_NATIVE_ENDIAN, > }; > > -static Property a10_pit_properties[] = { > +static const Property a10_pit_properties[] = { > DEFINE_PROP_UINT32("clk0-freq", AwA10PITState, clk_freq[0], 0), > DEFINE_PROP_UINT32("clk1-freq", AwA10PITState, clk_freq[1], 0), > DEFINE_PROP_UINT32("clk2-freq", AwA10PITState, clk_freq[2], 0), > diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c > index defa30b46d..6244a7a84f 100644 > --- a/hw/timer/arm_mptimer.c > +++ b/hw/timer/arm_mptimer.c > @@ -300,7 +300,7 @@ static const VMStateDescription vmstate_arm_mptimer = { > } > }; > > -static Property arm_mptimer_properties[] = { > +static const Property arm_mptimer_properties[] = { > DEFINE_PROP_UINT32("num-cpu", ARMMPTimerState, num_cpu, 0), > DEFINE_PROP_END_OF_LIST() > }; > diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c > index 0940e03f1d..dfa034296c 100644 > --- a/hw/timer/arm_timer.c > +++ b/hw/timer/arm_timer.c > @@ -387,7 +387,7 @@ static const TypeInfo icp_pit_info = { > .instance_init = icp_pit_init, > }; > > -static Property sp804_properties[] = { > +static const Property sp804_properties[] = { > DEFINE_PROP_UINT32("freq0", SP804State, freq0, 1000000), > DEFINE_PROP_UINT32("freq1", SP804State, freq1, 1000000), > DEFINE_PROP_END_OF_LIST(), > diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c > index 149f7cc5a6..4c16b5016e 100644 > --- a/hw/timer/aspeed_timer.c > +++ b/hw/timer/aspeed_timer.c > @@ -674,7 +674,7 @@ static const VMStateDescription vmstate_aspeed_timer_state = { > } > }; > > -static Property aspeed_timer_properties[] = { > +static const Property aspeed_timer_properties[] = { > DEFINE_PROP_LINK("scu", AspeedTimerCtrlState, scu, TYPE_ASPEED_SCU, > AspeedSCUState *), > DEFINE_PROP_END_OF_LIST(), > diff --git a/hw/timer/avr_timer16.c b/hw/timer/avr_timer16.c > index 421920054f..2e3ce83c43 100644 > --- a/hw/timer/avr_timer16.c > +++ b/hw/timer/avr_timer16.c > @@ -542,7 +542,7 @@ static const MemoryRegionOps avr_timer16_ifr_ops = { > .impl = {.max_access_size = 1} > }; > > -static Property avr_timer16_properties[] = { > +static const Property avr_timer16_properties[] = { > DEFINE_PROP_UINT8("id", struct AVRTimer16State, id, 0), > DEFINE_PROP_UINT64("cpu-frequency-hz", struct AVRTimer16State, > cpu_freq_hz, 0), > diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c > index 6ef08f25fd..a7428ed938 100644 > --- a/hw/timer/grlib_gptimer.c > +++ b/hw/timer/grlib_gptimer.c > @@ -403,7 +403,7 @@ static void grlib_gptimer_realize(DeviceState *dev, Error **errp) > sysbus_init_mmio(sbd, &unit->iomem); > } > > -static Property grlib_gptimer_properties[] = { > +static const Property grlib_gptimer_properties[] = { > DEFINE_PROP_UINT32("frequency", GPTimerUnit, freq_hz, 40000000), > DEFINE_PROP_UINT32("irq-line", GPTimerUnit, irq_line, 8), > DEFINE_PROP_UINT32("nr-timers", GPTimerUnit, nr_timers, 2), > diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c > index 5399f1b2a3..46886c379e 100644 > --- a/hw/timer/hpet.c > +++ b/hw/timer/hpet.c > @@ -745,7 +745,7 @@ static void hpet_realize(DeviceState *dev, Error **errp) > qdev_init_gpio_out(dev, &s->pit_enabled, 1); > } > > -static Property hpet_device_properties[] = { > +static const Property hpet_device_properties[] = { > DEFINE_PROP_UINT8("timers", HPETState, num_timers, HPET_MIN_TIMERS), > DEFINE_PROP_BIT("msi", HPETState, flags, HPET_MSI_SUPPORT, false), > DEFINE_PROP_UINT32(HPET_INTCAP, HPETState, intcap, 0), > diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c > index 28fdabc321..953c1e11eb 100644 > --- a/hw/timer/i8254_common.c > +++ b/hw/timer/i8254_common.c > @@ -238,7 +238,7 @@ static const VMStateDescription vmstate_pit_common = { > } > }; > > -static Property pit_common_properties[] = { > +static const Property pit_common_properties[] = { > DEFINE_PROP_UINT32("iobase", PITCommonState, iobase, -1), > DEFINE_PROP_END_OF_LIST(), > }; > diff --git a/hw/timer/ibex_timer.c b/hw/timer/ibex_timer.c > index 2bdcff532d..fba4466a89 100644 > --- a/hw/timer/ibex_timer.c > +++ b/hw/timer/ibex_timer.c > @@ -263,7 +263,7 @@ static const VMStateDescription vmstate_ibex_timer = { > } > }; > > -static Property ibex_timer_properties[] = { > +static const Property ibex_timer_properties[] = { > DEFINE_PROP_UINT32("timebase-freq", IbexTimerState, timebase_freq, 10000), > DEFINE_PROP_END_OF_LIST(), > }; > diff --git a/hw/timer/mss-timer.c b/hw/timer/mss-timer.c > index b66aed56ea..e5c5cd6a84 100644 > --- a/hw/timer/mss-timer.c > +++ b/hw/timer/mss-timer.c > @@ -279,7 +279,7 @@ static const VMStateDescription vmstate_mss_timer = { > } > }; > > -static Property mss_timer_properties[] = { > +static const Property mss_timer_properties[] = { > /* Libero GUI shows 100Mhz as default for clocks */ > DEFINE_PROP_UINT32("clock-frequency", MSSTimerState, freq_hz, > 100 * 1000000), > diff --git a/hw/timer/nrf51_timer.c b/hw/timer/nrf51_timer.c > index 35b0e62d5b..48fccec1bf 100644 > --- a/hw/timer/nrf51_timer.c > +++ b/hw/timer/nrf51_timer.c > @@ -379,7 +379,7 @@ static const VMStateDescription vmstate_nrf51_timer = { > } > }; > > -static Property nrf51_timer_properties[] = { > +static const Property nrf51_timer_properties[] = { > DEFINE_PROP_UINT8("id", NRF51TimerState, id, 0), > DEFINE_PROP_END_OF_LIST(), > }; > diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c > index 3234bbb1f4..345145bfa8 100644 > --- a/hw/timer/pxa2xx_timer.c > +++ b/hw/timer/pxa2xx_timer.c > @@ -549,7 +549,7 @@ static const VMStateDescription vmstate_pxa2xx_timer_regs = { > } > }; > > -static Property pxa25x_timer_dev_properties[] = { > +static const Property pxa25x_timer_dev_properties[] = { > DEFINE_PROP_UINT32("freq", PXA2xxTimerInfo, freq, PXA25X_FREQ), > DEFINE_PROP_BIT("tm4", PXA2xxTimerInfo, flags, > PXA2XX_TIMER_HAVE_TM4, false), > diff --git a/hw/timer/renesas_cmt.c b/hw/timer/renesas_cmt.c > index cd59b08c87..6d451fa86b 100644 > --- a/hw/timer/renesas_cmt.c > +++ b/hw/timer/renesas_cmt.c > @@ -253,7 +253,7 @@ static const VMStateDescription vmstate_rcmt = { > } > }; > > -static Property rcmt_properties[] = { > +static const Property rcmt_properties[] = { > DEFINE_PROP_UINT64("input-freq", RCMTState, input_freq, 0), > DEFINE_PROP_END_OF_LIST(), > }; > diff --git a/hw/timer/renesas_tmr.c b/hw/timer/renesas_tmr.c > index a93e075fcd..890f803cf8 100644 > --- a/hw/timer/renesas_tmr.c > +++ b/hw/timer/renesas_tmr.c > @@ -463,7 +463,7 @@ static const VMStateDescription vmstate_rtmr = { > } > }; > > -static Property rtmr_properties[] = { > +static const Property rtmr_properties[] = { > DEFINE_PROP_UINT64("input-freq", RTMRState, input_freq, 0), > DEFINE_PROP_END_OF_LIST(), > }; > diff --git a/hw/timer/sifive_pwm.c b/hw/timer/sifive_pwm.c > index 4602fc1a61..042c89c67a 100644 > --- a/hw/timer/sifive_pwm.c > +++ b/hw/timer/sifive_pwm.c > @@ -404,7 +404,7 @@ static const VMStateDescription vmstate_sifive_pwm = { > } > }; > > -static Property sifive_pwm_properties[] = { > +static const Property sifive_pwm_properties[] = { > /* 0.5Ghz per spec after FSBL */ > DEFINE_PROP_UINT64("clock-frequency", struct SiFivePwmState, > freq_hz, 500000000ULL), > diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c > index 12cb3bac97..32991f4436 100644 > --- a/hw/timer/slavio_timer.c > +++ b/hw/timer/slavio_timer.c > @@ -420,7 +420,7 @@ static void slavio_timer_init(Object *obj) > } > } > > -static Property slavio_timer_properties[] = { > +static const Property slavio_timer_properties[] = { > DEFINE_PROP_UINT32("num_cpus", SLAVIO_TIMERState, num_cpus, 0), > DEFINE_PROP_END_OF_LIST(), > }; > diff --git a/hw/timer/sse-timer.c b/hw/timer/sse-timer.c > index 115b0138c8..6b7a67941c 100644 > --- a/hw/timer/sse-timer.c > +++ b/hw/timer/sse-timer.c > @@ -440,7 +440,7 @@ static const VMStateDescription sse_timer_vmstate = { > } > }; > > -static Property sse_timer_properties[] = { > +static const Property sse_timer_properties[] = { > DEFINE_PROP_LINK("counter", SSETimer, counter, TYPE_SSE_COUNTER, SSECounter *), > DEFINE_PROP_END_OF_LIST(), > }; > diff --git a/hw/timer/stm32f2xx_timer.c b/hw/timer/stm32f2xx_timer.c > index 16b47887a5..d9d745cd76 100644 > --- a/hw/timer/stm32f2xx_timer.c > +++ b/hw/timer/stm32f2xx_timer.c > @@ -298,7 +298,7 @@ static const VMStateDescription vmstate_stm32f2xx_timer = { > } > }; > > -static Property stm32f2xx_timer_properties[] = { > +static const Property stm32f2xx_timer_properties[] = { > DEFINE_PROP_UINT64("clock-frequency", struct STM32F2XXTimerState, > freq_hz, 1000000000), > DEFINE_PROP_END_OF_LIST(), > diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c > index 32a9df69e0..7fe3e83baa 100644 > --- a/hw/timer/xilinx_timer.c > +++ b/hw/timer/xilinx_timer.c > @@ -242,7 +242,7 @@ static void xilinx_timer_init(Object *obj) > sysbus_init_irq(SYS_BUS_DEVICE(obj), &t->irq); > } > > -static Property xilinx_timer_properties[] = { > +static const Property xilinx_timer_properties[] = { > DEFINE_PROP_UINT32("clock-frequency", XpsTimerState, freq_hz, 62 * 1000000), > DEFINE_PROP_UINT8("one-timer-only", XpsTimerState, one_timer_only, 0), > DEFINE_PROP_END_OF_LIST(),
diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c index 8091ec18c7..c0a91bab0c 100644 --- a/hw/timer/a9gtimer.c +++ b/hw/timer/a9gtimer.c @@ -373,7 +373,7 @@ static const VMStateDescription vmstate_a9_gtimer = { } }; -static Property a9_gtimer_properties[] = { +static const Property a9_gtimer_properties[] = { DEFINE_PROP_UINT32("num-cpu", A9GTimerState, num_cpu, 0), DEFINE_PROP_END_OF_LIST() }; diff --git a/hw/timer/allwinner-a10-pit.c b/hw/timer/allwinner-a10-pit.c index d488e9782b..2904ccfb42 100644 --- a/hw/timer/allwinner-a10-pit.c +++ b/hw/timer/allwinner-a10-pit.c @@ -188,7 +188,7 @@ static const MemoryRegionOps a10_pit_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static Property a10_pit_properties[] = { +static const Property a10_pit_properties[] = { DEFINE_PROP_UINT32("clk0-freq", AwA10PITState, clk_freq[0], 0), DEFINE_PROP_UINT32("clk1-freq", AwA10PITState, clk_freq[1], 0), DEFINE_PROP_UINT32("clk2-freq", AwA10PITState, clk_freq[2], 0), diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index defa30b46d..6244a7a84f 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -300,7 +300,7 @@ static const VMStateDescription vmstate_arm_mptimer = { } }; -static Property arm_mptimer_properties[] = { +static const Property arm_mptimer_properties[] = { DEFINE_PROP_UINT32("num-cpu", ARMMPTimerState, num_cpu, 0), DEFINE_PROP_END_OF_LIST() }; diff --git a/hw/timer/arm_timer.c b/hw/timer/arm_timer.c index 0940e03f1d..dfa034296c 100644 --- a/hw/timer/arm_timer.c +++ b/hw/timer/arm_timer.c @@ -387,7 +387,7 @@ static const TypeInfo icp_pit_info = { .instance_init = icp_pit_init, }; -static Property sp804_properties[] = { +static const Property sp804_properties[] = { DEFINE_PROP_UINT32("freq0", SP804State, freq0, 1000000), DEFINE_PROP_UINT32("freq1", SP804State, freq1, 1000000), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c index 149f7cc5a6..4c16b5016e 100644 --- a/hw/timer/aspeed_timer.c +++ b/hw/timer/aspeed_timer.c @@ -674,7 +674,7 @@ static const VMStateDescription vmstate_aspeed_timer_state = { } }; -static Property aspeed_timer_properties[] = { +static const Property aspeed_timer_properties[] = { DEFINE_PROP_LINK("scu", AspeedTimerCtrlState, scu, TYPE_ASPEED_SCU, AspeedSCUState *), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/timer/avr_timer16.c b/hw/timer/avr_timer16.c index 421920054f..2e3ce83c43 100644 --- a/hw/timer/avr_timer16.c +++ b/hw/timer/avr_timer16.c @@ -542,7 +542,7 @@ static const MemoryRegionOps avr_timer16_ifr_ops = { .impl = {.max_access_size = 1} }; -static Property avr_timer16_properties[] = { +static const Property avr_timer16_properties[] = { DEFINE_PROP_UINT8("id", struct AVRTimer16State, id, 0), DEFINE_PROP_UINT64("cpu-frequency-hz", struct AVRTimer16State, cpu_freq_hz, 0), diff --git a/hw/timer/grlib_gptimer.c b/hw/timer/grlib_gptimer.c index 6ef08f25fd..a7428ed938 100644 --- a/hw/timer/grlib_gptimer.c +++ b/hw/timer/grlib_gptimer.c @@ -403,7 +403,7 @@ static void grlib_gptimer_realize(DeviceState *dev, Error **errp) sysbus_init_mmio(sbd, &unit->iomem); } -static Property grlib_gptimer_properties[] = { +static const Property grlib_gptimer_properties[] = { DEFINE_PROP_UINT32("frequency", GPTimerUnit, freq_hz, 40000000), DEFINE_PROP_UINT32("irq-line", GPTimerUnit, irq_line, 8), DEFINE_PROP_UINT32("nr-timers", GPTimerUnit, nr_timers, 2), diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 5399f1b2a3..46886c379e 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -745,7 +745,7 @@ static void hpet_realize(DeviceState *dev, Error **errp) qdev_init_gpio_out(dev, &s->pit_enabled, 1); } -static Property hpet_device_properties[] = { +static const Property hpet_device_properties[] = { DEFINE_PROP_UINT8("timers", HPETState, num_timers, HPET_MIN_TIMERS), DEFINE_PROP_BIT("msi", HPETState, flags, HPET_MSI_SUPPORT, false), DEFINE_PROP_UINT32(HPET_INTCAP, HPETState, intcap, 0), diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c index 28fdabc321..953c1e11eb 100644 --- a/hw/timer/i8254_common.c +++ b/hw/timer/i8254_common.c @@ -238,7 +238,7 @@ static const VMStateDescription vmstate_pit_common = { } }; -static Property pit_common_properties[] = { +static const Property pit_common_properties[] = { DEFINE_PROP_UINT32("iobase", PITCommonState, iobase, -1), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/timer/ibex_timer.c b/hw/timer/ibex_timer.c index 2bdcff532d..fba4466a89 100644 --- a/hw/timer/ibex_timer.c +++ b/hw/timer/ibex_timer.c @@ -263,7 +263,7 @@ static const VMStateDescription vmstate_ibex_timer = { } }; -static Property ibex_timer_properties[] = { +static const Property ibex_timer_properties[] = { DEFINE_PROP_UINT32("timebase-freq", IbexTimerState, timebase_freq, 10000), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/timer/mss-timer.c b/hw/timer/mss-timer.c index b66aed56ea..e5c5cd6a84 100644 --- a/hw/timer/mss-timer.c +++ b/hw/timer/mss-timer.c @@ -279,7 +279,7 @@ static const VMStateDescription vmstate_mss_timer = { } }; -static Property mss_timer_properties[] = { +static const Property mss_timer_properties[] = { /* Libero GUI shows 100Mhz as default for clocks */ DEFINE_PROP_UINT32("clock-frequency", MSSTimerState, freq_hz, 100 * 1000000), diff --git a/hw/timer/nrf51_timer.c b/hw/timer/nrf51_timer.c index 35b0e62d5b..48fccec1bf 100644 --- a/hw/timer/nrf51_timer.c +++ b/hw/timer/nrf51_timer.c @@ -379,7 +379,7 @@ static const VMStateDescription vmstate_nrf51_timer = { } }; -static Property nrf51_timer_properties[] = { +static const Property nrf51_timer_properties[] = { DEFINE_PROP_UINT8("id", NRF51TimerState, id, 0), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c index 3234bbb1f4..345145bfa8 100644 --- a/hw/timer/pxa2xx_timer.c +++ b/hw/timer/pxa2xx_timer.c @@ -549,7 +549,7 @@ static const VMStateDescription vmstate_pxa2xx_timer_regs = { } }; -static Property pxa25x_timer_dev_properties[] = { +static const Property pxa25x_timer_dev_properties[] = { DEFINE_PROP_UINT32("freq", PXA2xxTimerInfo, freq, PXA25X_FREQ), DEFINE_PROP_BIT("tm4", PXA2xxTimerInfo, flags, PXA2XX_TIMER_HAVE_TM4, false), diff --git a/hw/timer/renesas_cmt.c b/hw/timer/renesas_cmt.c index cd59b08c87..6d451fa86b 100644 --- a/hw/timer/renesas_cmt.c +++ b/hw/timer/renesas_cmt.c @@ -253,7 +253,7 @@ static const VMStateDescription vmstate_rcmt = { } }; -static Property rcmt_properties[] = { +static const Property rcmt_properties[] = { DEFINE_PROP_UINT64("input-freq", RCMTState, input_freq, 0), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/timer/renesas_tmr.c b/hw/timer/renesas_tmr.c index a93e075fcd..890f803cf8 100644 --- a/hw/timer/renesas_tmr.c +++ b/hw/timer/renesas_tmr.c @@ -463,7 +463,7 @@ static const VMStateDescription vmstate_rtmr = { } }; -static Property rtmr_properties[] = { +static const Property rtmr_properties[] = { DEFINE_PROP_UINT64("input-freq", RTMRState, input_freq, 0), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/timer/sifive_pwm.c b/hw/timer/sifive_pwm.c index 4602fc1a61..042c89c67a 100644 --- a/hw/timer/sifive_pwm.c +++ b/hw/timer/sifive_pwm.c @@ -404,7 +404,7 @@ static const VMStateDescription vmstate_sifive_pwm = { } }; -static Property sifive_pwm_properties[] = { +static const Property sifive_pwm_properties[] = { /* 0.5Ghz per spec after FSBL */ DEFINE_PROP_UINT64("clock-frequency", struct SiFivePwmState, freq_hz, 500000000ULL), diff --git a/hw/timer/slavio_timer.c b/hw/timer/slavio_timer.c index 12cb3bac97..32991f4436 100644 --- a/hw/timer/slavio_timer.c +++ b/hw/timer/slavio_timer.c @@ -420,7 +420,7 @@ static void slavio_timer_init(Object *obj) } } -static Property slavio_timer_properties[] = { +static const Property slavio_timer_properties[] = { DEFINE_PROP_UINT32("num_cpus", SLAVIO_TIMERState, num_cpus, 0), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/timer/sse-timer.c b/hw/timer/sse-timer.c index 115b0138c8..6b7a67941c 100644 --- a/hw/timer/sse-timer.c +++ b/hw/timer/sse-timer.c @@ -440,7 +440,7 @@ static const VMStateDescription sse_timer_vmstate = { } }; -static Property sse_timer_properties[] = { +static const Property sse_timer_properties[] = { DEFINE_PROP_LINK("counter", SSETimer, counter, TYPE_SSE_COUNTER, SSECounter *), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/timer/stm32f2xx_timer.c b/hw/timer/stm32f2xx_timer.c index 16b47887a5..d9d745cd76 100644 --- a/hw/timer/stm32f2xx_timer.c +++ b/hw/timer/stm32f2xx_timer.c @@ -298,7 +298,7 @@ static const VMStateDescription vmstate_stm32f2xx_timer = { } }; -static Property stm32f2xx_timer_properties[] = { +static const Property stm32f2xx_timer_properties[] = { DEFINE_PROP_UINT64("clock-frequency", struct STM32F2XXTimerState, freq_hz, 1000000000), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/timer/xilinx_timer.c b/hw/timer/xilinx_timer.c index 32a9df69e0..7fe3e83baa 100644 --- a/hw/timer/xilinx_timer.c +++ b/hw/timer/xilinx_timer.c @@ -242,7 +242,7 @@ static void xilinx_timer_init(Object *obj) sysbus_init_irq(SYS_BUS_DEVICE(obj), &t->irq); } -static Property xilinx_timer_properties[] = { +static const Property xilinx_timer_properties[] = { DEFINE_PROP_UINT32("clock-frequency", XpsTimerState, freq_hz, 62 * 1000000), DEFINE_PROP_UINT8("one-timer-only", XpsTimerState, one_timer_only, 0), DEFINE_PROP_END_OF_LIST(),
Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- hw/timer/a9gtimer.c | 2 +- hw/timer/allwinner-a10-pit.c | 2 +- hw/timer/arm_mptimer.c | 2 +- hw/timer/arm_timer.c | 2 +- hw/timer/aspeed_timer.c | 2 +- hw/timer/avr_timer16.c | 2 +- hw/timer/grlib_gptimer.c | 2 +- hw/timer/hpet.c | 2 +- hw/timer/i8254_common.c | 2 +- hw/timer/ibex_timer.c | 2 +- hw/timer/mss-timer.c | 2 +- hw/timer/nrf51_timer.c | 2 +- hw/timer/pxa2xx_timer.c | 2 +- hw/timer/renesas_cmt.c | 2 +- hw/timer/renesas_tmr.c | 2 +- hw/timer/sifive_pwm.c | 2 +- hw/timer/slavio_timer.c | 2 +- hw/timer/sse-timer.c | 2 +- hw/timer/stm32f2xx_timer.c | 2 +- hw/timer/xilinx_timer.c | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-)