From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55818) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4NS9-0008Is-99 for qemu-devel@nongnu.org; Thu, 03 Dec 2015 01:33:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a4NS4-0003b1-Q0 for qemu-devel@nongnu.org; Thu, 03 Dec 2015 01:33:17 -0500 Received: from relay.parallels.com ([195.214.232.42]:50943) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4NS4-0003aT-H9 for qemu-devel@nongnu.org; Thu, 03 Dec 2015 01:33:12 -0500 References: <1449123852-9260-1-git-send-email-den@openvz.org> From: "Denis V. Lunev" Message-ID: <565FE216.2010801@parallels.com> Date: Thu, 3 Dec 2015 09:32:54 +0300 MIME-Version: 1.0 In-Reply-To: <1449123852-9260-1-git-send-email-den@openvz.org> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH for 2.6 1/1] qemu-char: append opt to stop truncation of serial file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Denis V. Lunev" Cc: Olga Krishtal , Paolo Bonzini , qemu-devel@nongnu.org, Markus Armbruster On 12/03/2015 09:24 AM, Denis V. Lunev wrote: > From: Olga Krishtal > > Our QA teams 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 > Signed-off-by: Denis V. Lunev > CC: Eric Blake > CC: Markus Armbruster > CC: Paolo Bonzini > --- > qapi-schema.json | 7 ++++++- > qemu-char.c | 12 +++++++++++- > 2 files changed, 17 insertions(+), 2 deletions(-) > > diff --git a/qapi-schema.json b/qapi-schema.json > index 8b1a423..802c138 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -3020,11 +3020,16 @@ > # > # @in: #optional The name of the input file > # @out: The name of the output file > +# @append: #optional Open the file in append mode to preserve the content in > +# between QEMU runs. > +# > +# 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 5448b0f..58454e2 100644 > --- a/qemu-char.c > +++ b/qemu-char.c > @@ -3479,6 +3479,7 @@ 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->append = qemu_opt_get_bool(opts, "append", false); > } > > static void qemu_chr_parse_stdio(QemuOpts *opts, ChardevBackend *backend, > @@ -4036,6 +4037,9 @@ QemuOptsList qemu_chardev_opts = { > },{ > .name = "chardev", > .type = QEMU_OPT_STRING, > + },{ > + .name = "append", > + .type = QEMU_OPT_BOOL, > }, > { /* end of list */ } > }, > @@ -4096,7 +4100,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->append) { > + flags |= O_APPEND; > + } else { > + flags |= O_TRUNC; > + } > + > out = qmp_chardev_open_file_source(file->out, flags, errp); > if (out < 0) { > return NULL; pls disregard. Originator e-mails are wrong. Sorry :(