From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nu8Vp-0004MS-6W for qemu-devel@nongnu.org; Tue, 23 Mar 2010 14:07:33 -0400 Received: from [140.186.70.92] (port=60222 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nu8Vm-0004Jr-49 for qemu-devel@nongnu.org; Tue, 23 Mar 2010 14:07:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nu8Vj-0004JJ-AZ for qemu-devel@nongnu.org; Tue, 23 Mar 2010 14:07:29 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:44202) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nu8Vi-0004I1-Qq for qemu-devel@nongnu.org; Tue, 23 Mar 2010 14:07:27 -0400 Received: from blackfin.pond.sub.org (pD9E3A7EE.dip.t-dialin.net [217.227.167.238]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 4003A276DA6 for ; Tue, 23 Mar 2010 19:07:22 +0100 (CET) From: Markus Armbruster Date: Tue, 23 Mar 2010 19:07:21 +0100 Message-Id: <1269367641-6241-4-git-send-email-armbru@redhat.com> In-Reply-To: <1269367641-6241-1-git-send-email-armbru@redhat.com> References: <1269367641-6241-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] monitor: Convert do_migrate() to QError List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com Human monitor error message changes from "unknown migration protocol: FOO" to "Invalid parameter uri". The conversion is shallow: the FOO_start_outgoing_migration() aren't converted. Converting them is a big job for relatively little practical benefit, so leave it for later. Signed-off-by: Markus Armbruster --- migration.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/migration.c b/migration.c index 05f6cc5..47d2ab5 100644 --- a/migration.c +++ b/migration.c @@ -56,14 +56,14 @@ void qemu_start_incoming_migration(const char *uri) int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) { - MigrationState *s = NULL; + MigrationState *s; const char *p; int detach = qdict_get_int(qdict, "detach"); const char *uri = qdict_get_str(qdict, "uri"); if (current_migration && current_migration->get_status(current_migration) == MIG_STATE_ACTIVE) { - monitor_printf(mon, "migration already in progress\n"); + qerror_report(QERR_MIGRATION_IN_PROGRESS); return -1; } @@ -86,12 +86,13 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data) (int)qdict_get_int(qdict, "inc")); #endif } else { - monitor_printf(mon, "unknown migration protocol: %s\n", uri); + qerror_report(QERR_INVALID_PARAMETER, "uri"); return -1; } if (s == NULL) { - monitor_printf(mon, "migration failed\n"); + /* TODO push error reporting into the FOO_start_outgoing_migration() */ + qerror_report(QERR_MIGRATION_FAILED); return -1; } -- 1.6.6.1