| Message ID | 1445608598-24485-4-git-send-email-mark.cave-ayland@ilande.co.uk |
|---|---|
| State | New |
| Headers | show |
On 23/10/15 15:56, Mark Cave-Ayland wrote: > From: Alexander Graf <agraf@suse.de> > > 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> > --- > 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 <thuth@redhat.com>
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 <agraf@suse.de> > > > > 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> > > --- > > 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 <thuth@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
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();