aboutsummaryrefslogtreecommitdiff
path: root/hw/ppc/spapr_drc.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2020-05-05 17:29:26 +0200
committerMarkus Armbruster <armbru@redhat.com>2020-05-15 07:08:14 +0200
commitdf4fe0b291b2baf1694517a4a67be7525102656b (patch)
treeefcad1374a17a455adaec478e7f5f3f66cdfa296 /hw/ppc/spapr_drc.c
parent7ef1553dac8ef8dbe547b58d7420461a16be0eeb (diff)
downloadqemu-df4fe0b291b2baf1694517a4a67be7525102656b.zip
qemu-df4fe0b291b2baf1694517a4a67be7525102656b.tar.gz
qemu-df4fe0b291b2baf1694517a4a67be7525102656b.tar.bz2
qom: Drop @errp parameter of object_property_del()
Same story as for object_property_add(): the only way object_property_del() can fail is when the property with this name does not exist. Since our property names are all hardcoded, failure is a programming error, and the appropriate way to handle it is passing &error_abort. Most callers do that, the commit before previous fixed one that didn't (and got the error handling wrong), and the two remaining exceptions ignore errors. Drop the @errp parameter. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <20200505152926.18877-19-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Diffstat (limited to 'hw/ppc/spapr_drc.c')
-rw-r--r--hw/ppc/spapr_drc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c
index 8b2171f..b958f8a 100644
--- a/hw/ppc/spapr_drc.c
+++ b/hw/ppc/spapr_drc.c
@@ -405,7 +405,7 @@ static void spapr_drc_release(SpaprDrc *drc)
g_free(drc->fdt);
drc->fdt = NULL;
drc->fdt_start_offset = 0;
- object_property_del(OBJECT(drc), "device", &error_abort);
+ object_property_del(OBJECT(drc), "device");
drc->dev = NULL;
}
@@ -551,7 +551,7 @@ static void unrealize(DeviceState *d)
vmstate_unregister(VMSTATE_IF(drc), &vmstate_spapr_drc, drc);
root_container = container_get(object_get_root(), DRC_CONTAINER_PATH);
name = g_strdup_printf("%x", spapr_drc_index(drc));
- object_property_del(root_container, name, &error_abort);
+ object_property_del(root_container, name);
g_free(name);
}