From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51693) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WlE0p-00012R-QU for qemu-devel@nongnu.org; Fri, 16 May 2014 05:01:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WlE0b-0005U4-Qn for qemu-devel@nongnu.org; Fri, 16 May 2014 05:01:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31800) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WlE0b-0005TI-JO for qemu-devel@nongnu.org; Fri, 16 May 2014 05:00:53 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4G90pvY018212 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 16 May 2014 05:00:52 -0400 From: Markus Armbruster Date: Fri, 16 May 2014 11:00:08 +0200 Message-Id: <1400230826-18009-2-git-send-email-armbru@redhat.com> In-Reply-To: <1400230826-18009-1-git-send-email-armbru@redhat.com> References: <1400230826-18009-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 01/19] blockdev: Don't use qerror_report_err() in drive_init() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com qerror_report_err() is a transitional interface to help with converting existing HMP commands to QMP. It should not be used elsewhere. drive_init() is not meant to be used by QMP commands. It uses both qerror_report_err() and error_report(). Convert the former to the latter. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- blockdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blockdev.c b/blockdev.c index 1a12e24..24b1c3b 100644 --- a/blockdev.c +++ b/blockdev.c @@ -691,7 +691,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) &error_abort); qemu_opts_absorb_qdict(legacy_opts, bs_opts, &local_err); if (local_err) { - qerror_report_err(local_err); + error_report("%s", error_get_pretty(local_err)); error_free(local_err); goto fail; } @@ -903,7 +903,7 @@ DriveInfo *drive_init(QemuOpts *all_opts, BlockInterfaceType block_default_type) dinfo = blockdev_init(filename, bs_opts, &local_err); if (dinfo == NULL) { if (local_err) { - qerror_report_err(local_err); + error_report("%s", error_get_pretty(local_err)); error_free(local_err); } goto fail; -- 1.8.1.4