From: Markus Armbruster <armbru@redhat.com>
Date: Wed, 4 Feb 2015 12:28:13 +0000 (+0100)
Subject: r2d: Don't use legacy -usbdevice support for setting up board
X-Git-Tag: v2.3.0-rc0~55^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=456dcd8ab45a83dd51cca357cd9aa6ad337dc20d;p=thirdparty%2Fqemu.git

r2d: Don't use legacy -usbdevice support for setting up board

It's tempting, because usbdevice_create() is so simple to use.  But
there's a lot of unwanted complexity behind the simple interface.
Switch to usb_create_simple().

Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 12f44d28f00..d1d0847ba2b 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -301,7 +301,7 @@ static void r2d_init(MachineState *machine)
                             "rtl8139", i==0 ? "2" : NULL);
 
     /* USB keyboard */
-    usbdevice_create("keyboard");
+    usb_create_simple(usb_bus_find(-1), "usb-kbd");
 
     /* Todo: register on board registers */
     memset(&boot_params, 0, sizeof(boot_params));