[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 44/78] hw/isa/piix3: Rename "pic" attribute to "isa_irqs_in"
From: |
Michael S. Tsirkin |
Subject: |
[PULL v2 44/78] hw/isa/piix3: Rename "pic" attribute to "isa_irqs_in" |
Date: |
Thu, 19 Oct 2023 14:23:08 -0400 |
From: Bernhard Beschow <shentey@gmail.com>
TYPE_PIIX3_DEVICE doesn't instantiate a PIC since it relies on the board to do
so. The "pic" attribute, however, suggests that there is one. Rename the
attribute to reflect that it represents ISA interrupt lines. Use the same naming
convention as in the VIA south bridges as well as in TYPE_I82378.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Message-Id: <20231007123843.127151-8-shentey@gmail.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/hw/southbridge/piix.h | 2 +-
hw/isa/piix3.c | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h
index bb898c6c88..b07ff6bb26 100644
--- a/include/hw/southbridge/piix.h
+++ b/include/hw/southbridge/piix.h
@@ -46,7 +46,7 @@ struct PIIXState {
#endif
uint64_t pic_levels;
- qemu_irq pic[ISA_NUM_IRQS];
+ qemu_irq isa_irqs_in[ISA_NUM_IRQS];
/* This member isn't used. Just for save/load compatibility */
int32_t pci_irq_levels_vmstate[PIIX_NUM_PIRQS];
diff --git a/hw/isa/piix3.c b/hw/isa/piix3.c
index c17547a2c0..616f5418fa 100644
--- a/hw/isa/piix3.c
+++ b/hw/isa/piix3.c
@@ -36,7 +36,7 @@
static void piix3_set_irq_pic(PIIX3State *piix3, int pic_irq)
{
- qemu_set_irq(piix3->pic[pic_irq],
+ qemu_set_irq(piix3->isa_irqs_in[pic_irq],
!!(piix3->pic_levels &
(((1ULL << PIIX_NUM_PIRQS) - 1) <<
(pic_irq * PIIX_NUM_PIRQS))));
@@ -312,7 +312,8 @@ static void pci_piix3_init(Object *obj)
{
PIIX3State *d = PIIX3_PCI_DEVICE(obj);
- qdev_init_gpio_out_named(DEVICE(obj), d->pic, "isa-irqs", ISA_NUM_IRQS);
+ qdev_init_gpio_out_named(DEVICE(obj), d->isa_irqs_in, "isa-irqs",
+ ISA_NUM_IRQS);
object_initialize_child(obj, "rtc", &d->rtc, TYPE_MC146818_RTC);
}
--
MST
- [PULL v2 24/78] vhost-user: strip superfluous whitespace, (continued)
- [PULL v2 24/78] vhost-user: strip superfluous whitespace, Michael S. Tsirkin, 2023/10/19
- [PULL v2 64/78] hw/isa/piix: Resolve duplicate code regarding PCI interrupt wiring, Michael S. Tsirkin, 2023/10/19
- [PULL v2 68/78] vhost: move and rename the conn retry times, Michael S. Tsirkin, 2023/10/19
- [PULL v2 55/78] hw/isa/piix4: Reuse struct PIIXState from PIIX3, Michael S. Tsirkin, 2023/10/19
- [PULL v2 66/78] hw/i386/pc_piix: Make PIIX4 south bridge usable in PC machine, Michael S. Tsirkin, 2023/10/19
- [PULL v2 67/78] vhost-user-common: send get_inflight_fd once, Michael S. Tsirkin, 2023/10/19
- [PULL v2 75/78] tests/acpi: Update DSDT.cxl with QTG DSM, Michael S. Tsirkin, 2023/10/19
- [PULL v2 60/78] hw/isa/piix: Share PIIX3's base class with PIIX4, Michael S. Tsirkin, 2023/10/19
- [PULL v2 76/78] vhost-user: Fix protocol feature bit conflict, Michael S. Tsirkin, 2023/10/19
- [PULL v2 74/78] hw/cxl: Add QTG _DSM support for ACPI0017 device, Michael S. Tsirkin, 2023/10/19
- [PULL v2 44/78] hw/isa/piix3: Rename "pic" attribute to "isa_irqs_in",
Michael S. Tsirkin <=
- [PULL v2 77/78] MAINTAINERS: Add include/hw/intc/i8259.h to the PC chip section, Michael S. Tsirkin, 2023/10/19
- Re: [PULL v2 00/78] virtio,pc,pci: features, cleanups, Stefan Hajnoczi, 2023/10/20