On 12/13/24 20:07, Richard Henderson wrote:
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> hw/sd/allwinner-sdhost.c | 2 +-
> hw/sd/aspeed_sdhci.c | 2 +-
> hw/sd/sd.c | 6 +++---
> hw/sd/sdhci-pci.c | 2 +-
> hw/sd/sdhci.c | 2 +-
> 5 files changed, 7 insertions(+), 7 deletions(-)
For the aspeed part,
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Thanks,
C.
>
> diff --git a/hw/sd/allwinner-sdhost.c b/hw/sd/allwinner-sdhost.c
> index bcfb4c1322..be39ec2e71 100644
> --- a/hw/sd/allwinner-sdhost.c
> +++ b/hw/sd/allwinner-sdhost.c
> @@ -808,7 +808,7 @@ static const VMStateDescription vmstate_allwinner_sdhost = {
> }
> };
>
> -static Property allwinner_sdhost_properties[] = {
> +static const Property allwinner_sdhost_properties[] = {
> DEFINE_PROP_LINK("dma-memory", AwSdHostState, dma_mr,
> TYPE_MEMORY_REGION, MemoryRegion *),
> DEFINE_PROP_END_OF_LIST(),
> diff --git a/hw/sd/aspeed_sdhci.c b/hw/sd/aspeed_sdhci.c
> index f82b05397e..99703f1842 100644
> --- a/hw/sd/aspeed_sdhci.c
> +++ b/hw/sd/aspeed_sdhci.c
> @@ -204,7 +204,7 @@ static const VMStateDescription vmstate_aspeed_sdhci = {
> },
> };
>
> -static Property aspeed_sdhci_properties[] = {
> +static const Property aspeed_sdhci_properties[] = {
> DEFINE_PROP_UINT8("num-slots", AspeedSDHCIState, num_slots, 0),
> DEFINE_PROP_END_OF_LIST(),
> };
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index f9bd03f3fd..b994ef581e 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -2798,18 +2798,18 @@ static void emmc_realize(DeviceState *dev, Error **errp)
> sd_realize(dev, errp);
> }
>
> -static Property sdmmc_common_properties[] = {
> +static const Property sdmmc_common_properties[] = {
> DEFINE_PROP_DRIVE("drive", SDState, blk),
> DEFINE_PROP_END_OF_LIST()
> };
>
> -static Property sd_properties[] = {
> +static const Property sd_properties[] = {
> DEFINE_PROP_UINT8("spec_version", SDState,
> spec_version, SD_PHY_SPECv3_01_VERS),
> DEFINE_PROP_END_OF_LIST()
> };
>
> -static Property emmc_properties[] = {
> +static const Property emmc_properties[] = {
> DEFINE_PROP_UINT64("boot-partition-size", SDState, boot_part_size, 0),
> DEFINE_PROP_UINT8("boot-config", SDState, boot_config, 0x0),
> DEFINE_PROP_END_OF_LIST()
> diff --git a/hw/sd/sdhci-pci.c b/hw/sd/sdhci-pci.c
> index 9b7bee8b3f..83892a7a15 100644
> --- a/hw/sd/sdhci-pci.c
> +++ b/hw/sd/sdhci-pci.c
> @@ -22,7 +22,7 @@
> #include "hw/sd/sdhci.h"
> #include "sdhci-internal.h"
>
> -static Property sdhci_pci_properties[] = {
> +static const Property sdhci_pci_properties[] = {
> DEFINE_SDHCI_COMMON_PROPERTIES(SDHCIState),
> DEFINE_PROP_END_OF_LIST(),
> };
> diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
> index 37875c02c3..e697ee05b3 100644
> --- a/hw/sd/sdhci.c
> +++ b/hw/sd/sdhci.c
> @@ -1544,7 +1544,7 @@ void sdhci_common_class_init(ObjectClass *klass, void *data)
>
> /* --- qdev SysBus --- */
>
> -static Property sdhci_sysbus_properties[] = {
> +static const Property sdhci_sysbus_properties[] = {
> DEFINE_SDHCI_COMMON_PROPERTIES(SDHCIState),
> DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_quirk,
> false),