[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 02/12] hw/isa/vt82c686: Resolve unneeded attribute
From: |
Bernhard Beschow |
Subject: |
[PATCH v4 02/12] hw/isa/vt82c686: Resolve unneeded attribute |
Date: |
Wed, 31 Aug 2022 17:45:55 +0200 |
Now that also the super io device is realized in the common realize method,
the isa_bus attribute can be turned into a temporary.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
hw/isa/vt82c686.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 0217c98fe4..9d12e1cae4 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -543,7 +543,6 @@ struct ViaISAState {
PCIDevice dev;
qemu_irq cpu_intr;
qemu_irq *isa_irqs;
- ISABus *isa_bus;
ViaSuperIOState via_sio;
};
@@ -585,17 +584,18 @@ static void via_isa_realize(PCIDevice *d, Error **errp)
ViaISAState *s = VIA_ISA(d);
DeviceState *dev = DEVICE(d);
qemu_irq *isa_irq;
+ ISABus *isa_bus;
int i;
qdev_init_gpio_out(dev, &s->cpu_intr, 1);
isa_irq = qemu_allocate_irqs(via_isa_request_i8259_irq, s, 1);
- s->isa_bus = isa_bus_new(dev, get_system_memory(), pci_address_space_io(d),
+ isa_bus = isa_bus_new(dev, get_system_memory(), pci_address_space_io(d),
&error_fatal);
- s->isa_irqs = i8259_init(s->isa_bus, *isa_irq);
- isa_bus_irqs(s->isa_bus, s->isa_irqs);
- i8254_pit_init(s->isa_bus, 0x40, 0, NULL);
- i8257_dma_init(s->isa_bus, 0);
- mc146818_rtc_init(s->isa_bus, 2000, NULL);
+ s->isa_irqs = i8259_init(isa_bus, *isa_irq);
+ isa_bus_irqs(isa_bus, s->isa_irqs);
+ i8254_pit_init(isa_bus, 0x40, 0, NULL);
+ i8257_dma_init(isa_bus, 0);
+ mc146818_rtc_init(isa_bus, 2000, NULL);
for (i = 0; i < PCI_CONFIG_HEADER_SIZE; i++) {
if (i < PCI_COMMAND || i >= PCI_REVISION_ID) {
@@ -604,7 +604,7 @@ static void via_isa_realize(PCIDevice *d, Error **errp)
}
/* Super I/O */
- if (!qdev_realize(DEVICE(&s->via_sio), BUS(s->isa_bus), errp)) {
+ if (!qdev_realize(DEVICE(&s->via_sio), BUS(isa_bus), errp)) {
return;
}
}
--
2.37.3
- [PATCH v4 00/12] Instantiate VT82xx functions in host device, Bernhard Beschow, 2022/08/31
- [PATCH v4 02/12] hw/isa/vt82c686: Resolve unneeded attribute,
Bernhard Beschow <=
- [PATCH v4 01/12] hw/isa/vt82c686: Resolve chip-specific realize methods, Bernhard Beschow, 2022/08/31
- [PATCH v4 03/12] hw/isa/vt82c686: Prefer pci_address_space() over get_system_memory(), Bernhard Beschow, 2022/08/31
- [PATCH v4 08/12] hw/isa/vt82c686: Instantiate USB functions in host device, Bernhard Beschow, 2022/08/31
- [PATCH v4 04/12] hw/isa/vt82c686: Reuse errp, Bernhard Beschow, 2022/08/31
- [PATCH v4 05/12] hw/isa/vt82c686: Introduce TYPE_VIA_IDE define, Bernhard Beschow, 2022/08/31
- [PATCH v4 07/12] hw/isa/vt82c686: Introduce TYPE_VT82C686B_USB_UHCI define, Bernhard Beschow, 2022/08/31
- [PATCH v4 06/12] hw/isa/vt82c686: Instantiate IDE function in host device, Bernhard Beschow, 2022/08/31
- [PATCH v4 09/12] hw/isa/vt82c686: Instantiate PM function in host device, Bernhard Beschow, 2022/08/31
- [PATCH v4 10/12] hw/isa/vt82c686: Instantiate AC97 and MC97 functions in host device, Bernhard Beschow, 2022/08/31
- [PATCH v4 11/12] hw/isa/vt82c686: Embed RTCState in host device, Bernhard Beschow, 2022/08/31