From 08f00df4f4b8b4e38ad620477cc90cf5f73832d9 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Fri, 14 Apr 2017 10:37:17 +0200 Subject: [PATCH] qdev: remove cannot_destroy_with_object_finalize_yet As all users have been removed, we can remove cannot_destroy_with_object_finalize_yet field from the DeviceClass structure. Signed-off-by: Laurent Vivier Message-Id: <20170414083717.13641-5-lvivier@redhat.com> Reviewed-by: Markus Armbruster Acked-by: Peter Maydell Signed-off-by: Markus Armbruster --- include/hw/qdev-core.h | 13 ------------- qmp.c | 5 ----- 2 files changed, 18 deletions(-) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index b44b476765..ac682a6818 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -113,19 +113,6 @@ typedef struct DeviceClass { * TODO remove once we're there */ bool cannot_instantiate_with_device_add_yet; - /* - * Does this device model survive object_unref(object_new(TNAME))? - * All device models should, and this flag shouldn't exist. Some - * devices crash in object_new(), some crash or hang in - * object_unref(). Makes introspecting properties with - * qmp_device_list_properties() dangerous. Bad, because it's used - * by -device FOO,help. This flag serves to protect that code. - * It should never be set without a comment explaining why it is - * set. - * TODO remove once we're there - */ - bool cannot_destroy_with_object_finalize_yet; - bool hotpluggable; /* callbacks */ diff --git a/qmp.c b/qmp.c index a744e44ac6..ab74cd729d 100644 --- a/qmp.c +++ b/qmp.c @@ -548,11 +548,6 @@ DevicePropertyInfoList *qmp_device_list_properties(const char *typename, return NULL; } - if (DEVICE_CLASS(klass)->cannot_destroy_with_object_finalize_yet) { - error_setg(errp, "Can't list properties of device '%s'", typename); - return NULL; - } - obj = object_new(typename); object_property_iter_init(&iter, obj); -- 2.11.4.GIT