diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-11-11 05:52:22 -0500 |
|---|---|---|
| committer | Jason Wang <jasowang@redhat.com> | 2020-11-24 10:40:17 +0800 |
| commit | ad6f932fe8d1fc7f37ec17c7520aec68d3ee3706 (patch) | |
| tree | bcc38a02aad021c16fa50df9d448683a3e0d44f6 /monitor | |
| parent | c2cb511634012344e3d0fe49a037a33b12d8a98a (diff) | |
net: do not exit on "netdev_add help" monitor command
"netdev_add help" is causing QEMU to exit because the code that
invokes show_netdevs is shared between CLI and HMP processing.
Move the check to the callers so that exit(0) remains only
in the CLI flow.
"netdev_add help" is not fixed by this patch; that is left for
later work.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'monitor')
| -rw-r--r-- | monitor/hmp-cmds.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index a6a6684df1..65d8ff4849 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -24,6 +24,7 @@ #include "qemu/option.h" #include "qemu/timer.h" #include "qemu/sockets.h" +#include "qemu/help_option.h" #include "monitor/monitor-internal.h" #include "qapi/error.h" #include "qapi/clone-visitor.h" @@ -1631,7 +1632,12 @@ void hmp_netdev_add(Monitor *mon, const QDict *qdict) { Error *err = NULL; QemuOpts *opts; + const char *type = qdict_get_try_str(qdict, "type"); + if (type && is_help_option(type)) { + show_netdevs(); + return; + } opts = qemu_opts_from_qdict(qemu_find_opts("netdev"), qdict, &err); if (err) { goto out; |