yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-23 05:45:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

piix: Eliminate pc_init_pci()

Browse source 
Backports commit 211b5b1d0a31f2f7593d6858a0b10487fb7b7fac from qemu
This commit is contained in:
Eduardo Habkost 2018-03-11 13:37:55 -04:00 committed by Lioncash
parent 940d2371ea
commit 6a287ba88e
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
qemu/hw/i386/pc_piix.c
View file

@ -44,11 +44,6 @@ static int pc_init1(struct uc_struct *uc, MachineState *machine)
return pc_cpus_init(uc, machine->cpu_model); return pc_cpus_init(uc, machine->cpu_model);
} }
static int pc_init_pci(struct uc_struct *uc, MachineState *machine)
{
return pc_init1(uc, machine);
}
static void pc_compat_2_2(struct uc_struct *uc, MachineState *machine) static void pc_compat_2_2(struct uc_struct *uc, MachineState *machine)
{ {
} }
@ -56,7 +51,7 @@ static void pc_compat_2_2(struct uc_struct *uc, MachineState *machine)
static int pc_init_pci_2_2(struct uc_struct *uc, MachineState *machine) static int pc_init_pci_2_2(struct uc_struct *uc, MachineState *machine)
{ {
pc_compat_2_2(uc, machine); pc_compat_2_2(uc, machine);
return pc_init_pci(uc, machine); return pc_init1(uc, machine);
} }
DEFINE_PC_MACHINE(v2_2, "pc-i440fx-2.2", pc_init_pci_2_2); DEFINE_PC_MACHINE(v2_2, "pc-i440fx-2.2", pc_init_pci_2_2);