Commit 1c46e594 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'afaerber/tags/qom-devices-for-anthony' into staging 

QOM infrastructure fixes for 1.7

* QOM memory leak fix

# gpg: Signature made Tue 19 Nov 2013 01:58:58 AM PST using RSA key ID 3E7E013F
# gpg: Can't check signature: public key not found

# By Vlad Yasevich
# Via Andreas Färber
* afaerber/tags/qom-devices-for-anthony:
  qom: Fix memory leak in object_property_set_link()
parents dc6dc0a9 2d3aa28c

qom/object.c

+3 −2
Original line number Diff line number Diff line
@@ -838,8 +838,9 @@ char *object_property_get_str(Object *obj, const char *name, 
void object_property_set_link(Object *obj, Object *value,

                              const char *name, Error **errp)

{

    object_property_set_str(obj, object_get_canonical_path(value),

                            name, errp);

    gchar *path = object_get_canonical_path(value);

    object_property_set_str(obj, path, name, errp);

    g_free(path);

}



Object *object_property_get_link(Object *obj, const char *name,