From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=52455 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q7T9Q-0007X3-HG for qemu-devel@nongnu.org; Wed, 06 Apr 2011 09:52:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q7T9P-0007c1-GK for qemu-devel@nongnu.org; Wed, 06 Apr 2011 09:52:04 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:33013) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q7T9P-0007bW-72 for qemu-devel@nongnu.org; Wed, 06 Apr 2011 09:52:03 -0400 Message-ID: <4D9C6FFF.2060807@msgid.tls.msk.ru> Date: Wed, 06 Apr 2011 17:51:59 +0400 From: Michael Tokarev MIME-Version: 1.0 Subject: [Qemu-devel] [PATCH] trivial: fix comment around qdev_init_nofail() Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Resending (previous attempt was at Wed, 30 Mar 2011). In previous life qdev_init_nofail() used to call hw_error() which did register dump and other scary things. Now it calls error_report() and does a regular exit(1). Fix the comment to match reality. Signed-off-by: Michael Tokarev --- hw/qdev.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 1aa1ea0..2f4846e 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -358,7 +358,7 @@ int qdev_simple_unplug_cb(DeviceState *dev) return 0; } -/* Like qdev_init(), but terminate program via hw_error() instead of +/* Like qdev_init(), but terminate program via error_report() instead of returning an error value. This is okay during machine creation. Don't use for hotplug, because there callers need to recover from failure. Exception: if you know the device's init() callback can't -- 1.7.2.5