Browse Source

Fix chrdev return value conversion

6e1db57b2a didn't
convert brlapi or win32 chrdevs, breaking build for those.

Fix by converting the chrdevs.

Acked-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
remotes/github/stable-0.15
Blue Swirl 15 years ago
parent
commit
aad04cd024
  1. 2
      hw/baum.h
  2. 7
      qemu-char.c

2
hw/baum.h

@ -23,4 +23,4 @@
*/
/* char device */
CharDriverState *chr_baum_init(QemuOpts *opts);
int chr_baum_init(QemuOpts *opts, CharDriverState **_chr);

7
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 **pchr)
{
CharDriverState *chr;
WinCharState *s;
@ -1793,10 +1793,11 @@ 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;
*pchr = chr;
return 0;
}
static int qemu_chr_open_win_con(QemuOpts *opts, CharDriverState **_chr)
static int qemu_chr_open_win_con(QemuOpts *opts, CharDriverState **chr)
{
return qemu_chr_open_win_file(GetStdHandle(STD_OUTPUT_HANDLE), chr);
}

Loading…
Cancel
Save