Skip to content

Commit

Permalink
hw/i386/pc_piix: Share pc_cmos_init() invocation between pc and isapc…
Browse files Browse the repository at this point in the history
… 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>
  • Loading branch information
shentok authored and philmd committed Feb 21, 2024
1 parent 64f8f3c commit 8ab9b33
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions hw/i386/pc_piix.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);

Expand Down

0 comments on commit 8ab9b33

Please sign in to comment.