Commit aad04cd0 authored by Blue Swirl's avatar Blue Swirl
Browse files

Fix chrdev return value conversion 



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

Fix by converting the chrdevs.

Acked-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 1fc7bd4a

hw/baum.h

+1 −1
Original line number Diff line number Diff line
@@ -23,4 +23,4 @@ 
 */



/* char device */

CharDriverState *chr_baum_init(QemuOpts *opts);
 
int chr_baum_init(QemuOpts *opts, CharDriverState **_chr);

qemu-char.c

+4 −3
Original line number Diff line number Diff line
@@ -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);

}