aboutsummaryrefslogtreecommitdiff
path: root/monitor
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2023-01-24 13:19:29 +0100
committerMarkus Armbruster <armbru@redhat.com>2023-02-04 07:56:54 +0100
commit2030ca36bf1af79c68a4955ff3bf240ec561ec72 (patch)
tree4da159f56182926be8210795234538b76d86e037 /monitor
parent0d79271b5702d27736fd081d8994e857ae8b5db5 (diff)
downloadqemu-2030ca36bf1af79c68a4955ff3bf240ec561ec72.zip
qemu-2030ca36bf1af79c68a4955ff3bf240ec561ec72.tar.gz
qemu-2030ca36bf1af79c68a4955ff3bf240ec561ec72.tar.bz2
net: Move HMP commands from monitor to net/
This moves these commands from MAINTAINERS sections "Human Monitor (HMP)" and "QMP" to "Network device backends". Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20230124121946.1139465-16-armbru@redhat.com>
Diffstat (limited to 'monitor')
-rw-r--r--monitor/hmp-cmds.c61
-rw-r--r--monitor/misc.c56
2 files changed, 0 insertions, 117 deletions
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 2ca869c..90259d0 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -21,17 +21,14 @@
#include "qemu/help_option.h"
#include "monitor/monitor.h"
#include "qapi/error.h"
-#include "qapi/clone-visitor.h"
#include "qapi/qapi-builtin-visit.h"
#include "qapi/qapi-commands-control.h"
#include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-commands-misc.h"
-#include "qapi/qapi-commands-net.h"
#include "qapi/qapi-commands-run-state.h"
#include "qapi/qapi-commands-stats.h"
#include "qapi/qapi-commands-tpm.h"
#include "qapi/qapi-commands-virtio.h"
-#include "qapi/qapi-visit-net.h"
#include "qapi/qapi-visit-migration.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
@@ -575,16 +572,6 @@ void hmp_cont(Monitor *mon, const QDict *qdict)
hmp_handle_error(mon, err);
}
-void hmp_set_link(Monitor *mon, const QDict *qdict)
-{
- const char *name = qdict_get_str(qdict, "name");
- bool up = qdict_get_bool(qdict, "up");
- Error *err = NULL;
-
- qmp_set_link(name, up, &err);
- hmp_handle_error(mon, err);
-}
-
void hmp_loadvm(Monitor *mon, const QDict *qdict)
{
int saved_vm_running = runstate_is_running();
@@ -617,21 +604,6 @@ void hmp_delvm(Monitor *mon, const QDict *qdict)
hmp_handle_error(mon, err);
}
-void hmp_announce_self(Monitor *mon, const QDict *qdict)
-{
- const char *interfaces_str = qdict_get_try_str(qdict, "interfaces");
- const char *id = qdict_get_try_str(qdict, "id");
- AnnounceParameters *params = QAPI_CLONE(AnnounceParameters,
- migrate_announce_params());
-
- qapi_free_strList(params->interfaces);
- params->interfaces = hmp_split_at_comma(interfaces_str);
- params->has_interfaces = params->interfaces != NULL;
- params->id = g_strdup(id);
- qmp_announce_self(params, NULL);
- qapi_free_AnnounceParameters(params);
-}
-
void hmp_migrate_cancel(Monitor *mon, const QDict *qdict)
{
qmp_migrate_cancel(NULL);
@@ -996,39 +968,6 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)
}
}
-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;
- }
-
- netdev_add(opts, &err);
- if (err) {
- qemu_opts_del(opts);
- }
-
-out:
- hmp_handle_error(mon, err);
-}
-
-void hmp_netdev_del(Monitor *mon, const QDict *qdict)
-{
- const char *id = qdict_get_str(qdict, "id");
- Error *err = NULL;
-
- qmp_netdev_del(id, &err);
- hmp_handle_error(mon, err);
-}
-
void hmp_getfd(Monitor *mon, const QDict *qdict)
{
const char *fdname = qdict_get_str(qdict, "fdname");
diff --git a/monitor/misc.c b/monitor/misc.c
index 0cf2518..bf3d863 100644
--- a/monitor/misc.c
+++ b/monitor/misc.c
@@ -1268,21 +1268,6 @@ int get_monitor_def(Monitor *mon, int64_t *pval, const char *name)
return ret;
}
-void netdev_add_completion(ReadLineState *rs, int nb_args, const char *str)
-{
- size_t len;
- int i;
-
- if (nb_args != 2) {
- return;
- }
- len = strlen(str);
- readline_set_completion_index(rs, len);
- for (i = 0; i < NET_CLIENT_DRIVER__MAX; i++) {
- readline_add_completion_of(rs, str, NetClientDriver_str(i));
- }
-}
-
void device_add_completion(ReadLineState *rs, int nb_args, const char *str)
{
GSList *list, *elt;
@@ -1365,47 +1350,6 @@ void device_del_completion(ReadLineState *rs, int nb_args, const char *str)
peripheral_device_del_completion(rs, str);
}
-void set_link_completion(ReadLineState *rs, int nb_args, const char *str)
-{
- size_t len;
-
- len = strlen(str);
- readline_set_completion_index(rs, len);
- if (nb_args == 2) {
- NetClientState *ncs[MAX_QUEUE_NUM];
- int count, i;
- count = qemu_find_net_clients_except(NULL, ncs,
- NET_CLIENT_DRIVER_NONE,
- MAX_QUEUE_NUM);
- for (i = 0; i < MIN(count, MAX_QUEUE_NUM); i++) {
- readline_add_completion_of(rs, str, ncs[i]->name);
- }
- } else if (nb_args == 3) {
- readline_add_completion_of(rs, str, "on");
- readline_add_completion_of(rs, str, "off");
- }
-}
-
-void netdev_del_completion(ReadLineState *rs, int nb_args, const char *str)
-{
- int len, count, i;
- NetClientState *ncs[MAX_QUEUE_NUM];
-
- if (nb_args != 2) {
- return;
- }
-
- len = strlen(str);
- readline_set_completion_index(rs, len);
- count = qemu_find_net_clients_except(NULL, ncs, NET_CLIENT_DRIVER_NIC,
- MAX_QUEUE_NUM);
- for (i = 0; i < MIN(count, MAX_QUEUE_NUM); i++) {
- if (ncs[i]->is_netdev) {
- readline_add_completion_of(rs, str, ncs[i]->name);
- }
- }
-}
-
void watchdog_action_completion(ReadLineState *rs, int nb_args, const char *str)
{
int i;