From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36054) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO1xl-0003rm-0N for qemu-devel@nongnu.org; Wed, 18 Feb 2015 05:34:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YO1xd-00088I-HL for qemu-devel@nongnu.org; Wed, 18 Feb 2015 05:34:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45732) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO1xd-00087y-8W for qemu-devel@nongnu.org; Wed, 18 Feb 2015 05:34:29 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t1IAYS9w030867 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 18 Feb 2015 05:34:28 -0500 Received: from blackfin.pond.sub.org (ovpn-116-39.ams2.redhat.com [10.36.116.39]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t1IAYQ2E024536 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Wed, 18 Feb 2015 05:34:28 -0500 From: Markus Armbruster Date: Wed, 18 Feb 2015 11:34:18 +0100 Message-Id: <1424255662-5393-8-git-send-email-armbru@redhat.com> In-Reply-To: <1424255662-5393-1-git-send-email-armbru@redhat.com> References: <1424255662-5393-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL 07/11] numa: Avoid qerror_report_err() outside QMP command handlers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org qerror_report_err() is a transitional interface to help with converting existing monitor commands to QMP. It should not be used elsewhere. Replace by error_report_err() in initial startup helper numa_init_func() and board setup helper memory_region_allocate_system_memory(). Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- numa.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/numa.c b/numa.c index afd2866..f8fc377 100644 --- a/numa.c +++ b/numa.c @@ -146,8 +146,7 @@ int numa_init_func(QemuOpts *opts, void *opaque) return 0; error: - qerror_report_err(err); - error_free(err); + error_report_err(err); if (object) { QapiDeallocVisitor *dv = qapi_dealloc_visitor_new(); @@ -262,8 +261,7 @@ static void allocate_system_memory_nonnuma(MemoryRegion *mr, Object *owner, * regular RAM allocation. */ if (err) { - qerror_report_err(err); - error_free(err); + error_report_err(err); memory_region_init_ram(mr, owner, name, ram_size, &error_abort); } #else @@ -298,7 +296,7 @@ void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner, } MemoryRegion *seg = host_memory_backend_get_memory(backend, &local_err); if (local_err) { - qerror_report_err(local_err); + error_report_err(local_err); exit(1); } -- 1.9.3