diff options
| author | Olga Krishtal <okrishtal@virtuozzo.com> | 2015-12-04 09:42:04 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-12-17 17:33:47 +0100 |
| commit | 31e38a22a0c5a25646f966f001e1f5513d5a186d (patch) | |
| tree | c78d9100a49558ba081de7f087b759728d8684b2 | |
| parent | 15eafc2e602ff8c37c6e132eb8c63fec8fc17175 (diff) | |
qemu-char: append opt to stop truncation of serial file
Our QA team wants to preserve serial output of the guest in between QEMU
runs to perform post-analysis.
By default this behavior is off (file is truncated each time QEMU is
started or device is plugged).
Signed-off-by: Olga Krishtal <okrishtal@virtuozzo.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Eric Blake <eblake@redhat.com>
CC: Markus Armbruster <armbru@redhat.com>
CC: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <1449211324-17856-1-git-send-email-den@openvz.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | qapi-schema.json | 5 | ||||
| -rw-r--r-- | qemu-char.c | 14 |
2 files changed, 17 insertions, 2 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index f014a80f72..516b14526b 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3102,11 +3102,14 @@ # # @in: #optional The name of the input file # @out: The name of the output file +# @append: #optional Open the file in append mode (default false to +# truncate) (Since 2.6) # # Since: 1.4 ## { 'struct': 'ChardevFile', 'data': { '*in' : 'str', - 'out' : 'str' } } + 'out' : 'str', + '*append': 'bool' } } ## # @ChardevHostdev: diff --git a/qemu-char.c b/qemu-char.c index 2969c44e84..66703e3f0a 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -3484,6 +3484,9 @@ static void qemu_chr_parse_file_out(QemuOpts *opts, ChardevBackend *backend, } backend->u.file = g_new0(ChardevFile, 1); backend->u.file->out = g_strdup(path); + + backend->u.file->has_append = true; + backend->u.file->append = qemu_opt_get_bool(opts, "append", false); } static void qemu_chr_parse_stdio(QemuOpts *opts, ChardevBackend *backend, @@ -4041,6 +4044,9 @@ QemuOptsList qemu_chardev_opts = { },{ .name = "chardev", .type = QEMU_OPT_STRING, + },{ + .name = "append", + .type = QEMU_OPT_BOOL, }, { /* end of list */ } }, @@ -4101,7 +4107,13 @@ static CharDriverState *qmp_chardev_open_file(const char *id, ChardevFile *file = backend->u.file; int flags, in = -1, out; - flags = O_WRONLY | O_TRUNC | O_CREAT | O_BINARY; + flags = O_WRONLY | O_CREAT | O_BINARY; + if (file->has_append && file->append) { + flags |= O_APPEND; + } else { + flags |= O_TRUNC; + } + out = qmp_chardev_open_file_source(file->out, flags, errp); if (out < 0) { return NULL; |