[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 11/21] monitor: Propagate errors through inva
From: |
Luiz Capitulino |
Subject: |
Re: [Qemu-devel] [PATCH v3 11/21] monitor: Propagate errors through invalid_qmp_mode() |
Date: |
Fri, 29 May 2015 09:58:26 -0400 |
On Fri, 29 May 2015 11:56:50 +0200
Markus Armbruster <address@hidden> wrote:
> Signed-off-by: Markus Armbruster <address@hidden>
> ---
> monitor.c | 18 ++++++++++--------
> 1 file changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/monitor.c b/monitor.c
> index 61ea346..d336b8f 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -4708,19 +4708,20 @@ static int monitor_can_read(void *opaque)
> return (mon->suspend_cnt == 0) ? 1 : 0;
> }
>
> -static bool invalid_qmp_mode(const Monitor *mon, const mon_cmd_t *cmd)
> +static bool invalid_qmp_mode(const Monitor *mon, const mon_cmd_t *cmd,
> + Error **errp)
> {
> bool is_cap = cmd->mhandler.cmd_new == do_qmp_capabilities;
> if (is_cap && qmp_cmd_mode(mon)) {
> - qerror_report(ERROR_CLASS_COMMAND_NOT_FOUND,
> - "Capabilities negotiation is already complete, command
> "
> - "'%s' ignored", cmd->name);
> + error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
> + "Capabilities negotiation is already complete, command "
> + "'%s' ignored", cmd->name);
> return true;
> }
> if (!is_cap && !qmp_cmd_mode(mon)) {
> - qerror_report(ERROR_CLASS_COMMAND_NOT_FOUND,
> - "Expecting capabilities negotiation with "
> - "'qmp_capabilities' before command '%s'", cmd->name);
> + error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
> + "Expecting capabilities negotiation with "
> + "'qmp_capabilities' before command '%s'", cmd->name);
> return true;
> }
> return false;
> @@ -5010,7 +5011,8 @@ static void handle_qmp_command(JSONMessageParser
> *parser, QList *tokens)
> "The command %s has not been found", cmd_name);
> goto err_out;
> }
> - if (invalid_qmp_mode(mon, cmd)) {
> + if (invalid_qmp_mode(mon, cmd, &local_err)) {
> + qerror_report_err(local_err);
I don't think you need to call qerror_report_err() here, and you could
have changed invalid_qmp_mode() to return void. You can make those changes
before applying if you choose to do them:
Reviewed-by: Luiz Capitulino <address@hidden>
> goto err_out;
> }
>
- [Qemu-devel] [PATCH v3 00/21] monitor: Wean core off QError, and other cleanups, Markus Armbruster, 2015/05/29
- [Qemu-devel] [PATCH v3 02/21] monitor: Clean up after previous commit, Markus Armbruster, 2015/05/29
- [Qemu-devel] [PATCH v3 03/21] monitor: Improve and document client_migrate_info protocol error, Markus Armbruster, 2015/05/29
- [Qemu-devel] [PATCH v3 05/21] monitor: Use traditional command interface for HMP drive_del, Markus Armbruster, 2015/05/29
- [Qemu-devel] [PATCH v3 13/21] monitor: Inline monitor_has_error() into its only caller, Markus Armbruster, 2015/05/29
- [Qemu-devel] [PATCH v3 10/21] monitor: Propagate errors through qmp_check_input_obj(), Markus Armbruster, 2015/05/29
- [Qemu-devel] [PATCH v3 08/21] monitor: Drop unused "new" HMP command interface, Markus Armbruster, 2015/05/29
- [Qemu-devel] [PATCH v3 12/21] monitor: Wean monitor_protocol_emitter() off mon->error, Markus Armbruster, 2015/05/29
- [Qemu-devel] [PATCH v3 06/21] monitor: Use traditional command interface for HMP device_add, Markus Armbruster, 2015/05/29
- [Qemu-devel] [PATCH v3 11/21] monitor: Propagate errors through invalid_qmp_mode(), Markus Armbruster, 2015/05/29
- Re: [Qemu-devel] [PATCH v3 11/21] monitor: Propagate errors through invalid_qmp_mode(),
Luiz Capitulino <=
- Re: [Qemu-devel] [PATCH v3 11/21] monitor: Propagate errors through invalid_qmp_mode(), Eric Blake, 2015/05/29
- [Qemu-devel] [PATCH v3 14/21] monitor: Limit QError use to command handlers, Markus Armbruster, 2015/05/29
- [Qemu-devel] [PATCH v3 15/21] monitor: Rename handle_user_command() to handle_hmp_command(), Markus Armbruster, 2015/05/29
- [Qemu-devel] [PATCH v3 18/21] monitor: Drop do_qmp_capabilities()'s superfluous QMP check, Markus Armbruster, 2015/05/29
- [Qemu-devel] [PATCH v3 07/21] monitor: Use trad. command interface for HMP pcie_aer_inject_error, Markus Armbruster, 2015/05/29
- [Qemu-devel] [PATCH v3 04/21] monitor: Convert client_migrate_info to QAPI, Markus Armbruster, 2015/05/29