From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NsIf3-0008PD-HW for qemu-devel@nongnu.org; Thu, 18 Mar 2010 12:33:29 -0400 Received: from [199.232.76.173] (port=40351 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NsIf2-0008Of-Sh for qemu-devel@nongnu.org; Thu, 18 Mar 2010 12:33:28 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NsIew-0005MF-Q0 for qemu-devel@nongnu.org; Thu, 18 Mar 2010 12:33:28 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:56558) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NsIew-0005Lm-4m for qemu-devel@nongnu.org; Thu, 18 Mar 2010 12:33:22 -0400 Received: from blackfin.pond.sub.org (pD9E3ACC8.dip.t-dialin.net [217.227.172.200]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 3CDFC276DB5 for ; Thu, 18 Mar 2010 17:33:19 +0100 (CET) From: Markus Armbruster Date: Thu, 18 Mar 2010 17:33:10 +0100 Message-Id: <1268929996-28763-4-git-send-email-armbru@redhat.com> In-Reply-To: <1268929996-28763-1-git-send-email-armbru@redhat.com> References: <1268929996-28763-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 03/11] error: Convert qemu_opts_create() 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 Fixes device_add to report duplicate ID properly in QMP, as DuplicateId instead of UndefinedError. Signed-off-by: Markus Armbruster --- qemu-option.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu-option.c b/qemu-option.c index dc340b8..e3916be 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.6.6.1