* [Qemu-trivial] [PATCH] qemu-char: fix the commit "qemu-char: Print strerror message on failure"
@ 2011-07-25 8:16 TeLeMan
2011-07-25 8:28 ` TeLeMan
0 siblings, 1 reply; 2+ messages in thread
From: TeLeMan @ 2011-07-25 8:16 UTC (permalink / raw)
To: Kevin Wolf; +Cc: qemu-trivial, TeLeMan, qemu-devel
The commit 6e1db57b2ac9025c2443c665a0d9e78748637b26 missed patching qemu_chr_open_win_file().
Signed-off-by: TeLeMan <geleman@gmail.com>
---
qemu-char.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index dcf7065..ea7abfe 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -1782,7 +1782,7 @@ static int qemu_chr_open_win_pipe(QemuOpts *opts, CharDriverState **_chr)
return 0;
}
-static CharDriverState *qemu_chr_open_win_file(HANDLE fd_out)
+static int qemu_chr_open_win_file(HANDLE fd_out, CharDriverState **_chr)
{
CharDriverState *chr;
WinCharState *s;
@@ -1793,12 +1793,14 @@ static CharDriverState *qemu_chr_open_win_file(HANDLE fd_out)
chr->opaque = s;
chr->chr_write = win_chr_write;
qemu_chr_generic_open(chr);
- return chr;
+
+ *_chr = chr;
+ return 0;
}
static int qemu_chr_open_win_con(QemuOpts *opts, CharDriverState **_chr)
{
- return qemu_chr_open_win_file(GetStdHandle(STD_OUTPUT_HANDLE), chr);
+ return qemu_chr_open_win_file(GetStdHandle(STD_OUTPUT_HANDLE), _chr);
}
static int qemu_chr_open_win_file_out(QemuOpts *opts, CharDriverState **_chr)
--
1.7.3.1.msysgit.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [Qemu-trivial] [PATCH] qemu-char: fix the commit "qemu-char: Print strerror message on failure"
2011-07-25 8:16 [Qemu-trivial] [PATCH] qemu-char: fix the commit "qemu-char: Print strerror message on failure" TeLeMan
@ 2011-07-25 8:28 ` TeLeMan
0 siblings, 0 replies; 2+ messages in thread
From: TeLeMan @ 2011-07-25 8:28 UTC (permalink / raw)
To: Kevin Wolf; +Cc: qemu-trivial, TeLeMan, qemu-devel
Oh, Blue Swirl did it, please ignore this.
--
SUN OF A BEACH
On Mon, Jul 25, 2011 at 16:16, TeLeMan <geleman@gmail.com> wrote:
> The commit 6e1db57b2ac9025c2443c665a0d9e78748637b26 missed patching qemu_chr_open_win_file().
>
> Signed-off-by: TeLeMan <geleman@gmail.com>
> ---
> qemu-char.c | 8 +++++---
> 1 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/qemu-char.c b/qemu-char.c
> index dcf7065..ea7abfe 100644
> --- a/qemu-char.c
> +++ b/qemu-char.c
> @@ -1782,7 +1782,7 @@ static int qemu_chr_open_win_pipe(QemuOpts *opts, CharDriverState **_chr)
> return 0;
> }
>
> -static CharDriverState *qemu_chr_open_win_file(HANDLE fd_out)
> +static int qemu_chr_open_win_file(HANDLE fd_out, CharDriverState **_chr)
> {
> CharDriverState *chr;
> WinCharState *s;
> @@ -1793,12 +1793,14 @@ static CharDriverState *qemu_chr_open_win_file(HANDLE fd_out)
> chr->opaque = s;
> chr->chr_write = win_chr_write;
> qemu_chr_generic_open(chr);
> - return chr;
> +
> + *_chr = chr;
> + return 0;
> }
>
> static int qemu_chr_open_win_con(QemuOpts *opts, CharDriverState **_chr)
> {
> - return qemu_chr_open_win_file(GetStdHandle(STD_OUTPUT_HANDLE), chr);
> + return qemu_chr_open_win_file(GetStdHandle(STD_OUTPUT_HANDLE), _chr);
> }
>
> static int qemu_chr_open_win_file_out(QemuOpts *opts, CharDriverState **_chr)
> --
> 1.7.3.1.msysgit.0
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-07-25 8:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-25 8:16 [Qemu-trivial] [PATCH] qemu-char: fix the commit "qemu-char: Print strerror message on failure" TeLeMan
2011-07-25 8:28 ` TeLeMan
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).