hmp: drop Error pointer indirection in hmp_handle_error
PATCH v6 1/1 hmp: drop Error pointer indirection in hmp_handle_error
We don't need Error **, as all callers pass local Error object, which isn't used after the call. Use Error * instead.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>
---
v6: add Dr. David's a-b
include/monitor/hmp.h | 2 +- dump/dump-hmp-cmds.c | 4 +- hw/core/machine-hmp-cmds.c | 6 +- monitor/hmp-cmds.c | 155 ++++++++++++++++++------------------- qdev-monitor.c | 4 +- qom/qom-hmp-cmds.c | 4 +- 6 files changed, 87 insertions(+), 88 deletions(-)
include/monitor/hmp.h +1 -1
@@ -16,7 +16,7 @@#include "qemu/readline.h" -void hmp_handle_error (Monitor *mon,Error **errp); +void hmp_handle_error (Monitor *mon,Error *err);void hmp_info_name (Monitor *mon,const QDict *qdict);void hmp_info_version (Monitor *mon,const QDict *qdict);
dump/dump-hmp-cmds.c +2 -2
@@ -32,7 +32,7 @@ void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict)if (zlib + lzo + snappy + win_dmp >1 ) {error_setg (&err,"only one of '-z|-l|-s|-w' can be set" ); -hmp_handle_error (mon, &err); +hmp_handle_error (mon, err);return ; }
@@ -66,7 +66,7 @@ void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict)qmp_dump_guest_memory (paging, prot, true, detach, has_begin, begin, has_length, length, true, dump_format, &err); -hmp_handle_error (mon, &err); +hmp_handle_error (mon, err);g_free (prot); }
hw/core/machine-hmp-cmds.c +3 -3
@@ -55,7 +55,7 @@ void hmp_cpu_add(Monitor *mon, const QDict *qdict) cpuid =qdict_get_int (qdict,"id" );qmp_cpu_add (cpuid, &err); -hmp_handle_error (mon, &err); +hmp_handle_error (mon, err); }void hmp_hotpluggable_cpus (Monitor *mon,const QDict *qdict)
@@ -66,7 +66,7 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict)CpuInstanceProperties *c;if (err !=NULL ) { -hmp_handle_error (mon, &err); +hmp_handle_error (mon, err);return ; }
@@ -135,7 +135,7 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict)monitor_printf (mon,"\n" );qapi_free_MemdevList (memdev_list); -hmp_handle_error (mon, &err); +hmp_handle_error (mon, err); }void hmp_info_numa (Monitor *mon,const QDict *qdict)
monitor/hmp-cmds.c +77 -78
599 lines not on this page · raw message
qdev-monitor.c +2 -2
@@ -890,7 +890,7 @@ void hmp_device_add(Monitor *mon, const QDict *qdict)Error *err =NULL ;qmp_device_add ((QDict *)qdict,NULL , &err); -hmp_handle_error (mon, &err); +hmp_handle_error (mon, err); }void hmp_device_del (Monitor *mon,const QDict *qdict)
@@ -899,7 +899,7 @@ void hmp_device_del(Monitor *mon, const QDict *qdict)Error *err =NULL ;qmp_device_del (id, &err); -hmp_handle_error (mon, &err); +hmp_handle_error (mon, err); }BlockBackend *blk_by_qdev_id (const char *id,Error **errp)
qom/qom-hmp-cmds.c +2 -2
@@ -37,7 +37,7 @@ void hmp_qom_list(Monitor *mon, const QDict *qdict) }qapi_free_ObjectPropertyInfoList (start); } -hmp_handle_error (mon, &err); +hmp_handle_error (mon, err); }void hmp_qom_set (Monitor *mon,const QDict *qdict)
@@ -59,7 +59,7 @@ void hmp_qom_set(Monitor *mon, const QDict *qdict) }object_property_parse (obj, value, property, &err); } -hmp_handle_error (mon, &err); +hmp_handle_error (mon, err); } typedef struct QOMCompositionState {
Signature · 1 line
2.21.0
Quoted 5 lines · Vladimir Sementsov-Ogievskiy
We don't need Error **, as all callers pass local Error object, which isn't used after the call. Use Error * instead.
Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>
Reviewed-by Markus Armbruster <[email protected]>