Signed-off-by: Lei Li <li...@linux.vnet.ibm.com>
---
qemu-char.c | 24 ++++++++++++++++++++++++
qemu-config.c | 3 +++
qemu-options.hx | 10 ++++++++++
3 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index ff6651b..36f4ecc 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -99,6 +99,7 @@
#include "ui/qemu-spice.h"
#define READ_BUF_LEN 4096
+#define CBUFF_SIZE 65536
/***********************************************************/
/* character device */
@@ -2647,6 +2648,23 @@ size_t qemu_chr_mem_osize(const CharDriverState *chr)
return d->cbuf_count;
}
+static CharDriverState *qemu_chr_open_memchr(QemuOpts *opts)
+{
+ CharDriverState *chr;
+ size_t capacity;
+
+ chr = g_malloc0(sizeof(CharDriverState));
+
+ capacity = qemu_opt_get_number(opts, "maxcapacity", 0);
+ if (capacity == 0) {
+ capacity = CBUFF_SIZE;
+ }
+
+ qemu_chr_init_mem(chr, capacity);
+
+ return chr;
+}
+
void qmp_memchar_write(const char *chardev, int64_t size,
const char *data, bool has_format,
enum DataFormat format,
@@ -2779,6 +2797,11 @@ QemuOpts *qemu_chr_parse_compat(const char *label, const
char *filename)
qemu_opt_set(opts, "path", p);
return opts;
}
+ if (strstart(filename, "memchr", &p)) {
+ qemu_opt_set(opts, "backend", "memchr");
+ qemu_opt_set(opts, "maxcapacity", p);
+ return opts;
+ }
if (strstart(filename, "tcp:", &p) ||
strstart(filename, "telnet:", &p)) {
if (sscanf(p, "%64[^:]:%32[^,]%n", host, port, &pos) < 2) {
@@ -2852,6 +2875,7 @@ static const struct {
{ .name = "udp", .open = qemu_chr_open_udp },
{ .name = "msmouse", .open = qemu_chr_open_msmouse },
{ .name = "vc", .open = text_console_init },
+ { .name = "memchr", .open = qemu_chr_open_memchr },
#ifdef _WIN32
{ .name = "file", .open = qemu_chr_open_win_file_out },
{ .name = "pipe", .open = qemu_chr_open_win_pipe },
diff --git a/qemu-config.c b/qemu-config.c
index c05ffbc..7118d0e 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -114,6 +114,9 @@ static QemuOptsList qemu_drive_opts = {
.name = "copy-on-read",
.type = QEMU_OPT_BOOL,
.help = "copy read data from backing file into image file",
+ },{
+ .name = "max-capacity",
+ .type = QEMU_OPT_NUMBER,
},
{ /* end of list */ }
},
diff --git a/qemu-options.hx b/qemu-options.hx
index 3c411c4..1ccf295 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1647,6 +1647,7 @@ DEF("chardev", HAS_ARG, QEMU_OPTION_chardev,
"-chardev msmouse,id=id[,mux=on|off]\n"
"-chardev
vc,id=id[[,width=width][,height=height]][[,cols=cols][,rows=rows]]\n"
" [,mux=on|off]\n"
+ "-chardev memchr,id=id,max-capacity=max-capacity\n"
"-chardev file,id=id,path=path[,mux=on|off]\n"
"-chardev pipe,id=id,path=path[,mux=on|off]\n"
#ifdef _WIN32
@@ -1685,6 +1686,7 @@ Backend is one of:
@option{udp},
@option{msmouse},
@option{vc},
+@option{memchr},
@option{file},
@option{pipe},
@option{console},
@@ -1791,6 +1793,14 @@ the console, in pixels.
@option{cols} and @option{rows} specify that the console be sized to fit a text
console with the given dimensions.
+@item -chardev memchr ,id=@var{id} ,max-capacity=@var{max-capacity}
+
+Create a circular buffer with fixed size indicated by optionally
@option{max-capacity}
+which will be default 64K if it is not given.
+
+@option{max-capacity} specify the max capacity of the size of circular buffer
+want to create.
+
@item -chardev file ,id=@var{id} ,path=@var{path}
Log all traffic received from the guest to a file.
--
1.7.7.6
