diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2020-02-24 15:30:06 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2020-03-06 17:21:28 +0100 |
| commit | 8e9119a807df510f0d2ce4cdda3078166d6e99a7 (patch) | |
| tree | 95d403e3ab3b873d8a87cec6fd4530dbc2fdffb3 /include/monitor | |
| parent | f27a9bb3e9c3bd822243f6fc1d921f1334e37acf (diff) | |
| download | qemu-8e9119a807df510f0d2ce4cdda3078166d6e99a7.zip qemu-8e9119a807df510f0d2ce4cdda3078166d6e99a7.tar.gz qemu-8e9119a807df510f0d2ce4cdda3078166d6e99a7.tar.bz2 | |
hmp: Fail gracefully if chardev is already in use
Trying to attach a HMP monitor to a chardev that is already in use
results in a crash because monitor_init_hmp() passes &error_abort to
qemu_chr_fe_init():
$ ./x86_64-softmmu/qemu-system-x86_64 --chardev stdio,id=foo --mon foo --mon foo
QEMU 4.2.50 monitor - type 'help' for more information
(qemu) Unexpected error in qemu_chr_fe_init() at chardev/char-fe.c:220:
qemu-system-x86_64: --mon foo: Device 'foo' is in use
Abgebrochen (Speicherabzug geschrieben)
Fix this by allowing monitor_init_hmp() to return an error and passing
any error in qemu_chr_fe_init() to its caller instead of aborting.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20200224143008.13362-19-kwolf@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'include/monitor')
| -rw-r--r-- | include/monitor/monitor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index e55a3b5..ad823b9 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -18,7 +18,7 @@ bool monitor_cur_is_qmp(void); void monitor_init_globals(void); void monitor_init_globals_core(void); void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp); -void monitor_init_hmp(Chardev *chr, bool use_readline); +void monitor_init_hmp(Chardev *chr, bool use_readline, Error **errp); int monitor_init(MonitorOptions *opts, Error **errp); int monitor_init_opts(QemuOpts *opts, Error **errp); void monitor_cleanup(void); |