diff options
| author | Marcel Apfelbaum <marcel@redhat.com> | 2015-01-06 15:29:17 +0200 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-01-08 17:32:27 +0000 |
| commit | 59a0419856c9ed24e9ecd033db092b2e8f81a728 (patch) | |
| tree | 9f475ed1d995001f5aa40711e178b44d32e72a9f | |
| parent | d941fba0b5fa75604503aac9b3bcc2aa38b03cd0 (diff) | |
| download | qemu-59a0419856c9ed24e9ecd033db092b2e8f81a728.tar.gz | |
hw/ppc/mac_newworld: simplify usb controller creation logic
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Alexander Graf <agraf@suse.de>
Message-id: 1420550957-22337-7-git-send-email-marcel@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/ppc/mac_newworld.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index b54f94ad53..c3770121e2 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -371,6 +371,7 @@ 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(); } else { pci_bus = pci_pmac_init(pic, get_system_memory(), get_system_io()); machine_arch = ARCH_MAC99; @@ -417,8 +418,7 @@ static void ppc_core99_init(MachineState *machine) dev = qdev_create(adb_bus, TYPE_ADB_MOUSE); qdev_init_nofail(dev); - if ((machine_arch == ARCH_MAC99_U3 && defaults_enabled()) || - usb_enabled()) { + if (machine->usb) { pci_create_simple(pci_bus, -1, "pci-ohci"); /* U3 needs to use USB for input because Linux doesn't support via-cuda on PPC64 */ |