qapi: Convert set_link
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
parent
ab49ab5c48
commit
4b37156c40
|
@ -1038,8 +1038,7 @@ ETEXI
|
||||||
.args_type = "name:s,up:b",
|
.args_type = "name:s,up:b",
|
||||||
.params = "name on|off",
|
.params = "name on|off",
|
||||||
.help = "change the link status of a network adapter",
|
.help = "change the link status of a network adapter",
|
||||||
.user_print = monitor_user_noop,
|
.mhandler.cmd = hmp_set_link,
|
||||||
.mhandler.cmd_new = do_set_link,
|
|
||||||
},
|
},
|
||||||
|
|
||||||
STEXI
|
STEXI
|
||||||
|
|
10
hmp.c
10
hmp.c
|
@ -601,3 +601,13 @@ void hmp_inject_nmi(Monitor *mon, const QDict *qdict)
|
||||||
qmp_inject_nmi(&errp);
|
qmp_inject_nmi(&errp);
|
||||||
hmp_handle_error(mon, &errp);
|
hmp_handle_error(mon, &errp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void hmp_set_link(Monitor *mon, const QDict *qdict)
|
||||||
|
{
|
||||||
|
const char *name = qdict_get_str(qdict, "name");
|
||||||
|
int up = qdict_get_bool(qdict, "up");
|
||||||
|
Error *errp = NULL;
|
||||||
|
|
||||||
|
qmp_set_link(name, up, &errp);
|
||||||
|
hmp_handle_error(mon, &errp);
|
||||||
|
}
|
||||||
|
|
1
hmp.h
1
hmp.h
|
@ -41,5 +41,6 @@ void hmp_memsave(Monitor *mon, const QDict *qdict);
|
||||||
void hmp_pmemsave(Monitor *mon, const QDict *qdict);
|
void hmp_pmemsave(Monitor *mon, const QDict *qdict);
|
||||||
void hmp_cont(Monitor *mon, const QDict *qdict);
|
void hmp_cont(Monitor *mon, const QDict *qdict);
|
||||||
void hmp_inject_nmi(Monitor *mon, const QDict *qdict);
|
void hmp_inject_nmi(Monitor *mon, const QDict *qdict);
|
||||||
|
void hmp_set_link(Monitor *mon, const QDict *qdict);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
10
net.c
10
net.c
|
@ -34,6 +34,7 @@
|
||||||
#include "monitor.h"
|
#include "monitor.h"
|
||||||
#include "qemu-common.h"
|
#include "qemu-common.h"
|
||||||
#include "qemu_socket.h"
|
#include "qemu_socket.h"
|
||||||
|
#include "qmp-commands.h"
|
||||||
#include "hw/qdev.h"
|
#include "hw/qdev.h"
|
||||||
#include "iov.h"
|
#include "iov.h"
|
||||||
|
|
||||||
|
@ -1258,12 +1259,10 @@ void do_info_network(Monitor *mon)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int do_set_link(Monitor *mon, const QDict *qdict, QObject **ret_data)
|
void qmp_set_link(const char *name, bool up, Error **errp)
|
||||||
{
|
{
|
||||||
VLANState *vlan;
|
VLANState *vlan;
|
||||||
VLANClientState *vc = NULL;
|
VLANClientState *vc = NULL;
|
||||||
const char *name = qdict_get_str(qdict, "name");
|
|
||||||
int up = qdict_get_bool(qdict, "up");
|
|
||||||
|
|
||||||
QTAILQ_FOREACH(vlan, &vlans, next) {
|
QTAILQ_FOREACH(vlan, &vlans, next) {
|
||||||
QTAILQ_FOREACH(vc, &vlan->clients, next) {
|
QTAILQ_FOREACH(vc, &vlan->clients, next) {
|
||||||
|
@ -1280,8 +1279,8 @@ int do_set_link(Monitor *mon, const QDict *qdict, QObject **ret_data)
|
||||||
done:
|
done:
|
||||||
|
|
||||||
if (!vc) {
|
if (!vc) {
|
||||||
qerror_report(QERR_DEVICE_NOT_FOUND, name);
|
error_set(errp, QERR_DEVICE_NOT_FOUND, name);
|
||||||
return -1;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
vc->link_down = !up;
|
vc->link_down = !up;
|
||||||
|
@ -1300,7 +1299,6 @@ done:
|
||||||
if (vc->peer && vc->peer->info->link_status_changed) {
|
if (vc->peer && vc->peer->info->link_status_changed) {
|
||||||
vc->peer->info->link_status_changed(vc->peer);
|
vc->peer->info->link_status_changed(vc->peer);
|
||||||
}
|
}
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void net_cleanup(void)
|
void net_cleanup(void)
|
||||||
|
|
1
net.h
1
net.h
|
@ -122,7 +122,6 @@ int qemu_find_nic_model(NICInfo *nd, const char * const *models,
|
||||||
const char *default_model);
|
const char *default_model);
|
||||||
|
|
||||||
void do_info_network(Monitor *mon);
|
void do_info_network(Monitor *mon);
|
||||||
int do_set_link(Monitor *mon, const QDict *qdict, QObject **ret_data);
|
|
||||||
|
|
||||||
/* NIC info */
|
/* NIC info */
|
||||||
|
|
||||||
|
|
|
@ -979,3 +979,23 @@
|
||||||
# Notes: Only x86 Virtual Machines support this command.
|
# Notes: Only x86 Virtual Machines support this command.
|
||||||
##
|
##
|
||||||
{ 'command': 'inject-nmi' }
|
{ 'command': 'inject-nmi' }
|
||||||
|
|
||||||
|
##
|
||||||
|
# @set_link:
|
||||||
|
#
|
||||||
|
# Sets the link status of a virtual network adapter.
|
||||||
|
#
|
||||||
|
# @name: the device name of the virtual network adapter
|
||||||
|
#
|
||||||
|
# @up: true to set the link status to be up
|
||||||
|
#
|
||||||
|
# Returns: Nothing on success
|
||||||
|
# If @name is not a valid network device, DeviceNotFound
|
||||||
|
#
|
||||||
|
# Since: 0.14.0
|
||||||
|
#
|
||||||
|
# Notes: Not all network adapters support setting link status. This command
|
||||||
|
# will succeed even if the network adapter does not support link status
|
||||||
|
# notification.
|
||||||
|
##
|
||||||
|
{ 'command': 'set_link', 'data': {'name': 'str', 'up': 'bool'} }
|
||||||
|
|
|
@ -730,10 +730,7 @@ EQMP
|
||||||
{
|
{
|
||||||
.name = "set_link",
|
.name = "set_link",
|
||||||
.args_type = "name:s,up:b",
|
.args_type = "name:s,up:b",
|
||||||
.params = "name on|off",
|
.mhandler.cmd_new = qmp_marshal_input_set_link,
|
||||||
.help = "change the link status of a network adapter",
|
|
||||||
.user_print = monitor_user_noop,
|
|
||||||
.mhandler.cmd_new = do_set_link,
|
|
||||||
},
|
},
|
||||||
|
|
||||||
SQMP
|
SQMP
|
||||||
|
|
Loading…
Reference in a new issue