xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2025-02-02 02:04:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

monitor: Add ringbuf_write and ringbuf_read argument completion

Browse Source 
Export chr_is_ringbuf() function. Also remove left-over function prototypes
while at it.

Signed-off-by: Hani Benhabiles <hani@linux.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Hani Benhabiles 2014-05-27 23:39:30 +01:00 committed by Luiz Capitulino
parent b87ef3518b
commit 8e5977797d
5 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hmp-commands.hx
View File

@ -852,6 +852,7 @@ ETEXI
.params = "device data", .params = "device data",
.help = "Write to a ring buffer character device", .help = "Write to a ring buffer character device",
.mhandler.cmd = hmp_ringbuf_write, .mhandler.cmd = hmp_ringbuf_write,
.command_completion = ringbuf_write_completion,
}, },
STEXI STEXI
@ -868,6 +869,7 @@ ETEXI
.params = "device size", .params = "device size",
.help = "Read from a ring buffer character device", .help = "Read from a ring buffer character device",
.mhandler.cmd = hmp_ringbuf_read, .mhandler.cmd = hmp_ringbuf_read,
.command_completion = ringbuf_write_completion,
}, },
STEXI STEXI

2
hmp.h
View File

@ -103,5 +103,7 @@ void chardev_add_completion(ReadLineState *rs, int nb_args, const char *str);
void set_link_completion(ReadLineState *rs, int nb_args, const char *str); void set_link_completion(ReadLineState *rs, int nb_args, const char *str);
void netdev_add_completion(ReadLineState *rs, int nb_args, const char *str); void netdev_add_completion(ReadLineState *rs, int nb_args, const char *str);
void netdev_del_completion(ReadLineState *rs, int nb_args, const char *str); void netdev_del_completion(ReadLineState *rs, int nb_args, const char *str);
void ringbuf_write_completion(ReadLineState *rs, int nb_args, const char *str);
void ringbuf_read_completion(ReadLineState *rs, int nb_args, const char *str);
#endif #endif

3
include/sysemu/char.h
View File

@ -286,9 +286,8 @@ void qemu_chr_add_handlers(CharDriverState *s,
void qemu_chr_be_generic_open(CharDriverState *s); void qemu_chr_be_generic_open(CharDriverState *s);
void qemu_chr_accept_input(CharDriverState *s); void qemu_chr_accept_input(CharDriverState *s);
int qemu_chr_add_client(CharDriverState *s, int fd); int qemu_chr_add_client(CharDriverState *s, int fd);
void qemu_chr_info_print(Monitor *mon, const QObject *ret_data);
void qemu_chr_info(Monitor *mon, QObject **ret_data);
CharDriverState *qemu_chr_find(const char *name); CharDriverState *qemu_chr_find(const char *name);
bool chr_is_ringbuf(const CharDriverState *chr);
QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename); QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename);

39
monitor.c
View File

@ -4412,6 +4412,45 @@ void chardev_remove_completion(ReadLineState *rs, int nb_args, const char *str)
qapi_free_ChardevInfoList(start); qapi_free_ChardevInfoList(start);
} }
static void ringbuf_completion(ReadLineState *rs, const char *str)
{
size_t len;
ChardevInfoList *list, *start;
len = strlen(str);
readline_set_completion_index(rs, len);
start = list = qmp_query_chardev(NULL);
while (list) {
ChardevInfo *chr_info = list->value;
if (!strncmp(chr_info->label, str, len)) {
CharDriverState *chr = qemu_chr_find(chr_info->label);
if (chr && chr_is_ringbuf(chr)) {
readline_add_completion(rs, chr_info->label);
}
}
list = list->next;
}
qapi_free_ChardevInfoList(start);
}
void ringbuf_read_completion(ReadLineState *rs, int nb_args, const char *str)
{
if (nb_args != 2) {
return;
}
ringbuf_completion(rs, str);
}
void ringbuf_write_completion(ReadLineState *rs, int nb_args, const char *str)
{
if (nb_args != 2) {
return;
}
ringbuf_completion(rs, str);
}
void device_del_completion(ReadLineState *rs, int nb_args, const char *str) void device_del_completion(ReadLineState *rs, int nb_args, const char *str)
{ {
size_t len; size_t len;

2
qemu-char.c
View File

@ -2849,7 +2849,7 @@ fail:
return NULL; return NULL;
} }
static bool chr_is_ringbuf(const CharDriverState *chr) bool chr_is_ringbuf(const CharDriverState *chr)
{ {
return chr->chr_write == ringbuf_chr_write; return chr->chr_write == ringbuf_chr_write;
} }