Commit 14a7a203 authored by Marc-André Lureau's avatar Marc-André Lureau
Browse files

chardev: don't abort on attempt to add duplicated chardev 



This is a regression from commit d2623129 ("qom: Drop parameter @errp
of object_property_add() & friends").

(qemu) chardev-add id=null,backend=null
(qemu) chardev-add id=null,backend=null
Unexpected error in object_property_try_add() at /home/elmarco/src/qemu/qom/object.c:1166:
attempt to add duplicate property 'null' to object (type 'container')

That case is currently not covered in the test suite, but will be with
the queued patch "char: fix use-after-free with dup chardev &
reconnect".

Fixes: d2623129
Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 2b61bb71

chardev/char.c

+5 −1
Original line number Diff line number Diff line
@@ -996,7 +996,11 @@ static Chardev *chardev_new(const char *id, const char *typename, 
    }



    if (id) {

        object_property_add_child(get_chardevs_root(), id, obj);

        object_property_try_add_child(get_chardevs_root(), id, obj,

                                      &local_err);

        if (local_err) {

            goto end;

        }

        object_unref(obj);

    }