Commit d6c983cd authored by Gerd Hoffmann's avatar Gerd Hoffmann Committed by Anthony Liguori
Browse files

convert windows console chardev to QemuOpts. 



Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent dc1c21e6

qemu-char.c

+6 −4
Original line number Diff line number Diff line
@@ -1701,7 +1701,7 @@ static CharDriverState *qemu_chr_open_win_file(HANDLE fd_out) 
    return chr;

}



static CharDriverState *qemu_chr_open_win_con(const char *filename)

static CharDriverState *qemu_chr_open_win_con(QemuOpts *opts)

{

    return qemu_chr_open_win_file(GetStdHandle(STD_OUTPUT_HANDLE));

}
@@ -2234,6 +2234,10 @@ static QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename) 
        qemu_opt_set(opts, "backend", filename);

        return opts;

    }

    if (strcmp(filename, "con:") == 0) {

        qemu_opt_set(opts, "backend", "console");

        return opts;

    }

    if (strstart(filename, "file:", &p)) {

        qemu_opt_set(opts, "backend", "file");

        qemu_opt_set(opts, "path", p);
@@ -2285,6 +2289,7 @@ static const struct { 
#ifdef _WIN32

    { .name = "file",      .open = qemu_chr_open_win_file_out },

    { .name = "pipe",      .open = qemu_chr_open_win_pipe },

    { .name = "console",   .open = qemu_chr_open_win_con },

#else

    { .name = "file",      .open = qemu_chr_open_file_out },

    { .name = "pipe",      .open = qemu_chr_open_pipe },
@@ -2381,9 +2386,6 @@ CharDriverState *qemu_chr_open(const char *label, const char *filename, void (*i 
    if (strstart(filename, "COM", NULL)) {

        chr = qemu_chr_open_win(filename);

    } else

    if (strstart(filename, "con:", NULL)) {

        chr = qemu_chr_open_win_con(filename);

    } else

#endif

    {

        chr = NULL;