Message ID | 1434205258-1932-3-git-send-email-armbru@redhat.com |
---|---|
State | New |
Headers | show |
On 06/13/2015 08:20 AM, Markus Armbruster wrote: > 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> > --- > vl.c | 23 +++++++++-------------- > 1 file changed, 9 insertions(+), 14 deletions(-) > > #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"); Pre-existing, but s/request/requested/ would sound better while touching this. Either way, Reviewed-by: Eric Blake <eblake@redhat.com>
Eric Blake <eblake@redhat.com> writes: > On 06/13/2015 08:20 AM, Markus Armbruster wrote: >> 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> >> --- >> vl.c | 23 +++++++++-------------- >> 1 file changed, 9 insertions(+), 14 deletions(-) >> > >> #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"); > > Pre-existing, but s/request/requested/ would sound better while touching > this. The full error message is qemu-kvm-x86_64: -sandbox on: sandboxing request but seccomp is not compiled into this build I think qemu-kvm-x86_64: -sandbox on: seccomp is not compiled into this build would do just fine. I guess I'd happily squash that into a shorter patch, but this one is big enough for me to prefer a separate patch. > Either way, > Reviewed-by: Eric Blake <eblake@redhat.com> Thanks!
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; }
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> --- vl.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)