mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

monitor: make hmp_handle_error return a boolean

Browse Source 
This turns the pattern

  if (err) {
     hmp_handle_error(mon, err);
     return;
  }

into

  if (hmp_handle_error(mon, err)) {
     return;
  }

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-10-28 16:18:25 +01:00
parent 3e11e0b2dd
commit 0ca117a756
3 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/core/machine-hmp-cmds.c
View File

@ -53,8 +53,7 @@ void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict)
HotpluggableCPUList *saved = l;
CpuInstanceProperties *c;
if (err != NULL) {
hmp_handle_error(mon, err);
if (hmp_handle_error(mon, err)) {
return;
}

2
include/monitor/hmp.h
View File

@ -16,7 +16,7 @@
#include "qemu/readline.h"
void hmp_handle_error(Monitor *mon, Error *err);
bool 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);

28
monitor/hmp-cmds.c
View File

@ -62,11 +62,13 @@
#include <spice/enums.h>
#endif
void hmp_handle_error(Monitor *mon, Error *err)
bool hmp_handle_error(Monitor *mon, Error *err)
{
if (err) {
error_reportf_err(err, "Error: ");
return true;
}
return false;
}
/*
@ -577,8 +579,7 @@ void hmp_info_vnc(Monitor *mon, const QDict *qdict)
info2l = qmp_query_vnc_servers(&err);
info2l_head = info2l;
if (err) {
hmp_handle_error(mon, err);
if (hmp_handle_error(mon, err)) {
return;
}
if (!info2l) {
@ -693,8 +694,7 @@ void hmp_info_balloon(Monitor *mon, const QDict *qdict)
Error *err = NULL;
info = qmp_query_balloon(&err);
if (err) {
hmp_handle_error(mon, err);
if (hmp_handle_error(mon, err)) {
return;
}
@ -1065,8 +1065,7 @@ void hmp_ringbuf_read(Monitor *mon, const QDict *qdict)
int i;
data = qmp_ringbuf_read(chardev, size, false, 0, &err);
if (err) {
hmp_handle_error(mon, err);
if (hmp_handle_error(mon, err)) {
return;
}
@ -1582,8 +1581,7 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)
qmp_migrate(uri, !!blk, blk, !!inc, inc,
false, false, true, resume, &err);
if (err) {
hmp_handle_error(mon, err);
if (hmp_handle_error(mon, err)) {
return;
}
@ -1917,8 +1915,7 @@ void hmp_rocker(Monitor *mon, const QDict *qdict)
Error *err = NULL;
rocker = qmp_query_rocker(name, &err);
if (err != NULL) {
hmp_handle_error(mon, err);
if (hmp_handle_error(mon, err)) {
return;
}
@ -1936,8 +1933,7 @@ void hmp_rocker_ports(Monitor *mon, const QDict *qdict)
Error *err = NULL;
list = qmp_query_rocker_ports(name, &err);
if (err != NULL) {
hmp_handle_error(mon, err);
if (hmp_handle_error(mon, err)) {
return;
}
@ -1965,8 +1961,7 @@ void hmp_rocker_of_dpa_flows(Monitor *mon, const QDict *qdict)
Error *err = NULL;
list = qmp_query_rocker_of_dpa_flows(name, tbl_id != -1, tbl_id, &err);
if (err != NULL) {
hmp_handle_error(mon, err);
if (hmp_handle_error(mon, err)) {
return;
}
@ -2115,8 +2110,7 @@ void hmp_rocker_of_dpa_groups(Monitor *mon, const QDict *qdict)
Error *err = NULL;
list = qmp_query_rocker_of_dpa_groups(name, type != 9, type, &err);
if (err != NULL) {
hmp_handle_error(mon, err);
if (hmp_handle_error(mon, err)) {
return;
}