[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 04/20] monitor: Convert client_migrate_info t
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-devel] [PATCH v2 04/20] monitor: Convert client_migrate_info to QAPI |
Date: |
Fri, 29 May 2015 10:12:21 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) |
Luiz Capitulino <address@hidden> writes:
> On Tue, 26 May 2015 17:20:39 +0200
> Markus Armbruster <address@hidden> wrote:
>
>> Signed-off-by: Markus Armbruster <address@hidden>
>> Reviewed-by: Eric Blake <address@hidden>
[...]
>> index 8170309..38ff972 100644
>> --- a/monitor.c
>> +++ b/monitor.c
>> @@ -1032,39 +1032,33 @@ static void hmp_info_trace_events(Monitor *mon,
>> const QDict *qdict)
>> qapi_free_TraceEventInfoList(events);
>> }
>>
>> -static int client_migrate_info(Monitor *mon, const QDict *qdict,
>> - QObject **ret_data)
>> +void qmp_client_migrate_info(const char *protocol, const char *hostname,
>> + bool has_port, int64_t port,
>> + bool has_tls_port, int64_t tls_port,
>> + bool has_cert_subject, const char
>> *cert_subject,
>> + Error **errp)
>> {
>> - const char *protocol = qdict_get_str(qdict, "protocol");
>> - const char *hostname = qdict_get_str(qdict, "hostname");
>> - const char *subject = qdict_get_try_str(qdict, "cert-subject");
>> - int port = qdict_get_try_int(qdict, "port", -1);
>> - int tls_port = qdict_get_try_int(qdict, "tls-port", -1);
>> - Error *err = NULL;
>> - int ret;
>> -
>> if (strcmp(protocol, "spice") == 0) {
>> - if (!qemu_using_spice(&err)) {
>> - qerror_report_err(err);
>> - error_free(err);
>> - return -1;
>> + if (!qemu_using_spice(errp)) {
>> + return;
>> }
>>
>> - if (port == -1 && tls_port == -1) {
>> - qerror_report(QERR_MISSING_PARAMETER, "port/tls-port");
>> - return -1;
>> + if (!has_port && !has_tls_port) {
>> + error_set(errp, QERR_MISSING_PARAMETER, "port/tls-port");
>> + return;
>> }
>>
>> - ret = qemu_spice_migrate_info(hostname, port, tls_port, subject);
>> - if (ret != 0) {
>> - qerror_report(QERR_UNDEFINED_ERROR);
>> - return -1;
>> + if (qemu_spice_migrate_info(hostname,
>> + has_port ? port : -1,
>> + has_tls_port ? tls_port : -1,
>> + cert_subject)) {
>> + error_set(errp, QERR_UNDEFINED_ERROR);
>> + return;
>> }
>> - return 0;
>> + return;
>> }
>>
>> - qerror_report(QERR_INVALID_PARAMETER_VALUE, "protocol", "spice");
>> - return -1;
>> + error_set(errp, QERR_INVALID_PARAMETER_VALUE, "protocol", "spice");
>> }
>
> Why not use error_setg() instead of error_set()?
Just to keep this patch more obvious.
I agree the QERR_ macros need to go, but that'll take a separate series,
and only after I managed to empty out the rest of qerror.h.
[...]
- [Qemu-devel] [PATCH v2 00/20] monitor: Wean core off QError, and other cleanups, Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 02/20] monitor: Clean up after previous commit, Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 01/20] monitor: Drop broken, unused asynchronous command interface, Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 04/20] monitor: Convert client_migrate_info to QAPI, Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 03/20] monitor: Improve and document client_migrate_info protocol error, Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 05/20] monitor: Use traditional command interface for HMP drive_del, Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 14/20] monitor: Rename handle_user_command() to handle_hmp_command(), Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 08/20] monitor: Drop unused "new" HMP command interface, Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 10/20] monitor: Propagate errors through qmp_check_input_obj(), Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 12/20] monitor: Inline monitor_has_error() into its only caller, Markus Armbruster, 2015/05/26
- [Qemu-devel] [PATCH v2 13/20] monitor: Limit QError use to command handlers, Markus Armbruster, 2015/05/26