From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54477) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLtuH-0002uc-9v for qemu-devel@nongnu.org; Thu, 12 Feb 2015 08:34:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLtuA-0002UW-C2 for qemu-devel@nongnu.org; Thu, 12 Feb 2015 08:34:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40950) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLtuA-0002UA-3t for qemu-devel@nongnu.org; Thu, 12 Feb 2015 08:34:06 -0500 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 t1CDY53C025161 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 12 Feb 2015 08:34:05 -0500 Received: from blackfin.pond.sub.org (ovpn-116-32.ams2.redhat.com [10.36.116.32]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t1CDY3Po022990 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 12 Feb 2015 08:34:05 -0500 From: Markus Armbruster Date: Thu, 12 Feb 2015 14:33:56 +0100 Message-Id: <1423748040-3448-7-git-send-email-armbru@redhat.com> In-Reply-To: <1423748040-3448-1-git-send-email-armbru@redhat.com> References: <1423748040-3448-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 06/10] 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