OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/isa/piix: Harmonize names of reset control memory regions 

There is no need for having different names here. Having the same name
further allows code to be shared between PIIX3 and PIIX4.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20231007123843.127151-23-shentey@gmail.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Bernhard Beschow 2023-10-07 14:38:30 +02:00 committed by Michael S. Tsirkin
parent ac4330359b
commit f97479cad8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/isa/piix.c
View File

@ -339,7 +339,7 @@ static void pci_piix3_realize(PCIDevice *dev, Error **errp)
} }
memory_region_init_io(&d->rcr_mem, OBJECT(dev), &rcr_ops, d, memory_region_init_io(&d->rcr_mem, OBJECT(dev), &rcr_ops, d,
"piix3-reset-control", 1); "piix-reset-control", 1);
memory_region_add_subregion_overlap(pci_address_space_io(dev), memory_region_add_subregion_overlap(pci_address_space_io(dev),
PIIX_RCR_IOPORT, &d->rcr_mem, 1); PIIX_RCR_IOPORT, &d->rcr_mem, 1);
@ -532,7 +532,7 @@ static void piix4_realize(PCIDevice *dev, Error **errp)
"intr", 1); "intr", 1);
memory_region_init_io(&s->rcr_mem, OBJECT(dev), &rcr_ops, s, memory_region_init_io(&s->rcr_mem, OBJECT(dev), &rcr_ops, s,
"reset-control", 1); "piix-reset-control", 1);
memory_region_add_subregion_overlap(pci_address_space_io(dev), memory_region_add_subregion_overlap(pci_address_space_io(dev),
PIIX_RCR_IOPORT, &s->rcr_mem, 1); PIIX_RCR_IOPORT, &s->rcr_mem, 1);