diff options
| author | Bernhard Beschow <shentey@gmail.com> | 2024-02-08 23:03:42 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2024-02-22 12:47:40 +0100 |
| commit | 16bd024bb4af50e1aa8864a53807c0cc63092977 (patch) | |
| tree | 25fb6a1d029fcdfc8ffb4c15ce933c953533363a /hw | |
| parent | fcc8299e29816c9b6f8d9766254fce6e8a50ee52 (diff) | |
| download | qemu-16bd024bb4af50e1aa8864a53807c0cc63092977.zip qemu-16bd024bb4af50e1aa8864a53807c0cc63092977.tar.gz qemu-16bd024bb4af50e1aa8864a53807c0cc63092977.tar.bz2 | |
hw/i386/pc_piix: Share pc_cmos_init() invocation between pc and isapc machines
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>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/pc_piix.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 999b7b8..9064511 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -341,11 +341,8 @@ static void pc_init1(MachineState *machine, 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 - else { + if (!pcmc->pci_enabled) { DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; int i; @@ -363,10 +360,11 @@ static void pc_init1(MachineState *machine, busname[4] = '0' + i; idebus[i] = qdev_get_child_bus(DEVICE(dev), busname); } - pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state); } #endif + pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state); + if (piix4_pm) { smi_irq = qemu_allocate_irq(pc_acpi_smi_interrupt, first_cpu, 0); |