| Message ID | 20241213190750.2513964-64-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/ssi/aspeed_smc.c | 4 ++-- > hw/ssi/ibex_spi_host.c | 2 +- > hw/ssi/npcm7xx_fiu.c | 2 +- > hw/ssi/pnv_spi.c | 2 +- > hw/ssi/sifive_spi.c | 2 +- > hw/ssi/ssi.c | 2 +- > hw/ssi/xilinx_spi.c | 2 +- > hw/ssi/xilinx_spips.c | 4 ++-- > hw/ssi/xlnx-versal-ospi.c | 2 +- > 9 files changed, 11 insertions(+), 11 deletions(-) For the aspeed part, Reviewed-by: Cédric Le Goater <clg@redhat.com> Thanks, C. > > diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c > index 033cbbb59b..bbdd4e4786 100644 > --- a/hw/ssi/aspeed_smc.c > +++ b/hw/ssi/aspeed_smc.c > @@ -1287,7 +1287,7 @@ static const VMStateDescription vmstate_aspeed_smc = { > } > }; > > -static Property aspeed_smc_properties[] = { > +static const Property aspeed_smc_properties[] = { > DEFINE_PROP_BOOL("inject-failure", AspeedSMCState, inject_failure, false), > DEFINE_PROP_UINT64("dram-base", AspeedSMCState, dram_base, 0), > DEFINE_PROP_LINK("dram", AspeedSMCState, dram_mr, > @@ -1336,7 +1336,7 @@ static void aspeed_smc_flash_realize(DeviceState *dev, Error **errp) > sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->mmio); > } > > -static Property aspeed_smc_flash_properties[] = { > +static const Property aspeed_smc_flash_properties[] = { > DEFINE_PROP_UINT8("cs", AspeedSMCFlash, cs, 0), > DEFINE_PROP_LINK("controller", AspeedSMCFlash, controller, TYPE_ASPEED_SMC, > AspeedSMCState *), > diff --git a/hw/ssi/ibex_spi_host.c b/hw/ssi/ibex_spi_host.c > index 9e07432f7c..60a0b17b62 100644 > --- a/hw/ssi/ibex_spi_host.c > +++ b/hw/ssi/ibex_spi_host.c > @@ -561,7 +561,7 @@ static const MemoryRegionOps ibex_spi_ops = { > .endianness = DEVICE_LITTLE_ENDIAN, > }; > > -static Property ibex_spi_properties[] = { > +static const Property ibex_spi_properties[] = { > DEFINE_PROP_UINT32("num_cs", IbexSPIHostState, num_cs, 1), > DEFINE_PROP_END_OF_LIST(), > }; > diff --git a/hw/ssi/npcm7xx_fiu.c b/hw/ssi/npcm7xx_fiu.c > index 119c38c415..fdd3ad2fdc 100644 > --- a/hw/ssi/npcm7xx_fiu.c > +++ b/hw/ssi/npcm7xx_fiu.c > @@ -541,7 +541,7 @@ static const VMStateDescription vmstate_npcm7xx_fiu = { > }, > }; > > -static Property npcm7xx_fiu_properties[] = { > +static const Property npcm7xx_fiu_properties[] = { > DEFINE_PROP_INT32("cs-count", NPCM7xxFIUState, cs_count, 0), > DEFINE_PROP_END_OF_LIST(), > }; > diff --git a/hw/ssi/pnv_spi.c b/hw/ssi/pnv_spi.c > index c21b2ebb3c..4ca9c469a4 100644 > --- a/hw/ssi/pnv_spi.c > +++ b/hw/ssi/pnv_spi.c > @@ -1195,7 +1195,7 @@ static const MemoryRegionOps pnv_spi_xscom_ops = { > .endianness = DEVICE_BIG_ENDIAN, > }; > > -static Property pnv_spi_properties[] = { > +static const Property pnv_spi_properties[] = { > DEFINE_PROP_UINT32("spic_num", PnvSpi, spic_num, 0), > DEFINE_PROP_UINT8("transfer_len", PnvSpi, transfer_len, 4), > DEFINE_PROP_END_OF_LIST(), > diff --git a/hw/ssi/sifive_spi.c b/hw/ssi/sifive_spi.c > index 08a107792b..7458747779 100644 > --- a/hw/ssi/sifive_spi.c > +++ b/hw/ssi/sifive_spi.c > @@ -328,7 +328,7 @@ static void sifive_spi_realize(DeviceState *dev, Error **errp) > fifo8_create(&s->rx_fifo, FIFO_CAPACITY); > } > > -static Property sifive_spi_properties[] = { > +static const Property sifive_spi_properties[] = { > DEFINE_PROP_UINT32("num-cs", SiFiveSPIState, num_cs, 1), > DEFINE_PROP_END_OF_LIST(), > }; > diff --git a/hw/ssi/ssi.c b/hw/ssi/ssi.c > index 3f357e8f16..cab0014c3f 100644 > --- a/hw/ssi/ssi.c > +++ b/hw/ssi/ssi.c > @@ -108,7 +108,7 @@ static void ssi_peripheral_realize(DeviceState *dev, Error **errp) > ssc->realize(s, errp); > } > > -static Property ssi_peripheral_properties[] = { > +static const Property ssi_peripheral_properties[] = { > DEFINE_PROP_UINT8("cs", SSIPeripheral, cs_index, 0), > DEFINE_PROP_END_OF_LIST(), > }; > diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c > index 7f1e1808c5..588c1ec071 100644 > --- a/hw/ssi/xilinx_spi.c > +++ b/hw/ssi/xilinx_spi.c > @@ -361,7 +361,7 @@ static const VMStateDescription vmstate_xilinx_spi = { > } > }; > > -static Property xilinx_spi_properties[] = { > +static const Property xilinx_spi_properties[] = { > DEFINE_PROP_UINT8("num-ss-bits", XilinxSPI, num_cs, 1), > DEFINE_PROP_END_OF_LIST(), > }; > diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c > index aeb462c3ce..f72cb3cbc8 100644 > --- a/hw/ssi/xilinx_spips.c > +++ b/hw/ssi/xilinx_spips.c > @@ -1420,12 +1420,12 @@ static const VMStateDescription vmstate_xlnx_zynqmp_qspips = { > } > }; > > -static Property xilinx_zynqmp_qspips_properties[] = { > +static const Property xilinx_zynqmp_qspips_properties[] = { > DEFINE_PROP_UINT32("dma-burst-size", XlnxZynqMPQSPIPS, dma_burst_size, 64), > DEFINE_PROP_END_OF_LIST(), > }; > > -static Property xilinx_spips_properties[] = { > +static const Property xilinx_spips_properties[] = { > DEFINE_PROP_UINT8("num-busses", XilinxSPIPS, num_busses, 1), > DEFINE_PROP_UINT8("num-ss-bits", XilinxSPIPS, num_cs, 4), > DEFINE_PROP_UINT8("num-txrx-bytes", XilinxSPIPS, num_txrx_bytes, 1), > diff --git a/hw/ssi/xlnx-versal-ospi.c b/hw/ssi/xlnx-versal-ospi.c > index ecc1903b8e..e51abe9de2 100644 > --- a/hw/ssi/xlnx-versal-ospi.c > +++ b/hw/ssi/xlnx-versal-ospi.c > @@ -1825,7 +1825,7 @@ static const VMStateDescription vmstate_xlnx_versal_ospi = { > } > }; > > -static Property xlnx_versal_ospi_properties[] = { > +static const Property xlnx_versal_ospi_properties[] = { > DEFINE_PROP_BOOL("dac-with-indac", XlnxVersalOspi, dac_with_indac, false), > DEFINE_PROP_BOOL("indac-write-disabled", XlnxVersalOspi, > ind_write_disabled, false),
diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index 033cbbb59b..bbdd4e4786 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -1287,7 +1287,7 @@ static const VMStateDescription vmstate_aspeed_smc = { } }; -static Property aspeed_smc_properties[] = { +static const Property aspeed_smc_properties[] = { DEFINE_PROP_BOOL("inject-failure", AspeedSMCState, inject_failure, false), DEFINE_PROP_UINT64("dram-base", AspeedSMCState, dram_base, 0), DEFINE_PROP_LINK("dram", AspeedSMCState, dram_mr, @@ -1336,7 +1336,7 @@ static void aspeed_smc_flash_realize(DeviceState *dev, Error **errp) sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->mmio); } -static Property aspeed_smc_flash_properties[] = { +static const Property aspeed_smc_flash_properties[] = { DEFINE_PROP_UINT8("cs", AspeedSMCFlash, cs, 0), DEFINE_PROP_LINK("controller", AspeedSMCFlash, controller, TYPE_ASPEED_SMC, AspeedSMCState *), diff --git a/hw/ssi/ibex_spi_host.c b/hw/ssi/ibex_spi_host.c index 9e07432f7c..60a0b17b62 100644 --- a/hw/ssi/ibex_spi_host.c +++ b/hw/ssi/ibex_spi_host.c @@ -561,7 +561,7 @@ static const MemoryRegionOps ibex_spi_ops = { .endianness = DEVICE_LITTLE_ENDIAN, }; -static Property ibex_spi_properties[] = { +static const Property ibex_spi_properties[] = { DEFINE_PROP_UINT32("num_cs", IbexSPIHostState, num_cs, 1), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/ssi/npcm7xx_fiu.c b/hw/ssi/npcm7xx_fiu.c index 119c38c415..fdd3ad2fdc 100644 --- a/hw/ssi/npcm7xx_fiu.c +++ b/hw/ssi/npcm7xx_fiu.c @@ -541,7 +541,7 @@ static const VMStateDescription vmstate_npcm7xx_fiu = { }, }; -static Property npcm7xx_fiu_properties[] = { +static const Property npcm7xx_fiu_properties[] = { DEFINE_PROP_INT32("cs-count", NPCM7xxFIUState, cs_count, 0), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/ssi/pnv_spi.c b/hw/ssi/pnv_spi.c index c21b2ebb3c..4ca9c469a4 100644 --- a/hw/ssi/pnv_spi.c +++ b/hw/ssi/pnv_spi.c @@ -1195,7 +1195,7 @@ static const MemoryRegionOps pnv_spi_xscom_ops = { .endianness = DEVICE_BIG_ENDIAN, }; -static Property pnv_spi_properties[] = { +static const Property pnv_spi_properties[] = { DEFINE_PROP_UINT32("spic_num", PnvSpi, spic_num, 0), DEFINE_PROP_UINT8("transfer_len", PnvSpi, transfer_len, 4), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/ssi/sifive_spi.c b/hw/ssi/sifive_spi.c index 08a107792b..7458747779 100644 --- a/hw/ssi/sifive_spi.c +++ b/hw/ssi/sifive_spi.c @@ -328,7 +328,7 @@ static void sifive_spi_realize(DeviceState *dev, Error **errp) fifo8_create(&s->rx_fifo, FIFO_CAPACITY); } -static Property sifive_spi_properties[] = { +static const Property sifive_spi_properties[] = { DEFINE_PROP_UINT32("num-cs", SiFiveSPIState, num_cs, 1), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/ssi/ssi.c b/hw/ssi/ssi.c index 3f357e8f16..cab0014c3f 100644 --- a/hw/ssi/ssi.c +++ b/hw/ssi/ssi.c @@ -108,7 +108,7 @@ static void ssi_peripheral_realize(DeviceState *dev, Error **errp) ssc->realize(s, errp); } -static Property ssi_peripheral_properties[] = { +static const Property ssi_peripheral_properties[] = { DEFINE_PROP_UINT8("cs", SSIPeripheral, cs_index, 0), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/ssi/xilinx_spi.c b/hw/ssi/xilinx_spi.c index 7f1e1808c5..588c1ec071 100644 --- a/hw/ssi/xilinx_spi.c +++ b/hw/ssi/xilinx_spi.c @@ -361,7 +361,7 @@ static const VMStateDescription vmstate_xilinx_spi = { } }; -static Property xilinx_spi_properties[] = { +static const Property xilinx_spi_properties[] = { DEFINE_PROP_UINT8("num-ss-bits", XilinxSPI, num_cs, 1), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c index aeb462c3ce..f72cb3cbc8 100644 --- a/hw/ssi/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c @@ -1420,12 +1420,12 @@ static const VMStateDescription vmstate_xlnx_zynqmp_qspips = { } }; -static Property xilinx_zynqmp_qspips_properties[] = { +static const Property xilinx_zynqmp_qspips_properties[] = { DEFINE_PROP_UINT32("dma-burst-size", XlnxZynqMPQSPIPS, dma_burst_size, 64), DEFINE_PROP_END_OF_LIST(), }; -static Property xilinx_spips_properties[] = { +static const Property xilinx_spips_properties[] = { DEFINE_PROP_UINT8("num-busses", XilinxSPIPS, num_busses, 1), DEFINE_PROP_UINT8("num-ss-bits", XilinxSPIPS, num_cs, 4), DEFINE_PROP_UINT8("num-txrx-bytes", XilinxSPIPS, num_txrx_bytes, 1), diff --git a/hw/ssi/xlnx-versal-ospi.c b/hw/ssi/xlnx-versal-ospi.c index ecc1903b8e..e51abe9de2 100644 --- a/hw/ssi/xlnx-versal-ospi.c +++ b/hw/ssi/xlnx-versal-ospi.c @@ -1825,7 +1825,7 @@ static const VMStateDescription vmstate_xlnx_versal_ospi = { } }; -static Property xlnx_versal_ospi_properties[] = { +static const Property xlnx_versal_ospi_properties[] = { DEFINE_PROP_BOOL("dac-with-indac", XlnxVersalOspi, dac_with_indac, false), DEFINE_PROP_BOOL("indac-write-disabled", XlnxVersalOspi, ind_write_disabled, false),
Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- hw/ssi/aspeed_smc.c | 4 ++-- hw/ssi/ibex_spi_host.c | 2 +- hw/ssi/npcm7xx_fiu.c | 2 +- hw/ssi/pnv_spi.c | 2 +- hw/ssi/sifive_spi.c | 2 +- hw/ssi/ssi.c | 2 +- hw/ssi/xilinx_spi.c | 2 +- hw/ssi/xilinx_spips.c | 4 ++-- hw/ssi/xlnx-versal-ospi.c | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-)