[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 06/10] numa: Avoid qerror_report_err() outside QM
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 06/10] numa: Avoid qerror_report_err() outside QMP command handlers |
Date: |
Thu, 12 Feb 2015 14:33:56 +0100 |
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
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
- [Qemu-devel] [PATCH v2 00/10] Clean up around error_get_pretty(), qerror_report_err(), Markus Armbruster, 2015/02/12
- [Qemu-devel] [PATCH v2 01/10] error: New convenience function error_report_err(), Markus Armbruster, 2015/02/12
- [Qemu-devel] [PATCH v2 08/10] vl: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/12
- [Qemu-devel] [PATCH v2 07/10] tpm: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/12
- [Qemu-devel] [PATCH v2 04/10] monitor: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/12
- [Qemu-devel] [PATCH v2 03/10] monitor: Clean up around monitor_handle_fd_param(), Markus Armbruster, 2015/02/12
- [Qemu-devel] [PATCH v2 02/10] error: Use error_report_err() where appropriate, Markus Armbruster, 2015/02/12
- [Qemu-devel] [PATCH v2 10/10] qemu-char: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/12
- [Qemu-devel] [PATCH v2 06/10] numa: Avoid qerror_report_err() outside QMP command handlers,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 05/10] net: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/12
- [Qemu-devel] [PATCH v2 09/10] qemu-img: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/12