monitor: Extract completion declarations to 'monitor/hmp-completion.h'
Many files include "monitor/hmp.h", but few of them really need the completion declarations: move them to a distinct header. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> Message-Id: <20260320160811.28611-2-philmd@linaro.org>
Philippe Mathieu-Daudé committed
Mar 20, 2026 at 10:39 UTC
17dc3ae3e1075307410d74fe42d530002ed1bf91
12 files changed
+51
-21
MAINTAINERS
+2
@@ -3403,6 +3403,8 @@ F: monitor/monitor.c
3403
F: monitor/hmp*
3404
F: hmp.h
3405
F: hmp-commands*.hx
3406
+F: include/monitor/hmp.h
3407
+F: include/monitor/hmp-completion.h
3408
F: include/monitor/hmp-target.h
3409
F: tests/qtest/test-hmp.c
3410
F: include/qemu/qemu-print.h
chardev/char-hmp-cmds.c
+1
@@ -16,6 +16,7 @@
16
#include "qemu/osdep.h"
17
#include "chardev/char.h"
18
#include "monitor/hmp.h"
19
+#include "monitor/hmp-completion.h"
20
#include "monitor/monitor.h"
21
#include "qapi/error.h"
22
#include "qapi/qapi-commands-char.h"
include/monitor/hmp-completion.h
new
+40
@@ -0,0 +1,40 @@
1
+/*
2
+ * Human Monitor Completion handlers
3
+ *
4
+ * Copyright IBM, Corp. 2011
5
+ *
6
+ * Authors:
7
+ * Anthony Liguori <aliguori@us.ibm.com>
8
+ *
9
+ * SPDX-License-Identifier: GPL-2.0-or-later
10
+ */
11
+
12
+#ifndef HMP_COMPLETION_H
13
+#define HMP_COMPLETION_H
14
+
15
+#include "qemu/readline.h"
16
+
17
+void object_add_completion(ReadLineState *rs, int nb_args, const char *str);
18
+void object_del_completion(ReadLineState *rs, int nb_args, const char *str);
19
+void device_add_completion(ReadLineState *rs, int nb_args, const char *str);
20
+void device_del_completion(ReadLineState *rs, int nb_args, const char *str);
21
+void sendkey_completion(ReadLineState *rs, int nb_args, const char *str);
22
+void chardev_remove_completion(ReadLineState *rs, int nb_args, const char *str);
23
+void chardev_add_completion(ReadLineState *rs, int nb_args, const char *str);
24
+void set_link_completion(ReadLineState *rs, int nb_args, const char *str);
25
+void netdev_add_completion(ReadLineState *rs, int nb_args, const char *str);
26
+void netdev_del_completion(ReadLineState *rs, int nb_args, const char *str);
27
+void ringbuf_write_completion(ReadLineState *rs, int nb_args, const char *str);
28
+void info_trace_events_completion(ReadLineState *rs, int nb_args,
29
+ const char *str);
30
+void trace_event_completion(ReadLineState *rs, int nb_args, const char *str);
31
+void watchdog_action_completion(ReadLineState *rs, int nb_args,
32
+ const char *str);
33
+void migrate_set_capability_completion(ReadLineState *rs, int nb_args,
34
+ const char *str);
35
+void migrate_set_parameter_completion(ReadLineState *rs, int nb_args,
36
+ const char *str);
37
+void delvm_completion(ReadLineState *rs, int nb_args, const char *str);
38
+void loadvm_completion(ReadLineState *rs, int nb_args, const char *str);
39
+
40
+#endif
include/monitor/hmp.h
-21
@@ -114,27 +114,6 @@ void hmp_vhost_queue_status(Monitor *mon, const QDict *qdict);
114
void hmp_virtio_queue_element(Monitor *mon, const QDict *qdict);
115
void hmp_xen_event_inject(Monitor *mon, const QDict *qdict);
116
void hmp_xen_event_list(Monitor *mon, const QDict *qdict);
117
-void object_add_completion(ReadLineState *rs, int nb_args, const char *str);
118
-void object_del_completion(ReadLineState *rs, int nb_args, const char *str);
119
-void device_add_completion(ReadLineState *rs, int nb_args, const char *str);
120
-void device_del_completion(ReadLineState *rs, int nb_args, const char *str);
121
-void sendkey_completion(ReadLineState *rs, int nb_args, const char *str);
122
-void chardev_remove_completion(ReadLineState *rs, int nb_args, const char *str);
123
-void chardev_add_completion(ReadLineState *rs, int nb_args, const char *str);
124
-void set_link_completion(ReadLineState *rs, int nb_args, const char *str);
125
-void netdev_add_completion(ReadLineState *rs, int nb_args, const char *str);
126
-void netdev_del_completion(ReadLineState *rs, int nb_args, const char *str);
127
-void ringbuf_write_completion(ReadLineState *rs, int nb_args, const char *str);
128
-void info_trace_events_completion(ReadLineState *rs, int nb_args, const char *str);
129
-void trace_event_completion(ReadLineState *rs, int nb_args, const char *str);
130
-void watchdog_action_completion(ReadLineState *rs, int nb_args,
131
- const char *str);
132
-void migrate_set_capability_completion(ReadLineState *rs, int nb_args,
133
- const char *str);
134
-void migrate_set_parameter_completion(ReadLineState *rs, int nb_args,
135
- const char *str);
136
-void delvm_completion(ReadLineState *rs, int nb_args, const char *str);
137
-void loadvm_completion(ReadLineState *rs, int nb_args, const char *str);
117
void hmp_rocker(Monitor *mon, const QDict *qdict);
118
void hmp_rocker_ports(Monitor *mon, const QDict *qdict);
119
void hmp_rocker_of_dpa_flows(Monitor *mon, const QDict *qdict);
migration/migration-hmp-cmds.c
+1
@@ -17,6 +17,7 @@
17
#include "block/qapi.h"
18
#include "migration/snapshot.h"
19
#include "monitor/hmp.h"
20
+#include "monitor/hmp-completion.h"
21
#include "monitor/monitor.h"
22
#include "qapi/error.h"
23
#include "qapi/qapi-commands-migration.h"
monitor/hmp-target.c
+1
@@ -29,6 +29,7 @@
29
#include "system/device_tree.h"
30
#include "monitor/hmp-target.h"
31
#include "monitor/hmp.h"
32
+#include "monitor/hmp-completion.h"
33
#include "block/block-hmp-cmds.h"
34
#include "qapi/qapi-commands-control.h"
35
#include "qapi/qapi-commands-misc.h"
net/net-hmp-cmds.c
+1
@@ -16,6 +16,7 @@
16
#include "qemu/osdep.h"
17
#include "migration/misc.h"
18
#include "monitor/hmp.h"
19
+#include "monitor/hmp-completion.h"
20
#include "monitor/monitor.h"
21
#include "net/net.h"
22
#include "net/hub.h"
qom/qom-hmp-cmds.c
+1
@@ -8,6 +8,7 @@
8
#include "qemu/osdep.h"
9
#include "hw/core/qdev.h"
10
#include "monitor/hmp.h"
11
+#include "monitor/hmp-completion.h"
12
#include "monitor/monitor.h"
13
#include "qapi/error.h"
14
#include "qapi/qapi-commands-qom.h"
system/qdev-monitor.c
+1
@@ -20,6 +20,7 @@
20
#include "qemu/osdep.h"
21
#include "hw/core/sysbus.h"
22
#include "monitor/hmp.h"
23
+#include "monitor/hmp-completion.h"
24
#include "monitor/monitor.h"
25
#include "monitor/qdev.h"
26
#include "system/arch_init.h"
system/runstate-hmp-cmds.c
+1
@@ -16,6 +16,7 @@
16
#include "qemu/osdep.h"
17
#include "exec/cpu-common.h"
18
#include "monitor/hmp.h"
19
+#include "monitor/hmp-completion.h"
20
#include "monitor/monitor.h"
21
#include "qapi/error.h"
22
#include "qapi/qapi-commands-run-state.h"
trace/trace-hmp-cmds.c
+1
@@ -24,6 +24,7 @@
24
25
#include "qemu/osdep.h"
26
#include "monitor/hmp.h"
27
+#include "monitor/hmp-completion.h"
28
#include "monitor/monitor.h"
29
#include "qapi/error.h"
30
#include "qapi/qapi-commands-trace.h"
ui/ui-hmp-cmds.c
+1
@@ -18,6 +18,7 @@
18
#include <spice/enums.h>
19
#endif
20
#include "monitor/hmp.h"
21
+#include "monitor/hmp-completion.h"
22
#include "monitor/monitor-internal.h"
23
#include "qapi/error.h"
24
#include "qapi/qapi-commands-ui.h"