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

char: don't exit on hmp 'chardev-add help'

Browse Source 
qemu_chr_new_from_opts() is used from both vl.c and hmp,
and it is quite confusing to see qemu suddenly exit after receiving a help
option in hmp.

Do exit(0) from vl.c instead.

Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com>
Message-Id: <1500977081-120929-1-git-send-email-anton.nefedov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Anton Nefedov 2017-07-25 13:04:41 +03:00 committed by Paolo Bonzini
parent 4db0db1fa6
commit 0ec846bfac
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chardev/char.c
View File

@ -620,7 +620,7 @@ Chardev *qemu_chr_new_from_opts(QemuOpts *opts, Error **errp)
error_report("Available chardev backend types: %s", str->str); error_report("Available chardev backend types: %s", str->str);
g_string_free(str, true); g_string_free(str, true);
exit(0); return NULL;
} }
if (id == NULL) { if (id == NULL) {

4
include/chardev/char.h
View File

@ -65,7 +65,9 @@ struct Chardev {
* *
* @opts see qemu-config.c for a list of valid options * @opts see qemu-config.c for a list of valid options
* *
* Returns: a new character backend * Returns: on success: a new character backend
* otherwise: NULL; @errp specifies the error
* or left untouched in case of help option
*/ */
Chardev *qemu_chr_new_from_opts(QemuOpts *opts, Chardev *qemu_chr_new_from_opts(QemuOpts *opts,
Error **errp); Error **errp);

10
vl.c
View File

@ -2344,10 +2344,12 @@ static int chardev_init_func(void *opaque, QemuOpts *opts, Error **errp)
{ {
Error *local_err = NULL; Error *local_err = NULL;
qemu_chr_new_from_opts(opts, &local_err); if (!qemu_chr_new_from_opts(opts, &local_err)) {
if (local_err) { if (local_err) {
error_report_err(local_err); error_report_err(local_err);
return -1; return -1;
}
exit(0);
} }
return 0; return 0;
} }