diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-02-25 11:54:15 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-02-25 11:54:15 +0000 |
| commit | 3d30395f7fb3315e4ecf0de4e48790e1326bbd47 (patch) | |
| tree | 2bb4195587d1d5e7f6be11e0b0bafdb548f82c4e /hw/ppc | |
| parent | c28d4869ea1235b80ef59d5f5e8ca96bc4155c0c (diff) | |
| parent | c3cf77cb63b71618224129df41f114488e0f74e4 (diff) | |
| download | qemu-3d30395f7fb3315e4ecf0de4e48790e1326bbd47.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20150218-1' into staging
usb: error handling fixes from Markus, make sysbus ehci arm-only.
# gpg: Signature made Wed Feb 18 09:54:13 2015 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-usb-20150218-1:
Make sysbus EHCI devices ARM only by default
PPC: Don't use legacy -usbdevice support for setting up board
r2d: Don't use legacy -usbdevice support for setting up board
usb: Change usb_create_simple() to abort on failure
usb: Suppress bogus error when automatic usb-hub creation fails
usb: Do not prefix error_setg() messages with "Error: "
usb: Improve -usbdevice error reporting a bit
usb: usb_create() can't fail, drop useless error handling
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/ppc')
| -rw-r--r-- | hw/ppc/mac_newworld.c | 7 | ||||
| -rw-r--r-- | hw/ppc/spapr.c | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index c3770121e2..624b4ab50b 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -420,11 +420,14 @@ static void ppc_core99_init(MachineState *machine) 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 */ if (machine_arch == ARCH_MAC99_U3) { - usbdevice_create("keyboard"); - usbdevice_create("mouse"); + USBBus *usb_bus = usb_bus_find(-1); + + usb_create_simple(usb_bus, "usb-kbd"); + usb_create_simple(usb_bus, "usb-mouse"); } } diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 812d03054d..a82a0f99b3 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1533,9 +1533,12 @@ static void ppc_spapr_init(MachineState *machine) if (machine->usb) { pci_create_simple(phb->bus, -1, "pci-ohci"); + if (spapr->has_graphics) { - usbdevice_create("keyboard"); - usbdevice_create("mouse"); + USBBus *usb_bus = usb_bus_find(-1); + + usb_create_simple(usb_bus, "usb-kbd"); + usb_create_simple(usb_bus, "usb-mouse"); } } |