From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:42414)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <geleman@gmail.com>) id 1QlGWp-0003Hr-F6
	for qemu-devel@nongnu.org; Mon, 25 Jul 2011 04:28:44 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <geleman@gmail.com>) id 1QlGWo-000739-Gr
	for qemu-devel@nongnu.org; Mon, 25 Jul 2011 04:28:43 -0400
MIME-Version: 1.0
In-Reply-To: <1311581791-923-1-git-send-email-geleman@gmail.com>
References: <1311581791-923-1-git-send-email-geleman@gmail.com>
Date: Mon, 25 Jul 2011 16:28:41 +0800
Message-ID: <CAETRQWkO6=hFPtZALNES3_Cu-ZoK9vKzs0GybztaXPLWM4zPYQ@mail.gmail.com>
From: TeLeMan <geleman@gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH] qemu-char: fix the commit "qemu-char:
 Print strerror message on failure"
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Kevin Wolf <kwolf@redhat.com>
Cc: qemu-trivial@nongnu.org, TeLeMan <geleman@gmail.com>, qemu-devel <qemu-devel@nongnu.org>

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>
> ---
> =C2=A0qemu-char.c | =C2=A0 =C2=A08 +++++---
> =C2=A01 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, C=
harDriverState **_chr)
> =C2=A0 =C2=A0 return 0;
> =C2=A0}
>
> -static CharDriverState *qemu_chr_open_win_file(HANDLE fd_out)
> +static int qemu_chr_open_win_file(HANDLE fd_out, CharDriverState **_chr)
> =C2=A0{
> =C2=A0 =C2=A0 CharDriverState *chr;
> =C2=A0 =C2=A0 WinCharState *s;
> @@ -1793,12 +1793,14 @@ static CharDriverState *qemu_chr_open_win_file(HA=
NDLE fd_out)
> =C2=A0 =C2=A0 chr->opaque =3D s;
> =C2=A0 =C2=A0 chr->chr_write =3D win_chr_write;
> =C2=A0 =C2=A0 qemu_chr_generic_open(chr);
> - =C2=A0 =C2=A0return chr;
> +
> + =C2=A0 =C2=A0*_chr =3D chr;
> + =C2=A0 =C2=A0return 0;
> =C2=A0}
>
> =C2=A0static int qemu_chr_open_win_con(QemuOpts *opts, CharDriverState **=
_chr)
> =C2=A0{
> - =C2=A0 =C2=A0return qemu_chr_open_win_file(GetStdHandle(STD_OUTPUT_HAND=
LE), chr);
> + =C2=A0 =C2=A0return qemu_chr_open_win_file(GetStdHandle(STD_OUTPUT_HAND=
LE), _chr);
> =C2=A0}
>
> =C2=A0static int qemu_chr_open_win_file_out(QemuOpts *opts, CharDriverSta=
te **_chr)
> --
> 1.7.3.1.msysgit.0
>
>