From patchwork Tue May 27 22:39:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hani Benhabiles X-Patchwork-Id: 353183 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 99F5F1400A8 for ; Wed, 28 May 2014 08:40:30 +1000 (EST) Received: from localhost ([::1]:38526 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpQ2m-0006N0-GL for incoming@patchwork.ozlabs.org; Tue, 27 May 2014 18:40:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49118) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpQ2F-0005QQ-BV for qemu-devel@nongnu.org; Tue, 27 May 2014 18:40:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WpQ28-0002zU-LF for qemu-devel@nongnu.org; Tue, 27 May 2014 18:39:55 -0400 Received: from mail-we0-x235.google.com ([2a00:1450:400c:c03::235]:58078) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WpQ28-0002z0-BX for qemu-devel@nongnu.org; Tue, 27 May 2014 18:39:48 -0400 Received: by mail-we0-f181.google.com with SMTP id w61so10135529wes.26 for ; Tue, 27 May 2014 15:39:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=A64iun4xU1Fj7NMiD4WvEhMzuv91cifnaDdBESLtSGQ=; b=IX/8bfqqUKNEvOV/g3Qn01QbQTWA3lRZwDbGmi8c33goiYekdqnQUyW32bvGEHAn+y YmHU+jUsgxWz5KdohOIOWtpRXizlq+ABjr1JYWKlCO5Tmbhpo16I8ee1Zt/6Z18gVEY0 dLsoOx4TRMcJR0vgUou+GjsgdQ6iNjNO1zYA0dGvG9HJDbiCdFiCJjJmCNgKMKaw69xK kms7zBQMb+asoqJZYZ3onTwEg2mNkgukwDoOV0Sjt6Chn6vQ4MI/6Y1tOeFm9LvNHPb8 st6L43AEj1smv4bjjRnTcnPiZxoFt/xsf5uUkoAn7x/Y/Omi0Fze7SFTt/niRCN0cb3C Y1rA== X-Received: by 10.194.88.106 with SMTP id bf10mr46353798wjb.26.1401230387450; Tue, 27 May 2014 15:39:47 -0700 (PDT) Received: from localhost.localdomain ([41.109.242.35]) by mx.google.com with ESMTPSA id gp6sm10172133wib.12.2014.05.27.15.39.45 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 27 May 2014 15:39:46 -0700 (PDT) From: Hani Benhabiles To: qemu-devel@nongnu.org Date: Tue, 27 May 2014 23:39:30 +0100 Message-Id: <1401230377-14778-2-git-send-email-kroosec@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1401230377-14778-1-git-send-email-kroosec@gmail.com> References: <1401230377-14778-1-git-send-email-kroosec@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c03::235 Cc: kwolf@redhat.com, mst@redhat.com, mdroth@linux.vnet.ibm.com, lcapitulino@redhat.com, kraxel@redhat.com, stefanha@redhat.com, imammedo@redhat.com Subject: [Qemu-devel] [PATCHv2 1/8] monitor: Add ringbuf_write and ringbuf_read argument completion. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Export chr_is_ringbuf() function. Also remove left-over function prototypes while at it. Signed-off-by: Hani Benhabiles --- 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 593679a..93eb6d8 100644 --- a/monitor.c +++ b/monitor.c @@ -4411,6 +4411,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; }