diff options
| author | Peter Maydell | 2015-02-25 12:54:15 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-02-25 12:54:15 +0100 |
| commit | 3d30395f7fb3315e4ecf0de4e48790e1326bbd47 (patch) | |
| tree | 2bb4195587d1d5e7f6be11e0b0bafdb548f82c4e /hw/usb/dev-network.c | |
| parent | Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2015-02-16-v2-tag'... (diff) | |
| parent | Make sysbus EHCI devices ARM only by default (diff) | |
| download | qemu-3d30395f7fb3315e4ecf0de4e48790e1326bbd47.tar.gz qemu-3d30395f7fb3315e4ecf0de4e48790e1326bbd47.tar.xz 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/usb/dev-network.c')
| -rw-r--r-- | hw/usb/dev-network.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index 5b95d5c382..7131abdb21 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -1405,11 +1405,7 @@ static USBDevice *usb_net_init(USBBus *bus, const char *cmdline) } dev = usb_create(bus, "usb-net"); - if (!dev) { - return NULL; - } qdev_set_nic_properties(&dev->qdev, &nd_table[idx]); - qdev_init_nofail(&dev->qdev); return dev; } |