chardev: switch file init to qapi
This patch switches over the 'file' chardev initialization to the new qapi code path. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
2d57286da6
commit
846e2e4938
43
qemu-char.c
43
qemu-char.c
|
@ -841,18 +841,6 @@ static CharDriverState *qemu_chr_open_fd(int fd_in, int fd_out)
|
||||||
return chr;
|
return chr;
|
||||||
}
|
}
|
||||||
|
|
||||||
static CharDriverState *qemu_chr_open_file_out(QemuOpts *opts)
|
|
||||||
{
|
|
||||||
int fd_out;
|
|
||||||
|
|
||||||
TFR(fd_out = qemu_open(qemu_opt_get(opts, "path"),
|
|
||||||
O_WRONLY | O_TRUNC | O_CREAT | O_BINARY, 0666));
|
|
||||||
if (fd_out < 0) {
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
return qemu_chr_open_fd(-1, fd_out);
|
|
||||||
}
|
|
||||||
|
|
||||||
static CharDriverState *qemu_chr_open_pipe(QemuOpts *opts)
|
static CharDriverState *qemu_chr_open_pipe(QemuOpts *opts)
|
||||||
{
|
{
|
||||||
int fd_in, fd_out;
|
int fd_in, fd_out;
|
||||||
|
@ -1989,20 +1977,6 @@ static CharDriverState *qemu_chr_open_win_con(QemuOpts *opts)
|
||||||
return qemu_chr_open_win_file(GetStdHandle(STD_OUTPUT_HANDLE));
|
return qemu_chr_open_win_file(GetStdHandle(STD_OUTPUT_HANDLE));
|
||||||
}
|
}
|
||||||
|
|
||||||
static CharDriverState *qemu_chr_open_win_file_out(QemuOpts *opts)
|
|
||||||
{
|
|
||||||
const char *file_out = qemu_opt_get(opts, "path");
|
|
||||||
HANDLE fd_out;
|
|
||||||
|
|
||||||
fd_out = CreateFile(file_out, GENERIC_WRITE, FILE_SHARE_READ, NULL,
|
|
||||||
OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
|
|
||||||
if (fd_out == INVALID_HANDLE_VALUE) {
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return qemu_chr_open_win_file(fd_out);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int win_stdio_write(CharDriverState *chr, const uint8_t *buf, int len)
|
static int win_stdio_write(CharDriverState *chr, const uint8_t *buf, int len)
|
||||||
{
|
{
|
||||||
HANDLE hStdOut = GetStdHandle(STD_OUTPUT_HANDLE);
|
HANDLE hStdOut = GetStdHandle(STD_OUTPUT_HANDLE);
|
||||||
|
@ -3202,6 +3176,19 @@ static CharDriverState *qemu_chr_open_pp(QemuOpts *opts)
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
static void qemu_chr_parse_file_out(QemuOpts *opts, ChardevBackend *backend,
|
||||||
|
Error **errp)
|
||||||
|
{
|
||||||
|
const char *path = qemu_opt_get(opts, "path");
|
||||||
|
|
||||||
|
if (path == NULL) {
|
||||||
|
error_setg(errp, "chardev: file: no filename given");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
backend->file = g_new0(ChardevFile, 1);
|
||||||
|
backend->file->out = g_strdup(path);
|
||||||
|
}
|
||||||
|
|
||||||
typedef struct CharDriver {
|
typedef struct CharDriver {
|
||||||
const char *name;
|
const char *name;
|
||||||
/* old, pre qapi */
|
/* old, pre qapi */
|
||||||
|
@ -3770,14 +3757,14 @@ static void register_types(void)
|
||||||
register_char_driver("socket", qemu_chr_open_socket);
|
register_char_driver("socket", qemu_chr_open_socket);
|
||||||
register_char_driver("udp", qemu_chr_open_udp);
|
register_char_driver("udp", qemu_chr_open_udp);
|
||||||
register_char_driver("memory", qemu_chr_open_ringbuf);
|
register_char_driver("memory", qemu_chr_open_ringbuf);
|
||||||
|
register_char_driver_qapi("file", CHARDEV_BACKEND_KIND_FILE,
|
||||||
|
qemu_chr_parse_file_out);
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
register_char_driver("file", qemu_chr_open_win_file_out);
|
|
||||||
register_char_driver("pipe", qemu_chr_open_win_pipe);
|
register_char_driver("pipe", qemu_chr_open_win_pipe);
|
||||||
register_char_driver("console", qemu_chr_open_win_con);
|
register_char_driver("console", qemu_chr_open_win_con);
|
||||||
register_char_driver("serial", qemu_chr_open_win);
|
register_char_driver("serial", qemu_chr_open_win);
|
||||||
register_char_driver("stdio", qemu_chr_open_win_stdio);
|
register_char_driver("stdio", qemu_chr_open_win_stdio);
|
||||||
#else
|
#else
|
||||||
register_char_driver("file", qemu_chr_open_file_out);
|
|
||||||
register_char_driver("pipe", qemu_chr_open_pipe);
|
register_char_driver("pipe", qemu_chr_open_pipe);
|
||||||
register_char_driver("stdio", qemu_chr_open_stdio);
|
register_char_driver("stdio", qemu_chr_open_stdio);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue