From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60500) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtdY8-00026g-V2 for qemu-devel@nongnu.org; Tue, 03 Nov 2015 10:31:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtdY7-0007cc-85 for qemu-devel@nongnu.org; Tue, 03 Nov 2015 10:31:04 -0500 References: <1445608598-24485-1-git-send-email-mark.cave-ayland@ilande.co.uk> <1445608598-24485-4-git-send-email-mark.cave-ayland@ilande.co.uk> From: Thomas Huth Message-ID: <5638D331.30404@redhat.com> Date: Tue, 3 Nov 2015 16:30:57 +0100 MIME-Version: 1.0 In-Reply-To: <1445608598-24485-4-git-send-email-mark.cave-ayland@ilande.co.uk> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 03/13] PPC: mac99: Always add USB controller List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Mark Cave-Ayland , qemu-devel@nongnu.org, qemu-ppc@nongnu.org, agraf@suse.de, david@gibson.dropbear.id.au, cormac@c-obrien.org On 23/10/15 15:56, Mark Cave-Ayland wrote: > 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 > Signed-off-by: Mark Cave-Ayland > --- > 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 66d016c..1b9a573 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(); > According to https://en.wikipedia.org/wiki/New_World_ROM : "The simplest way to distinguish a New World ROM Mac is that it will have a factory built-in USB port." ... so it seems to me that this is right. Reviewed-by: Thomas Huth