From de1cc36e1039faf65b1739d28bef9f2a4e230eb6 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 6 Feb 2013 21:27:25 +0100 Subject: [PATCH] qemu-char: Support suffixed ringbuf size arguments like "size=64K" Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Signed-off-by: Anthony Liguori --- qemu-char.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 8a3540389a..a3ba02127f 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -98,7 +98,6 @@ #include "ui/qemu-spice.h" #define READ_BUF_LEN 4096 -#define CBUFF_SIZE 65536 /***********************************************************/ /* character device */ @@ -2709,9 +2708,9 @@ static CharDriverState *qemu_chr_open_ringbuf(QemuOpts *opts) chr = g_malloc0(sizeof(CharDriverState)); d = g_malloc(sizeof(*d)); - d->size = qemu_opt_get_number(opts, "size", 0); + d->size = qemu_opt_get_size(opts, "size", 0); if (d->size == 0) { - d->size = CBUFF_SIZE; + d->size = 65536; } /* The size must be power of 2 */ @@ -3244,7 +3243,7 @@ QemuOptsList qemu_chardev_opts = { .type = QEMU_OPT_NUMBER, },{ .name = "size", - .type = QEMU_OPT_NUMBER, + .type = QEMU_OPT_SIZE, }, { /* end of list */ } },