From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50273) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZTAmo-000096-Gm for qemu-devel@nongnu.org; Sat, 22 Aug 2015 11:32:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZTAmn-0003Vx-JU for qemu-devel@nongnu.org; Sat, 22 Aug 2015 11:32:50 -0400 From: Cormac O'Brien Date: Sat, 22 Aug 2015 10:32:12 -0500 Message-Id: <1440257533-1504-4-git-send-email-cormac@c-obrien.org> In-Reply-To: <1440257533-1504-1-git-send-email-cormac@c-obrien.org> References: <1440257533-1504-1-git-send-email-cormac@c-obrien.org> Subject: [Qemu-devel] [PATCH 3/4] PPC: mac99: Always add USB controller List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: agraf@suse.de, mark.cave-ayland@ilande.co.uk, qemu-devel@nongnu.org, qemu-ppc@nongnu.org From: Alexander Graf 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 --- hw/ppc/mac_newworld.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 77d5c81..7f3b703 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -371,12 +371,13 @@ static void ppc_core99_init(MachineState *machine) /* 970 gets a U3 bus */ pci_bus = pci_pmac_u3_init(pic, get_system_memory(), get_system_io()); machine_arch = ARCH_MAC99_U3; - machine->usb |= defaults_enabled() && !machine->usb_disabled; } else { pci_bus = pci_pmac_init(pic, get_system_memory(), get_system_io()); machine_arch = ARCH_MAC99; } + machine->usb |= defaults_enabled() && !machine->usb_disabled; + /* Timebase Frequency */ if (kvm_enabled()) { tbfreq = kvmppc_get_tbfreq(); -- 2.5.0