| Message ID | 1539260043-4264-1-git-send-email-liq3ea@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | i440fx: use ARRAY_SIZE for pam_regions | expand |
On 11/10/2018 14:14, Li Qiang wrote: > Cc: qemu-trivial@nongnu.org > > Signed-off-by: Li Qiang <liq3ea@gmail.com> Good cleanup! Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/pci-host/piix.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c > index 0e608347c1..230d5d2ea3 100644 > --- a/hw/pci-host/piix.c > +++ b/hw/pci-host/piix.c > @@ -142,7 +142,7 @@ static void i440fx_update_memory_mappings(PCII440FXState *d) > PCIDevice *pd = PCI_DEVICE(d); > > memory_region_transaction_begin(); > - for (i = 0; i < 13; i++) { > + for (i = 0; i < ARRAY_SIZE(d->pam_regions); i++) { > pam_update(&d->pam_regions[i], i, > pd->config[I440FX_PAM + (DIV_ROUND_UP(i, 2))]); > } > @@ -401,7 +401,7 @@ PCIBus *i440fx_init(const char *host_type, const char *pci_type, > > init_pam(dev, f->ram_memory, f->system_memory, f->pci_address_space, > &f->pam_regions[0], PAM_BIOS_BASE, PAM_BIOS_SIZE); > - for (i = 0; i < 12; ++i) { > + for (i = 0; i < ARRAY_SIZE(f->pam_regions) - 1; ++i) { > init_pam(dev, f->ram_memory, f->system_memory, f->pci_address_space, > &f->pam_regions[i+1], PAM_EXPAN_BASE + i * PAM_EXPAN_SIZE, > PAM_EXPAN_SIZE); >
diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 0e608347c1..230d5d2ea3 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -142,7 +142,7 @@ static void i440fx_update_memory_mappings(PCII440FXState *d) PCIDevice *pd = PCI_DEVICE(d); memory_region_transaction_begin(); - for (i = 0; i < 13; i++) { + for (i = 0; i < ARRAY_SIZE(d->pam_regions); i++) { pam_update(&d->pam_regions[i], i, pd->config[I440FX_PAM + (DIV_ROUND_UP(i, 2))]); } @@ -401,7 +401,7 @@ PCIBus *i440fx_init(const char *host_type, const char *pci_type, init_pam(dev, f->ram_memory, f->system_memory, f->pci_address_space, &f->pam_regions[0], PAM_BIOS_BASE, PAM_BIOS_SIZE); - for (i = 0; i < 12; ++i) { + for (i = 0; i < ARRAY_SIZE(f->pam_regions) - 1; ++i) { init_pam(dev, f->ram_memory, f->system_memory, f->pci_address_space, &f->pam_regions[i+1], PAM_EXPAN_BASE + i * PAM_EXPAN_SIZE, PAM_EXPAN_SIZE);
Cc: qemu-trivial@nongnu.org Signed-off-by: Li Qiang <liq3ea@gmail.com> --- hw/pci-host/piix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)