mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vl: Avoid qerror_report() outside QMP command handlers

Browse Source 
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 <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Markus Armbruster 2015-02-27 09:47:12 +01:00
parent 70b9433109
commit 1459407e88
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
vl.c
View File

@ -990,13 +990,13 @@ static int parse_sandbox(void *opaque, QemuOpts *opts, Error **errp)
if (qemu_opt_get_bool(opts, "enable", false)) { if (qemu_opt_get_bool(opts, "enable", false)) {
#ifdef CONFIG_SECCOMP #ifdef CONFIG_SECCOMP
if (seccomp_start() < 0) { if (seccomp_start() < 0) {
qerror_report(ERROR_CLASS_GENERIC_ERROR, error_report("failed to install seccomp syscall filter "
"failed to install seccomp syscall filter in the kernel"); "in the kernel");
return -1; return -1;
} }
#else #else
qerror_report(ERROR_CLASS_GENERIC_ERROR, error_report("sandboxing request but seccomp is not compiled "
"sandboxing request but seccomp is not compiled into this build"); "into this build");
return -1; return -1;
#endif #endif
} }
@ -1044,14 +1044,12 @@ static int parse_add_fd(void *opaque, QemuOpts *opts, Error **errp)
fd_opaque = qemu_opt_get(opts, "opaque"); fd_opaque = qemu_opt_get(opts, "opaque");
if (fd < 0) { if (fd < 0) {
qerror_report(ERROR_CLASS_GENERIC_ERROR, error_report("fd option is required and must be non-negative");
"fd option is required and must be non-negative");
return -1; return -1;
} }
if (fd <= STDERR_FILENO) { if (fd <= STDERR_FILENO) {
qerror_report(ERROR_CLASS_GENERIC_ERROR, error_report("fd cannot be a standard I/O stream");
"fd cannot be a standard I/O stream");
return -1; return -1;
} }
@ -1061,14 +1059,12 @@ static int parse_add_fd(void *opaque, QemuOpts *opts, Error **errp)
*/ */
flags = fcntl(fd, F_GETFD); flags = fcntl(fd, F_GETFD);
if (flags == -1 || (flags & FD_CLOEXEC)) { if (flags == -1 || (flags & FD_CLOEXEC)) {
qerror_report(ERROR_CLASS_GENERIC_ERROR, error_report("fd is not valid or already in use");
"fd is not valid or already in use");
return -1; return -1;
} }
if (fdset_id < 0) { if (fdset_id < 0) {
qerror_report(ERROR_CLASS_GENERIC_ERROR, error_report("set option is required and must be non-negative");
"set option is required and must be non-negative");
return -1; return -1;
} }
@ -1081,8 +1077,7 @@ static int parse_add_fd(void *opaque, QemuOpts *opts, Error **errp)
} }
#endif #endif
if (dupfd == -1) { if (dupfd == -1) {
qerror_report(ERROR_CLASS_GENERIC_ERROR, error_report("Error duplicating fd: %s", strerror(errno));
"Error duplicating fd: %s", strerror(errno));
return -1; return -1;
} }