[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 02/11] vl: Avoid qerror_report() outside QMP comm
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 02/11] vl: Avoid qerror_report() outside QMP command handlers |
Date: |
Tue, 16 Jun 2015 16:21:38 +0200 |
qerror_report() is a transitional interface to help with converting
existing monitor commands to QMP. It should not be used elsewhere.
Replace by error_report() in initial startup helpers parse_sandbox()
and parse_add_fd().
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Luiz Capitulino <address@hidden>
---
vl.c | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/vl.c b/vl.c
index f4985a3..3a6de4d 100644
--- a/vl.c
+++ b/vl.c
@@ -986,13 +986,13 @@ static int parse_sandbox(void *opaque, QemuOpts *opts,
Error **errp)
if (qemu_opt_get_bool(opts, "enable", false)) {
#ifdef CONFIG_SECCOMP
if (seccomp_start() < 0) {
- qerror_report(ERROR_CLASS_GENERIC_ERROR,
- "failed to install seccomp syscall filter in the
kernel");
+ error_report("failed to install seccomp syscall filter "
+ "in the kernel");
return -1;
}
#else
- qerror_report(ERROR_CLASS_GENERIC_ERROR,
- "sandboxing request but seccomp is not compiled into
this build");
+ error_report("sandboxing request but seccomp is not compiled "
+ "into this build");
return -1;
#endif
}
@@ -1040,14 +1040,12 @@ static int parse_add_fd(void *opaque, QemuOpts *opts,
Error **errp)
fd_opaque = qemu_opt_get(opts, "opaque");
if (fd < 0) {
- qerror_report(ERROR_CLASS_GENERIC_ERROR,
- "fd option is required and must be non-negative");
+ error_report("fd option is required and must be non-negative");
return -1;
}
if (fd <= STDERR_FILENO) {
- qerror_report(ERROR_CLASS_GENERIC_ERROR,
- "fd cannot be a standard I/O stream");
+ error_report("fd cannot be a standard I/O stream");
return -1;
}
@@ -1057,14 +1055,12 @@ static int parse_add_fd(void *opaque, QemuOpts *opts,
Error **errp)
*/
flags = fcntl(fd, F_GETFD);
if (flags == -1 || (flags & FD_CLOEXEC)) {
- qerror_report(ERROR_CLASS_GENERIC_ERROR,
- "fd is not valid or already in use");
+ error_report("fd is not valid or already in use");
return -1;
}
if (fdset_id < 0) {
- qerror_report(ERROR_CLASS_GENERIC_ERROR,
- "set option is required and must be non-negative");
+ error_report("set option is required and must be non-negative");
return -1;
}
@@ -1077,8 +1073,7 @@ static int parse_add_fd(void *opaque, QemuOpts *opts,
Error **errp)
}
#endif
if (dupfd == -1) {
- qerror_report(ERROR_CLASS_GENERIC_ERROR,
- "Error duplicating fd: %s", strerror(errno));
+ error_report("Error duplicating fd: %s", strerror(errno));
return -1;
}
--
1.9.3
- [Qemu-devel] [PATCH v2 00/11] Sprint to the finish: purge QError, Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 06/11] tpm: Avoid qerror_report() outside QMP command handlers, Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 03/11] vl: Use error_report() for --display errors, Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 01/11] QemuOpts: Wean off qerror_report_err(), Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 07/11] qmp: Wean off qerror_report(), Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 11/11] Include monitor/monitor.h exactly where needed, Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 08/11] qerror: Finally unused, clean up, Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 09/11] qerror: Move #include out of qerror.h, Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 02/11] vl: Avoid qerror_report() outside QMP command handlers,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 04/11] qerror: Eliminate QERR_DEVICE_NOT_FOUND, Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 10/11] Include qapi/qmp/qerror.h exactly where needed, Markus Armbruster, 2015/06/16
- [Qemu-devel] [PATCH v2 05/11] qerror: Clean up QERR_ macros to expand into a single string, Markus Armbruster, 2015/06/16
- Re: [Qemu-devel] [PATCH v2 00/11] Sprint to the finish: purge QError, Stefan Hajnoczi, 2015/06/17