[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 06/11] net: Avoid qerror_report_err() outside QMP
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v2 06/11] net: Avoid qerror_report_err() outside QMP command handlers |
Date: |
Wed, 18 Feb 2015 12:10:36 +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 HMP command handler
hmp_host_net_add() and initial startup helpers net_init_client(),
net_init_netdev(). Keep it in QMP command handler qmp_netdev_add().
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
net/net.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/net/net.c b/net/net.c
index 74e651e..ec6e581 100644
--- a/net/net.c
+++ b/net/net.c
@@ -974,8 +974,7 @@ void net_host_device_add(Monitor *mon, const QDict *qdict)
net_client_init(opts, 0, &local_err);
if (local_err) {
- qerror_report_err(local_err);
- error_free(local_err);
+ error_report_err(local_err);
monitor_printf(mon, "adding host network device %s failed\n", device);
}
}
@@ -1270,8 +1269,7 @@ static int net_init_client(QemuOpts *opts, void *dummy)
net_client_init(opts, 0, &local_err);
if (local_err) {
- qerror_report_err(local_err);
- error_free(local_err);
+ error_report_err(local_err);
return -1;
}
@@ -1285,8 +1283,7 @@ static int net_init_netdev(QemuOpts *opts, void *dummy)
ret = net_client_init(opts, 1, &local_err);
if (local_err) {
- qerror_report_err(local_err);
- error_free(local_err);
+ error_report_err(local_err);
return -1;
}
--
1.9.3
- [Qemu-devel] [PULL v2 00/11] Clean up around error_get_pretty(), qerror_report_err(), Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL v2 02/11] error: New convenience function error_report_err(), Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL v2 10/11] qemu-img: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL v2 01/11] vhost-scsi: Improve error reporting for invalid vhostfd, Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL v2 11/11] qemu-char: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL v2 04/11] monitor: Clean up around monitor_handle_fd_param(), Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL v2 06/11] net: Avoid qerror_report_err() outside QMP command handlers,
Markus Armbruster <=
- [Qemu-devel] [PULL v2 05/11] monitor: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL v2 03/11] error: Use error_report_err() where appropriate, Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL v2 09/11] vl: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL v2 07/11] numa: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/18
- [Qemu-devel] [PULL v2 08/11] tpm: Avoid qerror_report_err() outside QMP command handlers, Markus Armbruster, 2015/02/18
- Re: [Qemu-devel] [PULL v2 00/11] Clean up around error_get_pretty(), qerror_report_err(), Peter Maydell, 2015/02/26