From patchwork Wed Feb 24 17:55:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 46187 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A563BB7CEF for ; Thu, 25 Feb 2010 06:09:17 +1100 (EST) Received: from localhost ([127.0.0.1]:39076 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NkMV5-0007nn-5a for incoming@patchwork.ozlabs.org; Wed, 24 Feb 2010 14:02:23 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NkLcX-0002Fs-9S for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:06:01 -0500 Received: from [199.232.76.173] (port=52975 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NkLcT-0002EF-Ew for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:05:57 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NkLcG-0000SU-Ev for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:05:57 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:55088) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NkLcC-0000Qs-TZ for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:05:41 -0500 Received: from blackfin.pond.sub.org (pD9E38C12.dip.t-dialin.net [217.227.140.18]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 67FA83127B5 for ; Wed, 24 Feb 2010 18:56:06 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 43E6C115; Wed, 24 Feb 2010 18:56:03 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 24 Feb 2010 18:55:53 +0100 Message-Id: <1267034160-3517-42-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6 In-Reply-To: <1267034160-3517-1-git-send-email-armbru@redhat.com> References: <1267034160-3517-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: [Qemu-devel] [PATCH RFC 41/48] Revert "qdev: Use QError for 'device not found' error" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This reverts commit 3ced9f7a36189aed94d8bf86f3f5087a53012455. The next commit will convert all of qdev_device_add() to QError, and it'll be clearer with this partial conversion reverted. Signed-off-by: Markus Armbruster --- hw/qdev.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 1887dde..4e348fd 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -29,7 +29,6 @@ #include "qdev.h" #include "sysemu.h" #include "monitor.h" -#include "qerror.h" static int qdev_hotplug = 0; @@ -208,7 +207,8 @@ DeviceState *qdev_device_add(QemuOpts *opts) /* find driver */ info = qdev_find_info(NULL, driver); if (!info || info->no_user) { - qemu_error_new(QERR_DEVICE_NOT_FOUND, driver); + qemu_error("Device \"%s\" not found. Try -device '?' for a list.", + driver); return NULL; }