[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/6] hw/ppc/mac_newworld: simplify usb controller cr
From: |
Marcel Apfelbaum |
Subject: |
[Qemu-devel] [PATCH 6/6] hw/ppc/mac_newworld: simplify usb controller creation logic |
Date: |
Tue, 6 Jan 2015 15:29:17 +0200 |
Signed-off-by: Marcel Apfelbaum <address@hidden>
---
hw/ppc/mac_newworld.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index b54f94a..c377012 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 */
--
2.1.0
- Re: [Qemu-devel] [PATCH 5/6] hw/ppc/spapr: simplify usb controller creation logic, (continued)
- Re: [Qemu-devel] [PATCH 5/6] hw/ppc/spapr: simplify usb controller creation logic, Paolo Bonzini, 2015/01/06
- Re: [Qemu-devel] [PATCH 5/6] hw/ppc/spapr: simplify usb controller creation logic, Marcel Apfelbaum, 2015/01/07
- Re: [Qemu-devel] [PATCH 5/6] hw/ppc/spapr: simplify usb controller creation logic, Paolo Bonzini, 2015/01/07
- Re: [Qemu-devel] [PATCH 5/6] hw/ppc/spapr: simplify usb controller creation logic, Alexander Graf, 2015/01/07
- Re: [Qemu-devel] [PATCH 5/6] hw/ppc/spapr: simplify usb controller creation logic, Marcel Apfelbaum, 2015/01/07
- Re: [Qemu-devel] [PATCH 5/6] hw/ppc/spapr: simplify usb controller creation logic, Paolo Bonzini, 2015/01/07
- Re: [Qemu-devel] [PATCH 5/6] hw/ppc/spapr: simplify usb controller creation logic, Alexander Graf, 2015/01/07
- Re: [Qemu-devel] [PATCH 5/6] hw/ppc/spapr: simplify usb controller creation logic, Paolo Bonzini, 2015/01/07
- Re: [Qemu-devel] [PATCH 5/6] hw/ppc/spapr: simplify usb controller creation logic, Alexander Graf, 2015/01/07
- Re: [Qemu-devel] [PATCH 5/6] hw/ppc/spapr: simplify usb controller creation logic, Marcel Apfelbaum, 2015/01/07
[Qemu-devel] [PATCH 6/6] hw/ppc/mac_newworld: simplify usb controller creation logic,
Marcel Apfelbaum <=
Re: [Qemu-devel] [PATCH 0/6] simplify usb enabling logic and fix a Qemu crash, Paolo Bonzini, 2015/01/06
Re: [Qemu-devel] [PATCH 0/6] simplify usb enabling logic and fix a Qemu crash, Stefan Hajnoczi, 2015/01/07
Re: [Qemu-devel] [PATCH 0/6] simplify usb enabling logic and fix a Qemu crash, Peter Maydell, 2015/01/08