From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60634) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wnrca-0005zt-Ro for qemu-devel@nongnu.org; Fri, 23 May 2014 11:43:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WnrcT-0006M5-4x for qemu-devel@nongnu.org; Fri, 23 May 2014 11:43:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33745) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnrcS-0006Le-U1 for qemu-devel@nongnu.org; Fri, 23 May 2014 11:42:53 -0400 From: Stefan Hajnoczi Date: Fri, 23 May 2014 17:41:48 +0200 Message-Id: <1400859725-31879-17-git-send-email-stefanha@redhat.com> In-Reply-To: <1400859725-31879-1-git-send-email-stefanha@redhat.com> References: <1400859725-31879-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 16/33] blockdev: Don't use qerror_report() in do_drive_del() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Markus Armbruster , Stefan Hajnoczi From: Markus Armbruster qerror_report() is a transitional interface to help with converting existing HMP commands to QMP. It should not be used elsewhere. do_drive_del() is an HMP command that won't be converted to QMP (we'll create a new QMP command instead). It uses both qerror_report() and error_report(). Convert the former to the latter. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Signed-off-by: Stefan Hajnoczi --- blockdev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/blockdev.c b/blockdev.c index 264b07c..8cc42fb 100644 --- a/blockdev.c +++ b/blockdev.c @@ -34,7 +34,6 @@ #include "hw/block/block.h" #include "block/blockjob.h" #include "monitor/monitor.h" -#include "qapi/qmp/qerror.h" #include "qemu/option.h" #include "qemu/config-file.h" #include "qapi/qmp/types.h" @@ -1763,7 +1762,7 @@ int do_drive_del(Monitor *mon, const QDict *qdict, QObject **ret_data) bs = bdrv_find(id); if (!bs) { - qerror_report(QERR_DEVICE_NOT_FOUND, id); + error_report("Device '%s' not found", id); return -1; } if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_DRIVE_DEL, &local_err)) { -- 1.9.0