From ab2d0531b2e41bc5fd8f8e59405f135986599476 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 20 Dec 2013 23:21:09 +0100 Subject: monitor: add object-del (QMP) and object_del (HMP) command These two commands invoke the "unparent" method of Object. Signed-off-by: Paolo Bonzini Reviewed-by: Igor Mammedov Tested-by: Igor Mammedov Signed-off-by: Luiz Capitulino --- hmp-commands.hx | 14 ++++++++++++++ hmp.c | 9 +++++++++ hmp.h | 1 + qapi-schema.json | 14 ++++++++++++++ qmp-commands.hx | 25 +++++++++++++++++++++++++ qmp.c | 14 ++++++++++++++ 6 files changed, 77 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index 929550d66b..4d5e2b5142 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1241,6 +1241,20 @@ STEXI @item netdev_del @findex netdev_del Remove host network device. +ETEXI + + { + .name = "object_del", + .args_type = "id:s", + .params = "id", + .help = "destroy QOM object", + .mhandler.cmd = hmp_object_del, + }, + +STEXI +@item object_del +@findex object_del +Destroy QOM object. ETEXI #ifdef CONFIG_SLIRP diff --git a/hmp.c b/hmp.c index c513f9b685..fe05c6b860 100644 --- a/hmp.c +++ b/hmp.c @@ -1574,3 +1574,12 @@ void hmp_qemu_io(Monitor *mon, const QDict *qdict) hmp_handle_error(mon, &err); } + +void hmp_object_del(Monitor *mon, const QDict *qdict) +{ + const char *id = qdict_get_str(qdict, "id"); + Error *err = NULL; + + qmp_object_del(id, &err); + hmp_handle_error(mon, &err); +} diff --git a/hmp.h b/hmp.h index f92fc8922d..7a11f68a3b 100644 --- a/hmp.h +++ b/hmp.h @@ -90,5 +90,6 @@ void hmp_chardev_add(Monitor *mon, const QDict *qdict); void hmp_chardev_remove(Monitor *mon, const QDict *qdict); void hmp_qemu_io(Monitor *mon, const QDict *qdict); void hmp_cpu_add(Monitor *mon, const QDict *qdict); +void hmp_object_del(Monitor *mon, const QDict *qdict); #endif diff --git a/qapi-schema.json b/qapi-schema.json index c3c939c8c3..af3a83bf0b 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2758,6 +2758,20 @@ ## { 'command': 'netdev_del', 'data': {'id': 'str'} } +## +# @object-del: +# +# Remove a QOM object. +# +# @id: the name of the QOM object to remove +# +# Returns: Nothing on success +# Error if @id is not a valid id for a QOM object +# +# Since: 2.0 +## +{ 'command': 'object-del', 'data': {'id': 'str'} } + ## # @NetdevNoneOptions # diff --git a/qmp-commands.hx b/qmp-commands.hx index fba15cdc3b..71422cd99c 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -878,6 +878,31 @@ Example: EQMP + { + .name = "object-del", + .args_type = "id:s", + .mhandler.cmd_new = qmp_marshal_input_object_del, + }, + +SQMP +object-del +---------- + +Remove QOM object. + +Arguments: + +- "id": the object's ID (json-string) + +Example: + +-> { "execute": "object-del", "arguments": { "id": "rng1" } } +<- { "return": {} } + + +EQMP + + { .name = "block_resize", .args_type = "device:B,size:o", diff --git a/qmp.c b/qmp.c index 1d7a04d7a0..73aab5876c 100644 --- a/qmp.c +++ b/qmp.c @@ -529,3 +529,17 @@ void qmp_add_client(const char *protocol, const char *fdname, error_setg(errp, "protocol '%s' is invalid", protocol); close(fd); } + +void qmp_object_del(const char *id, Error **errp) +{ + Object *container; + Object *obj; + + container = container_get(object_get_root(), "/objects"); + obj = object_resolve_path_component(container, id); + if (!obj) { + error_setg(errp, "object id not found"); + return; + } + object_unparent(obj); +} -- cgit v1.2.1