motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-10 19:14:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/i386/pc_piix: Share pc_cmos_init() invocation between pc and isapc machines

Browse source 
Both invocations are the same and either one is always executed. Avoid this
redundancy.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240208220349.4948-3-shentey@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Bernhard Beschow 2024-02-08 23:03:42 +01:00 • committed by Philippe Mathieu-Daudé
parent fcc8299e29
commit 16bd024bb4
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hw/i386/pc_piix.c
View file

@ -341,11 +341,8 @@ static void pc_init1(MachineState *machine,
pc_nic_init(pcmc, isa_bus, pci_bus); pc_nic_init(pcmc, isa_bus, pci_bus);
if (pcmc->pci_enabled) {
pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);
}
#ifdef CONFIG_IDE_ISA #ifdef CONFIG_IDE_ISA
else { if (!pcmc->pci_enabled) {
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
int i; int i;
@ -363,10 +360,11 @@ static void pc_init1(MachineState *machine,
busname[4] = '0' + i; busname[4] = '0' + i;
idebus[i] = qdev_get_child_bus(DEVICE(dev), busname); idebus[i] = qdev_get_child_bus(DEVICE(dev), busname);
} }
pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);
} }
#endif #endif
pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);
if (piix4_pm) { if (piix4_pm) {
smi_irq = qemu_allocate_irq(pc_acpi_smi_interrupt, first_cpu, 0); smi_irq = qemu_allocate_irq(pc_acpi_smi_interrupt, first_cpu, 0);