From: Paolo Bonzini <pbonzini@redhat.com>
To: Stefan Weil <sw@weilnetz.de>, QEMU Developer <qemu-devel@nongnu.org>
Cc: Peter Maydell <peter.maydell@linaro.org>,
Benjamin David Lunt <fys@fysnet.net>
Subject: Re: [Qemu-devel] [PATCH v2 for-2.7] wxx: Fix handling of files used for character devices
Date: Tue, 2 Aug 2016 08:47:58 +0200 [thread overview]
Message-ID: <212c9f2c-9f83-b30a-ef2e-1148aad7dd6b@redhat.com> (raw)
In-Reply-To: <1470114877-1466-1-git-send-email-sw@weilnetz.de>
On 02/08/2016 07:14, Stefan Weil wrote:
> On Windows, such files were not truncated like on all other hosts.
> Now we also test whether truncation is needed when running on Windows.
>
> The append case was also incorrect because it needs a different value
> for the desired access mode.
>
> Reported-by: Benjamin David Lunt <fys@fysnet.net>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>
> This patch supersedes my previous patch for qemu-char which only
> fixed the truncate case. Paolo gave the hint to the wrong access mode
> (see also commit 52074d0f662fc51293d4cde8077631f754784405).
>
> Regards
> Stefan
>
> qemu-char.c | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/qemu-char.c b/qemu-char.c
> index e4b8448..e7d3399 100644
> --- a/qemu-char.c
> +++ b/qemu-char.c
> @@ -4197,14 +4197,26 @@ static CharDriverState *qmp_chardev_open_file(const char *id,
> ChardevFile *file = backend->u.file.data;
> ChardevCommon *common = qapi_ChardevFile_base(file);
> HANDLE out;
> + DWORD accessmode;
> + DWORD flags;
>
> if (file->has_in) {
> error_setg(errp, "input file not supported");
> return NULL;
> }
>
> - out = CreateFile(file->out, GENERIC_WRITE, FILE_SHARE_READ, NULL,
> - OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
> + if (file->has_append && file->append) {
> + /* Append to file if it already exists. */
> + accessmode = FILE_GENERIC_WRITE & ~FILE_WRITE_DATA;
> + flags = OPEN_ALWAYS;
> + } else {
> + /* Truncate file if it already exists. */
> + accessmode = GENERIC_WRITE;
> + flags = CREATE_ALWAYS;
> + }
> +
> + out = CreateFile(file->out, accessmode, FILE_SHARE_READ, NULL, flags,
> + FILE_ATTRIBUTE_NORMAL, NULL);
> if (out == INVALID_HANDLE_VALUE) {
> error_setg(errp, "open %s failed", file->out);
> return NULL;
>
Matches the access mode and flags for qemu-ga.
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Thanks!
next prev parent reply other threads:[~2016-08-02 6:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-02 5:14 [Qemu-devel] [PATCH v2 for-2.7] wxx: Fix handling of files used for character devices Stefan Weil
2016-08-02 6:47 ` Paolo Bonzini [this message]
2016-08-05 14:12 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=212c9f2c-9f83-b30a-ef2e-1148aad7dd6b@redhat.com \
--to=pbonzini@redhat.com \
--cc=fys@fysnet.net \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=sw@weilnetz.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).