qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Luiz Capitulino <lcapitulino@redhat.com>
To: peter.maydell@linaro.org
Cc: qemu-devel@nongnu.org, anthony@codemonkey.ws
Subject: [Qemu-devel] [PULL 08/17] monitor: Add ringbuf_write and ringbuf_read argument completion
Date: Wed, 11 Jun 2014 10:50:53 -0400	[thread overview]
Message-ID: <1402498262-20521-9-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1402498262-20521-1-git-send-email-lcapitulino@redhat.com>

From: Hani Benhabiles <kroosec@gmail.com>

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>
---
 hmp-commands.hx       |  2 ++
 hmp.h                 |  2 ++
 include/sysemu/char.h |  3 +--
 monitor.c             | 39 +++++++++++++++++++++++++++++++++++++++
 qemu-char.c           |  2 +-
 5 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/hmp-commands.hx b/hmp-commands.hx
index 2e462c0..dcec5ef 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -852,6 +852,7 @@ ETEXI
         .params     = "device data",
         .help       = "Write to a ring buffer character device",
         .mhandler.cmd = hmp_ringbuf_write,
+        .command_completion = ringbuf_write_completion,
     },
 
 STEXI
@@ -868,6 +869,7 @@ ETEXI
         .params     = "device size",
         .help       = "Read from a ring buffer character device",
         .mhandler.cmd = hmp_ringbuf_read,
+        .command_completion = ringbuf_write_completion,
     },
 
 STEXI
diff --git a/hmp.h b/hmp.h
index aba59e9..212e5d2 100644
--- a/hmp.h
+++ b/hmp.h
@@ -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 netdev_add_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
diff --git a/include/sysemu/char.h b/include/sysemu/char.h
index b81a6ff..7f5eeb3 100644
--- a/include/sysemu/char.h
+++ b/include/sysemu/char.h
@@ -286,9 +286,8 @@ void qemu_chr_add_handlers(CharDriverState *s,
 void qemu_chr_be_generic_open(CharDriverState *s);
 void qemu_chr_accept_input(CharDriverState *s);
 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);
+bool chr_is_ringbuf(const CharDriverState *chr);
 
 QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename);
 
diff --git a/monitor.c b/monitor.c
index 0565816..e539e40 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4412,6 +4412,45 @@ void chardev_remove_completion(ReadLineState *rs, int nb_args, const char *str)
     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)
 {
     size_t len;
diff --git a/qemu-char.c b/qemu-char.c
index 17b476e..4c04bbc 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2849,7 +2849,7 @@ fail:
     return NULL;
 }
 
-static bool chr_is_ringbuf(const CharDriverState *chr)
+bool chr_is_ringbuf(const CharDriverState *chr)
 {
     return chr->chr_write == ringbuf_chr_write;
 }
-- 
1.9.3

  parent reply	other threads:[~2014-06-11 14:51 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-11 14:50 [Qemu-devel] [PULL 00/17] QMP queue Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 01/17] dump: fill in the flat header signature more pleasingly to the eye Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 02/17] dump: simplify write_start_flat_header() Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 03/17] dump: eliminate DumpState.page_shift ("guest's page shift") Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 04/17] dump: eliminate DumpState.page_size ("guest's page size") Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 05/17] dump: select header bitness based on ELF class, not ELF architecture Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 06/17] dump: hoist lzo_init() from get_len_buf_out() to dump_init() Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 07/17] dump: simplify get_len_buf_out() Luiz Capitulino
2014-06-11 14:50 ` Luiz Capitulino [this message]
2014-06-11 14:50 ` [Qemu-devel] [PULL 09/17] monitor: Add watchdog_action argument completion Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 10/17] monitor: Add migrate_set_capability completion Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 11/17] net: Export valid host network devices list Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 12/17] monitor: Add host_net_add device argument completion Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 13/17] readline: Make completion strings always unique Luiz Capitulino
2014-06-11 14:50 ` [Qemu-devel] [PULL 14/17] monitor: Add host_net_remove arguments completion Luiz Capitulino
2014-06-11 14:51 ` [Qemu-devel] [PULL 15/17] monitor: Add delvm and loadvm argument completion Luiz Capitulino
2014-06-11 14:51 ` [Qemu-devel] [PULL 16/17] readline: Clear screen on form feed Luiz Capitulino
2014-06-11 14:51 ` [Qemu-devel] [PULL 17/17] json-parser: drop superfluous assignment for token variable Luiz Capitulino
2014-06-11 21:03 ` [Qemu-devel] [PULL 00/17] QMP queue Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1402498262-20521-9-git-send-email-lcapitulino@redhat.com \
    --to=lcapitulino@redhat.com \
    --cc=anthony@codemonkey.ws \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).