motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-22 09:32:40 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/isa/vt82c686: Resolve unneeded attribute

Browse source 
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>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220901114127.53914-3-shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Bernhard Beschow 2022-09-01 13:41:16 +02:00 • committed by Philippe Mathieu-Daudé
parent 8e4022a8d6
commit 91ba92d1a3
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
hw/isa/vt82c686.c
View file

@ -543,7 +543,6 @@ struct ViaISAState {
PCIDevice dev; PCIDevice dev;
qemu_irq cpu_intr; qemu_irq cpu_intr;
qemu_irq *isa_irqs; qemu_irq *isa_irqs;
ISABus *isa_bus;
ViaSuperIOState via_sio; ViaSuperIOState via_sio;
}; };
@ -585,17 +584,18 @@ static void via_isa_realize(PCIDevice *d, Error **errp)
ViaISAState *s = VIA_ISA(d); ViaISAState *s = VIA_ISA(d);
DeviceState *dev = DEVICE(d); DeviceState *dev = DEVICE(d);
qemu_irq *isa_irq; qemu_irq *isa_irq;
ISABus *isa_bus;
int i; int i;
qdev_init_gpio_out(dev, &s->cpu_intr, 1); qdev_init_gpio_out(dev, &s->cpu_intr, 1);
isa_irq = qemu_allocate_irqs(via_isa_request_i8259_irq, s, 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); &error_fatal);
s->isa_irqs = i8259_init(s->isa_bus, *isa_irq); s->isa_irqs = i8259_init(isa_bus, *isa_irq);
isa_bus_irqs(s->isa_bus, s->isa_irqs); isa_bus_irqs(isa_bus, s->isa_irqs);
i8254_pit_init(s->isa_bus, 0x40, 0, NULL); i8254_pit_init(isa_bus, 0x40, 0, NULL);
i8257_dma_init(s->isa_bus, 0); i8257_dma_init(isa_bus, 0);
mc146818_rtc_init(s->isa_bus, 2000, NULL); mc146818_rtc_init(isa_bus, 2000, NULL);
for (i = 0; i < PCI_CONFIG_HEADER_SIZE; i++) { for (i = 0; i < PCI_CONFIG_HEADER_SIZE; i++) {
if (i < PCI_COMMAND || i >= PCI_REVISION_ID) { if (i < PCI_COMMAND || i >= PCI_REVISION_ID) {
@ -604,7 +604,7 @@ static void via_isa_realize(PCIDevice *d, Error **errp)
} }
/* Super I/O */ /* 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; return;
} }
} }