| Message ID | 20241213190750.2513964-35-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | whole-tree: Constify Property structures | expand |
Am 13. Dezember 2024 19:07:04 UTC schrieb Richard Henderson <richard.henderson@linaro.org>: >Signed-off-by: Richard Henderson <richard.henderson@linaro.org> >--- > hw/ide/ahci.c | 2 +- > hw/ide/cf.c | 2 +- > hw/ide/cmd646.c | 2 +- > hw/ide/ide-dev.c | 6 +++--- > hw/ide/isa.c | 2 +- > hw/ide/macio.c | 2 +- > hw/ide/mmio.c | 2 +- > 7 files changed, 9 insertions(+), 9 deletions(-) > >diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c >index 0eb24304ee..8ee015c1a4 100644 >--- a/hw/ide/ahci.c >+++ b/hw/ide/ahci.c >@@ -1867,7 +1867,7 @@ static void sysbus_ahci_realize(DeviceState *dev, Error **errp) > ahci_realize(&s->ahci, dev, &address_space_memory); > } > >-static Property sysbus_ahci_properties[] = { >+static const Property sysbus_ahci_properties[] = { > DEFINE_PROP_UINT32("num-ports", SysbusAHCIState, ahci.ports, 1), > DEFINE_PROP_END_OF_LIST(), > }; >diff --git a/hw/ide/cf.c b/hw/ide/cf.c >index 2a425cb0f2..190914f513 100644 >--- a/hw/ide/cf.c >+++ b/hw/ide/cf.c >@@ -24,7 +24,7 @@ static void ide_cf_realize(IDEDevice *dev, Error **errp) > ide_dev_initfn(dev, IDE_CFATA, errp); > } > >-static Property ide_cf_properties[] = { >+static const Property ide_cf_properties[] = { > DEFINE_IDE_DEV_PROPERTIES(), > DEFINE_BLOCK_CHS_PROPERTIES(IDEDrive, dev.conf), > DEFINE_PROP_BIOS_CHS_TRANS("bios-chs-trans", >diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c >index 6b02fc81ec..942f6c470c 100644 >--- a/hw/ide/cmd646.c >+++ b/hw/ide/cmd646.c >@@ -313,7 +313,7 @@ static void pci_cmd646_ide_exitfn(PCIDevice *dev) > } > } > >-static Property cmd646_ide_properties[] = { >+static const Property cmd646_ide_properties[] = { > DEFINE_PROP_UINT32("secondary", PCIIDEState, secondary, 0), > DEFINE_PROP_END_OF_LIST(), > }; >diff --git a/hw/ide/ide-dev.c b/hw/ide/ide-dev.c >index 03f7967798..cc92531f1c 100644 >--- a/hw/ide/ide-dev.c >+++ b/hw/ide/ide-dev.c >@@ -29,7 +29,7 @@ > #include "qapi/visitor.h" > #include "ide-internal.h" > >-static Property ide_props[] = { >+static const Property ide_props[] = { > DEFINE_PROP_UINT32("unit", IDEDevice, unit, -1), > DEFINE_PROP_BOOL("win2k-install-hack", IDEDevice, win2k_install_hack, false), > DEFINE_PROP_END_OF_LIST(), >@@ -191,7 +191,7 @@ static void ide_cd_realize(IDEDevice *dev, Error **errp) > ide_dev_initfn(dev, IDE_CD, errp); > } > >-static Property ide_hd_properties[] = { >+static const Property ide_hd_properties[] = { > DEFINE_IDE_DEV_PROPERTIES(), > DEFINE_BLOCK_CHS_PROPERTIES(IDEDrive, dev.conf), > DEFINE_PROP_BIOS_CHS_TRANS("bios-chs-trans", >@@ -218,7 +218,7 @@ static const TypeInfo ide_hd_info = { > .class_init = ide_hd_class_init, > }; > >-static Property ide_cd_properties[] = { >+static const Property ide_cd_properties[] = { > DEFINE_IDE_DEV_PROPERTIES(), > DEFINE_PROP_END_OF_LIST(), > }; >diff --git a/hw/ide/isa.c b/hw/ide/isa.c >index 211ebc9ba7..a0a7e4837c 100644 >--- a/hw/ide/isa.c >+++ b/hw/ide/isa.c >@@ -101,7 +101,7 @@ ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int irqnum, > return isadev; > } > >-static Property isa_ide_properties[] = { >+static const Property isa_ide_properties[] = { > DEFINE_PROP_UINT32("iobase", ISAIDEState, iobase, 0x1f0), > DEFINE_PROP_UINT32("iobase2", ISAIDEState, iobase2, 0x3f6), > DEFINE_PROP_UINT32("irq", ISAIDEState, irqnum, 14), >diff --git a/hw/ide/macio.c b/hw/ide/macio.c >index 99477a3d13..25f8403e80 100644 >--- a/hw/ide/macio.c >+++ b/hw/ide/macio.c >@@ -459,7 +459,7 @@ static void macio_ide_initfn(Object *obj) > qdev_prop_allow_set_link_before_realize, 0); > } > >-static Property macio_ide_properties[] = { >+static const Property macio_ide_properties[] = { > DEFINE_PROP_UINT32("channel", MACIOIDEState, channel, 0), > DEFINE_PROP_UINT32("addr", MACIOIDEState, addr, -1), > DEFINE_PROP_END_OF_LIST(), >diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c >index 53d22fb37f..43ab66f347 100644 >--- a/hw/ide/mmio.c >+++ b/hw/ide/mmio.c >@@ -141,7 +141,7 @@ static void mmio_ide_initfn(Object *obj) > sysbus_init_irq(d, &s->irq); > } > >-static Property mmio_ide_properties[] = { >+static const Property mmio_ide_properties[] = { > DEFINE_PROP_UINT32("shift", MMIOIDEState, shift, 0), > DEFINE_PROP_END_OF_LIST() > }; Reviewed-by: Bernhard Beschow <shentey@gmail.com>
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 0eb24304ee..8ee015c1a4 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1867,7 +1867,7 @@ static void sysbus_ahci_realize(DeviceState *dev, Error **errp) ahci_realize(&s->ahci, dev, &address_space_memory); } -static Property sysbus_ahci_properties[] = { +static const Property sysbus_ahci_properties[] = { DEFINE_PROP_UINT32("num-ports", SysbusAHCIState, ahci.ports, 1), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/ide/cf.c b/hw/ide/cf.c index 2a425cb0f2..190914f513 100644 --- a/hw/ide/cf.c +++ b/hw/ide/cf.c @@ -24,7 +24,7 @@ static void ide_cf_realize(IDEDevice *dev, Error **errp) ide_dev_initfn(dev, IDE_CFATA, errp); } -static Property ide_cf_properties[] = { +static const Property ide_cf_properties[] = { DEFINE_IDE_DEV_PROPERTIES(), DEFINE_BLOCK_CHS_PROPERTIES(IDEDrive, dev.conf), DEFINE_PROP_BIOS_CHS_TRANS("bios-chs-trans", diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 6b02fc81ec..942f6c470c 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -313,7 +313,7 @@ static void pci_cmd646_ide_exitfn(PCIDevice *dev) } } -static Property cmd646_ide_properties[] = { +static const Property cmd646_ide_properties[] = { DEFINE_PROP_UINT32("secondary", PCIIDEState, secondary, 0), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/ide/ide-dev.c b/hw/ide/ide-dev.c index 03f7967798..cc92531f1c 100644 --- a/hw/ide/ide-dev.c +++ b/hw/ide/ide-dev.c @@ -29,7 +29,7 @@ #include "qapi/visitor.h" #include "ide-internal.h" -static Property ide_props[] = { +static const Property ide_props[] = { DEFINE_PROP_UINT32("unit", IDEDevice, unit, -1), DEFINE_PROP_BOOL("win2k-install-hack", IDEDevice, win2k_install_hack, false), DEFINE_PROP_END_OF_LIST(), @@ -191,7 +191,7 @@ static void ide_cd_realize(IDEDevice *dev, Error **errp) ide_dev_initfn(dev, IDE_CD, errp); } -static Property ide_hd_properties[] = { +static const Property ide_hd_properties[] = { DEFINE_IDE_DEV_PROPERTIES(), DEFINE_BLOCK_CHS_PROPERTIES(IDEDrive, dev.conf), DEFINE_PROP_BIOS_CHS_TRANS("bios-chs-trans", @@ -218,7 +218,7 @@ static const TypeInfo ide_hd_info = { .class_init = ide_hd_class_init, }; -static Property ide_cd_properties[] = { +static const Property ide_cd_properties[] = { DEFINE_IDE_DEV_PROPERTIES(), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/ide/isa.c b/hw/ide/isa.c index 211ebc9ba7..a0a7e4837c 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -101,7 +101,7 @@ ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int irqnum, return isadev; } -static Property isa_ide_properties[] = { +static const Property isa_ide_properties[] = { DEFINE_PROP_UINT32("iobase", ISAIDEState, iobase, 0x1f0), DEFINE_PROP_UINT32("iobase2", ISAIDEState, iobase2, 0x3f6), DEFINE_PROP_UINT32("irq", ISAIDEState, irqnum, 14), diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 99477a3d13..25f8403e80 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -459,7 +459,7 @@ static void macio_ide_initfn(Object *obj) qdev_prop_allow_set_link_before_realize, 0); } -static Property macio_ide_properties[] = { +static const Property macio_ide_properties[] = { DEFINE_PROP_UINT32("channel", MACIOIDEState, channel, 0), DEFINE_PROP_UINT32("addr", MACIOIDEState, addr, -1), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c index 53d22fb37f..43ab66f347 100644 --- a/hw/ide/mmio.c +++ b/hw/ide/mmio.c @@ -141,7 +141,7 @@ static void mmio_ide_initfn(Object *obj) sysbus_init_irq(d, &s->irq); } -static Property mmio_ide_properties[] = { +static const Property mmio_ide_properties[] = { DEFINE_PROP_UINT32("shift", MMIOIDEState, shift, 0), DEFINE_PROP_END_OF_LIST() };
Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- hw/ide/ahci.c | 2 +- hw/ide/cf.c | 2 +- hw/ide/cmd646.c | 2 +- hw/ide/ide-dev.c | 6 +++--- hw/ide/isa.c | 2 +- hw/ide/macio.c | 2 +- hw/ide/mmio.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-)