[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 35/42] hw/isa/piix: Harmonize names of reset control memory regio
From: |
Bernhard Beschow |
Subject: |
[PATCH 35/42] hw/isa/piix: Harmonize names of reset control memory regions |
Date: |
Thu, 1 Sep 2022 18:26:06 +0200 |
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>
---
hw/isa/piix.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/isa/piix.c b/hw/isa/piix.c
index 5d3715b64e..ba7b5d953f 100644
--- a/hw/isa/piix.c
+++ b/hw/isa/piix.c
@@ -387,7 +387,7 @@ static void pci_piix3_realize(PCIDevice *dev, Error **errp)
isa_bus_irqs(isa_bus, d->pic.in_irqs);
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),
PIIX_RCR_IOPORT, &d->rcr_mem, 1);
@@ -578,7 +578,7 @@ static void piix4_realize(PCIDevice *dev, Error **errp)
}
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),
PIIX_RCR_IOPORT, &s->rcr_mem, 1);
--
2.37.3
- [PATCH 21/42] hw/isa/piix3: Rename typedef PIIX3State to PIIXState, (continued)
- [PATCH 21/42] hw/isa/piix3: Rename typedef PIIX3State to PIIXState, Bernhard Beschow, 2022/09/01
- [PATCH 41/42] hw/isa/piix: Drop the "3" from the PIIX base class, Bernhard Beschow, 2022/09/01
- [PATCH 30/42] hw/isa/piix4: Reuse struct PIIXState from PIIX3, Bernhard Beschow, 2022/09/01
- [PATCH 27/42] hw/isa/piix4: Allow board to provide PCI interrupt routes, Bernhard Beschow, 2022/09/01
- [PATCH 26/42] hw/isa/piix4: Make PIIX4's ACPI and USB functions optional, Bernhard Beschow, 2022/09/01
- [PATCH 25/42] hw/isa/piix4: Move pci_ide_create_devs() call to board code, Bernhard Beschow, 2022/09/01
- [PATCH 35/42] hw/isa/piix: Harmonize names of reset control memory regions,
Bernhard Beschow <=
- [PATCH 33/42] hw/isa/piix4: Prefix pci_slot_get_pirq() with "piix4_", Bernhard Beschow, 2022/09/01
- [PATCH 40/42] hw/isa/piix: Share PIIX3 base class with PIIX4, Bernhard Beschow, 2022/09/01
- [PATCH 37/42] hw/isa/piix: Rename functions to be shared for interrupt triggering, Bernhard Beschow, 2022/09/01
- [PATCH 38/42] hw/isa/piix: Consolidate IRQ triggering, Bernhard Beschow, 2022/09/01
- [PATCH 29/42] hw/isa/piix4: Use ISA PIC device, Bernhard Beschow, 2022/09/01
- [PATCH 36/42] hw/isa/piix: Reuse PIIX3 base class' realize method in PIIX4, Bernhard Beschow, 2022/09/01
- [PATCH 39/42] hw/isa/piix: Unexport PIIXState, Bernhard Beschow, 2022/09/01
- [PATCH 34/42] hw/isa/piix3: Merge hw/isa/piix4.c, Bernhard Beschow, 2022/09/01