From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57211) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtozH-0004N4-GB for qemu-devel@nongnu.org; Tue, 03 Nov 2015 22:43:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtozD-0002OP-Lt for qemu-devel@nongnu.org; Tue, 03 Nov 2015 22:43:51 -0500 Date: Wed, 4 Nov 2015 14:07:43 +1100 From: David Gibson Message-ID: <20151104030743.GD21954@voom.redhat.com> 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> <5638D331.30404@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="NklN7DEeGtkPCoo3" Content-Disposition: inline In-Reply-To: <5638D331.30404@redhat.com> 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: Thomas Huth Cc: qemu-ppc@nongnu.org, cormac@c-obrien.org, Mark Cave-Ayland , qemu-devel@nongnu.org, agraf@suse.de --NklN7DEeGtkPCoo3 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Nov 03, 2015 at 04:30:57PM +0100, Thomas Huth wrote: > On 23/10/15 15:56, Mark Cave-Ayland wrote: > > From: Alexander Graf > >=20 > > 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. > >=20 > > So always add OHCI to make it happy. > >=20 > > Signed-off-by: Alexander Graf > > Signed-off-by: Mark Cave-Ayland > > --- > > hw/ppc/mac_newworld.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > >=20 > > 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 =3D pci_pmac_u3_init(pic, get_system_memory(), get_sys= tem_io()); > > machine_arch =3D ARCH_MAC99_U3; > > - machine->usb |=3D defaults_enabled() && !machine->usb_disabled; > > } else { > > pci_bus =3D pci_pmac_init(pic, get_system_memory(), get_system= _io()); > > machine_arch =3D ARCH_MAC99; > > } > > =20 > > + machine->usb |=3D defaults_enabled() && !machine->usb_disabled; > > + > > /* Timebase Frequency */ > > if (kvm_enabled()) { > > tbfreq =3D kvmppc_get_tbfreq(); > >=20 >=20 > According to https://en.wikipedia.org/wiki/New_World_ROM : >=20 > "The simplest way to distinguish a New World ROM Mac is that it will > have a factory built-in USB port." >=20 > ... so it seems to me that this is right. >=20 > Reviewed-by: Thomas Huth Reviewed-by: David Gibson --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --NklN7DEeGtkPCoo3 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWOXZ/AAoJEGw4ysog2bOSz/8P/2QYPiQqBW/a0uaHaz0glZwc JzT56feGtorQATWfg931oDp0KH4czOiauN3KG24x9zJFggPkiH1LfQWnSax03uMP BZf6AerskXjxuq1DQ+l2bLJ4bB3plMUayKbqISE0oi53p6rfc30drdM5GWrbCLv+ OqxXJdOvnp6Kx1Z05JZoCl//CavSjy+D5jwjvkYEHoKacsO0TnBfMIJxUfjEhlc3 FMRhIYtn0Q1z3x6CfwdndzUFKQZexXQ85Tyijpn/c935nfmQqaazQXIvr5+uU6pu VAGq7JzVeWgz222G6hwB7BegnHTrWt+rrAz+PYjwbW6nkj4Ygcd3Vy+G6Ve4/eNQ fGWMzF0q1nPg2p3vrqmstaXE0CdeWB2u5oeEnSiHUqeYShawKgguvT5qZhCFu9Qi jzG7JIz0aqHFr4lP408id5Z302hfbjKahBQfEmeUQ/7sKXY8UU4KidGeym7QnIGS 1Am0RoyZUwc7fbWgPJAlXFB7KUpSslO1+LUSdY3edaHy4ByIVKU74kWiLfvpIJVk INNY5/5ovUKLS6ebibSPj073HUGasjIpoCxbeS6EmC8F6sAD09GnF9EKh6Y8ppJO fMQpdDkREgn6qwJLLUJdxfsYI/d+70njWR727/Rx9UiUCc4PC4a44iwxBEXjOe6P 2shLt6vTyzYNPFiWkPJg =alhw -----END PGP SIGNATURE----- --NklN7DEeGtkPCoo3--