diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-10 14:34:32 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-10 14:34:32 -0500 |
| commit | c170a23ca0097a95b44fc7cc604018cd3c3b7d44 (patch) | |
| tree | 804bd99545123456168886337c520707bd77ea2b /qemu-char.c | |
| parent | 51455c59ddc370612f6e070d8eb0e594aaa7ef24 (diff) | |
| parent | 5e2ac5191772dea782ff78e95edd395985273019 (diff) | |
Merge remote-tracking branch 'luiz/queue/qmp' into staging
# By Kevin Wolf (4) and others
# Via Luiz Capitulino
* luiz/queue/qmp:
add timestamp to error_report()
qapi-schema: Use existing type for drive-backup arguments
qapi-schema: Use BlockdevSnapshot type for blockdev-snapshot-sync
qapi.py: Allow top-level type reference for command definitions
qapi.py: Avoid code duplication
qemu-char: Fix ringbuf option size
Message-id: 1373478767-20965-1-git-send-email-lcapitulino@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qemu-char.c')
| -rw-r--r-- | qemu-char.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-char.c b/qemu-char.c index 18c42a39da..800d6a62f9 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3115,7 +3115,7 @@ static void qemu_chr_parse_memory(QemuOpts *opts, ChardevBackend *backend, backend->memory = g_new0(ChardevMemory, 1); - val = qemu_opt_get_number(opts, "size", 0); + val = qemu_opt_get_size(opts, "size", 0); if (val != 0) { backend->memory->has_size = true; backend->memory->size = val; |