From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nyt0i-0001ZK-42 for qemu-devel@nongnu.org; Mon, 05 Apr 2010 16:35:04 -0400 Received: from [140.186.70.92] (port=49448 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nyt0c-0001WL-5k for qemu-devel@nongnu.org; Mon, 05 Apr 2010 16:35:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nyt07-0001ba-Ei for qemu-devel@nongnu.org; Mon, 05 Apr 2010 16:34:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41030) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nyt07-0001bU-5b for qemu-devel@nongnu.org; Mon, 05 Apr 2010 16:34:27 -0400 From: Luiz Capitulino Date: Mon, 5 Apr 2010 17:33:47 -0300 Message-Id: <1270499642-31543-7-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1270499642-31543-1-git-send-email-lcapitulino@redhat.com> References: <1270499642-31543-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 06/21] error: Convert qemu_opts_create() to QError List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com Cc: Luiz Capitulino , qemu-devel@nongnu.org, Markus Armbruster From: Markus Armbruster Fixes device_add to report duplicate ID properly in QMP, as DuplicateId instead of UndefinedError. Signed-off-by: Markus Armbruster Signed-off-by: Luiz Capitulino --- qemu-option.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu-option.c b/qemu-option.c index f83d07c..12ce322 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -30,6 +30,7 @@ #include "qemu-error.h" #include "qemu-objects.h" #include "qemu-option.h" +#include "qerror.h" /* * Extracts the name of an option from the parameter string (p points at the @@ -643,8 +644,7 @@ QemuOpts *qemu_opts_create(QemuOptsList *list, const char *id, int fail_if_exist opts = qemu_opts_find(list, id); if (opts != NULL) { if (fail_if_exists) { - fprintf(stderr, "tried to create id \"%s\" twice for \"%s\"\n", - id, list->name); + qerror_report(QERR_DUPLICATE_ID, id, list->name); return NULL; } else { return opts; -- 1.7.0.4.297.g6555b1