mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-07-08 20:17:27 +00:00
hmp: add hmp analogue for qmp-chardev-change
Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Message-Id: <1499342940-56739-11-git-send-email-anton.nefedov@virtuozzo.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
7b5a9e453e
commit
75b601602b
|
@ -567,7 +567,7 @@ static const char *chardev_alias_translate(const char *name)
|
|||
return name;
|
||||
}
|
||||
|
||||
static ChardevBackend *qemu_chr_parse_opts(QemuOpts *opts, Error **errp)
|
||||
ChardevBackend *qemu_chr_parse_opts(QemuOpts *opts, Error **errp)
|
||||
{
|
||||
Error *local_err = NULL;
|
||||
const ChardevClass *cc;
|
||||
|
|
|
@ -1726,7 +1726,23 @@ ETEXI
|
|||
STEXI
|
||||
@item chardev-add args
|
||||
@findex chardev-add
|
||||
chardev_add accepts the same parameters as the -chardev command line switch.
|
||||
chardev-add accepts the same parameters as the -chardev command line switch.
|
||||
|
||||
ETEXI
|
||||
|
||||
{
|
||||
.name = "chardev-change",
|
||||
.args_type = "id:s,args:s",
|
||||
.params = "id args",
|
||||
.help = "change chardev",
|
||||
.cmd = hmp_chardev_change,
|
||||
},
|
||||
|
||||
STEXI
|
||||
@item chardev-change args
|
||||
@findex chardev-change
|
||||
chardev-change accepts existing chardev @var{id} and then the same arguments
|
||||
as the -chardev command line switch (except for "id").
|
||||
|
||||
ETEXI
|
||||
|
||||
|
|
34
hmp.c
34
hmp.c
|
@ -2197,6 +2197,40 @@ void hmp_chardev_add(Monitor *mon, const QDict *qdict)
|
|||
hmp_handle_error(mon, &err);
|
||||
}
|
||||
|
||||
void hmp_chardev_change(Monitor *mon, const QDict *qdict)
|
||||
{
|
||||
const char *args = qdict_get_str(qdict, "args");
|
||||
const char *id;
|
||||
Error *err = NULL;
|
||||
ChardevBackend *backend = NULL;
|
||||
ChardevReturn *ret = NULL;
|
||||
QemuOpts *opts = qemu_opts_parse_noisily(qemu_find_opts("chardev"), args,
|
||||
true);
|
||||
if (!opts) {
|
||||
error_setg(&err, "Parsing chardev args failed");
|
||||
goto end;
|
||||
}
|
||||
|
||||
id = qdict_get_str(qdict, "id");
|
||||
if (qemu_opts_id(opts)) {
|
||||
error_setg(&err, "Unexpected 'id' parameter");
|
||||
goto end;
|
||||
}
|
||||
|
||||
backend = qemu_chr_parse_opts(opts, &err);
|
||||
if (!backend) {
|
||||
goto end;
|
||||
}
|
||||
|
||||
ret = qmp_chardev_change(id, backend, &err);
|
||||
|
||||
end:
|
||||
qapi_free_ChardevReturn(ret);
|
||||
qapi_free_ChardevBackend(backend);
|
||||
qemu_opts_del(opts);
|
||||
hmp_handle_error(mon, &err);
|
||||
}
|
||||
|
||||
void hmp_chardev_remove(Monitor *mon, const QDict *qdict)
|
||||
{
|
||||
Error *local_err = NULL;
|
||||
|
|
1
hmp.h
1
hmp.h
|
@ -102,6 +102,7 @@ void hmp_nbd_server_start(Monitor *mon, const QDict *qdict);
|
|||
void hmp_nbd_server_add(Monitor *mon, const QDict *qdict);
|
||||
void hmp_nbd_server_stop(Monitor *mon, const QDict *qdict);
|
||||
void hmp_chardev_add(Monitor *mon, const QDict *qdict);
|
||||
void hmp_chardev_change(Monitor *mon, const QDict *qdict);
|
||||
void hmp_chardev_remove(Monitor *mon, const QDict *qdict);
|
||||
void hmp_chardev_send_break(Monitor *mon, const QDict *qdict);
|
||||
void hmp_qemu_io(Monitor *mon, const QDict *qdict);
|
||||
|
|
|
@ -80,6 +80,16 @@ Chardev *qemu_chr_new_from_opts(QemuOpts *opts,
|
|||
*/
|
||||
void qemu_chr_parse_common(QemuOpts *opts, ChardevCommon *backend);
|
||||
|
||||
/**
|
||||
* @qemu_chr_parse_opts:
|
||||
*
|
||||
* Parse the options to the ChardevBackend struct.
|
||||
*
|
||||
* Returns: a new backend or NULL on error
|
||||
*/
|
||||
ChardevBackend *qemu_chr_parse_opts(QemuOpts *opts,
|
||||
Error **errp);
|
||||
|
||||
/**
|
||||
* @qemu_chr_new:
|
||||
*
|
||||
|
|
|
@ -23,6 +23,7 @@ static const char *hmp_cmds[] = {
|
|||
"boot_set ndc",
|
||||
"chardev-add null,id=testchardev1",
|
||||
"chardev-send-break testchardev2",
|
||||
"chardev-change testchardev1 ringbuf",
|
||||
"chardev-remove testchardev1",
|
||||
"commit all",
|
||||
"cpu-add 1",
|
||||
|
|
Loading…
Reference in New Issue
Block a user