diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-19 12:58:06 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-19 12:58:06 +0100 |
| commit | be33f56c76e5d54d780b402f7777c92103e32419 (patch) | |
| tree | 25e06c65431552a5dbeba4ff237f48ea66c645d4 /hw/core/bus.c | |
| parent | e4a9a7303a70397a89ea23072419976032de4ddc (diff) | |
| parent | 0d1e8d6f4a2ced75f673edfe4d6cb78f3b361144 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180618-pull-request' into staging
usb: revert ccid / qom patches.
# gpg: Signature made Mon 18 Jun 2018 10:21:11 BST
# gpg: using RSA key 4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/usb-20180618-pull-request:
Revert "bus: do not unref the added child bus on realize"
Revert "usb: release the created buses"
Revert "usb-ccid: fix bus leak"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/core/bus.c')
| -rw-r--r-- | hw/core/bus.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/core/bus.c b/hw/core/bus.c index ad0c9df335..4651f24486 100644 --- a/hw/core/bus.c +++ b/hw/core/bus.c @@ -102,6 +102,7 @@ static void qbus_realize(BusState *bus, DeviceState *parent, const char *name) QLIST_INSERT_HEAD(&bus->parent->child_bus, bus, sibling); bus->parent->num_child_bus++; object_property_add_child(OBJECT(bus->parent), bus->name, OBJECT(bus), NULL); + object_unref(OBJECT(bus)); } else if (bus != sysbus_get_default()) { /* TODO: once all bus devices are qdevified, only reset handler for main_system_bus should be registered here. */ |