diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-19 21:45:41 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-19 21:45:42 +0000 |
| commit | 037b7addb7f9ad5dc52c3d05da8b2f60386252ff (patch) | |
| tree | 2eccb0dca91eb017d45abdf184a562b09f980940 /ui | |
| parent | f71e769d0754dc9a593a9e17ec6693a261b29f82 (diff) | |
| parent | abdffd1fb78c1b98bda925d3d59123beca6761a3 (diff) | |
| download | qemu-037b7addb7f9ad5dc52c3d05da8b2f60386252ff.zip qemu-037b7addb7f9ad5dc52c3d05da8b2f60386252ff.tar.gz qemu-037b7addb7f9ad5dc52c3d05da8b2f60386252ff.tar.bz2 | |
Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.0' into staging
QOM/QTest infrastructure fixes
* QOM machine memory and build fixes
* QOM link<> and child<> property reference counting fixes
# gpg: Signature made Wed 19 Mar 2014 21:44:04 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg: aka "Andreas Färber <afaerber@suse.com>"
* remotes/afaerber/tags/qom-devices-for-2.0:
virtio-rng: Avoid default_backend refcount leak
qom: Add check() argument to object_property_add_link()
qom: Make QOM link property unref optional
qom: Don't make link NULL on object_property_set_link() failure
qom: Split object_property_set_link()
vl.c: Fix OpenBSD compilation issue due to namespace collisions
vl.c: Fix memory leak in qemu_register_machine()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/console.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/console.c b/ui/console.c index 4df251d..e057755 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1180,7 +1180,10 @@ static QemuConsole *new_console(DisplayState *ds, console_type_t console_type) obj = object_new(TYPE_QEMU_CONSOLE); s = QEMU_CONSOLE(obj); object_property_add_link(obj, "device", TYPE_DEVICE, - (Object **)&s->device, &local_err); + (Object **)&s->device, + object_property_allow_set_link, + OBJ_PROP_LINK_UNREF_ON_RELEASE, + &local_err); object_property_add_uint32_ptr(obj, "head", &s->head, &local_err); |