qapi: convert netdev_del
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Reviewed-By: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
parent
928059a37b
commit
5f96415527
|
@ -1051,8 +1051,7 @@ ETEXI
|
||||||
.args_type = "id:s",
|
.args_type = "id:s",
|
||||||
.params = "id",
|
.params = "id",
|
||||||
.help = "remove host network device",
|
.help = "remove host network device",
|
||||||
.user_print = monitor_user_noop,
|
.mhandler.cmd = hmp_netdev_del,
|
||||||
.mhandler.cmd_new = do_netdev_del,
|
|
||||||
},
|
},
|
||||||
|
|
||||||
STEXI
|
STEXI
|
||||||
|
|
9
hmp.c
9
hmp.c
|
@ -990,3 +990,12 @@ void hmp_netdev_add(Monitor *mon, const QDict *qdict)
|
||||||
out:
|
out:
|
||||||
hmp_handle_error(mon, &err);
|
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);
|
||||||
|
}
|
||||||
|
|
1
hmp.h
1
hmp.h
|
@ -63,5 +63,6 @@ void hmp_migrate(Monitor *mon, const QDict *qdict);
|
||||||
void hmp_device_del(Monitor *mon, const QDict *qdict);
|
void hmp_device_del(Monitor *mon, const QDict *qdict);
|
||||||
void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict);
|
void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict);
|
||||||
void hmp_netdev_add(Monitor *mon, const QDict *qdict);
|
void hmp_netdev_add(Monitor *mon, const QDict *qdict);
|
||||||
|
void hmp_netdev_del(Monitor *mon, const QDict *qdict);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
11
net.c
11
net.c
|
@ -1269,19 +1269,18 @@ exit_err:
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int do_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret_data)
|
void qmp_netdev_del(const char *id, Error **errp)
|
||||||
{
|
{
|
||||||
const char *id = qdict_get_str(qdict, "id");
|
|
||||||
VLANClientState *vc;
|
VLANClientState *vc;
|
||||||
|
|
||||||
vc = qemu_find_netdev(id);
|
vc = qemu_find_netdev(id);
|
||||||
if (!vc) {
|
if (!vc) {
|
||||||
qerror_report(QERR_DEVICE_NOT_FOUND, id);
|
error_set(errp, QERR_DEVICE_NOT_FOUND, id);
|
||||||
return -1;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
qemu_del_vlan_client(vc);
|
qemu_del_vlan_client(vc);
|
||||||
qemu_opts_del(qemu_opts_find(qemu_find_opts("netdev"), id));
|
qemu_opts_del(qemu_opts_find(qemu_find_opts_err("netdev", errp), id));
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void print_net_client(Monitor *mon, VLANClientState *vc)
|
static void print_net_client(Monitor *mon, VLANClientState *vc)
|
||||||
|
|
1
net.h
1
net.h
|
@ -172,7 +172,6 @@ void net_host_device_add(Monitor *mon, const QDict *qdict);
|
||||||
void net_host_device_remove(Monitor *mon, const QDict *qdict);
|
void net_host_device_remove(Monitor *mon, const QDict *qdict);
|
||||||
void netdev_add(QemuOpts *opts, Error **errp);
|
void netdev_add(QemuOpts *opts, Error **errp);
|
||||||
int qmp_netdev_add(Monitor *mon, const QDict *qdict, QObject **ret);
|
int qmp_netdev_add(Monitor *mon, const QDict *qdict, QObject **ret);
|
||||||
int do_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret_data);
|
|
||||||
|
|
||||||
#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
|
#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
|
||||||
#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
|
#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
|
||||||
|
|
|
@ -1826,3 +1826,17 @@
|
||||||
{ 'command': 'netdev_add',
|
{ 'command': 'netdev_add',
|
||||||
'data': {'type': 'str', 'id': 'str', '*props': '**'},
|
'data': {'type': 'str', 'id': 'str', '*props': '**'},
|
||||||
'gen': 'no' }
|
'gen': 'no' }
|
||||||
|
|
||||||
|
##
|
||||||
|
# @netdev_del:
|
||||||
|
#
|
||||||
|
# Remove a network backend.
|
||||||
|
#
|
||||||
|
# @id: the name of the network backend to remove
|
||||||
|
#
|
||||||
|
# Returns: Nothing on success
|
||||||
|
# If @id is not a valid network backend, DeviceNotFound
|
||||||
|
#
|
||||||
|
# Since: 0.14.0
|
||||||
|
##
|
||||||
|
{ 'command': 'netdev_del', 'data': {'id': 'str'} }
|
||||||
|
|
|
@ -671,10 +671,7 @@ EQMP
|
||||||
{
|
{
|
||||||
.name = "netdev_del",
|
.name = "netdev_del",
|
||||||
.args_type = "id:s",
|
.args_type = "id:s",
|
||||||
.params = "id",
|
.mhandler.cmd_new = qmp_marshal_input_netdev_del,
|
||||||
.help = "remove host network device",
|
|
||||||
.user_print = monitor_user_noop,
|
|
||||||
.mhandler.cmd_new = do_netdev_del,
|
|
||||||
},
|
},
|
||||||
|
|
||||||
SQMP
|
SQMP
|
||||||
|
|
Loading…
Reference in New Issue