david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PPC: mac99: Always add USB controller

Browse Source 
The mac99 machines always have a USB controller. Usually not having one around
doesn't hurt quite as much, but Mac OS 9 really really wants one or it crashes
on bootup.

So always add OHCI to make it happy.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Alexander Graf 2015-11-11 22:49:41 +00:00 committed by David Gibson
parent 488661ee9d
commit 72f1f97d49
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/ppc/mac_newworld.c
View File

@ -371,12 +371,13 @@ static void ppc_core99_init(MachineState *machine)
/* 970 gets a U3 bus */ /* 970 gets a U3 bus */
pci_bus = pci_pmac_u3_init(pic, get_system_memory(), get_system_io()); pci_bus = pci_pmac_u3_init(pic, get_system_memory(), get_system_io());
machine_arch = ARCH_MAC99_U3; machine_arch = ARCH_MAC99_U3;
machine->usb |= defaults_enabled() && !machine->usb_disabled;
} else { } else {
pci_bus = pci_pmac_init(pic, get_system_memory(), get_system_io()); pci_bus = pci_pmac_init(pic, get_system_memory(), get_system_io());
machine_arch = ARCH_MAC99; machine_arch = ARCH_MAC99;
} }
machine->usb |= defaults_enabled() && !machine->usb_disabled;
/* Timebase Frequency */ /* Timebase Frequency */
if (kvm_enabled()) { if (kvm_enabled()) {
tbfreq = kvmppc_get_tbfreq(); tbfreq = kvmppc_get_tbfreq();