From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38440) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFL0f-0005pL-1D for qemu-devel@nongnu.org; Tue, 12 Mar 2013 04:56:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UFL0b-0003z1-Gv for qemu-devel@nongnu.org; Tue, 12 Mar 2013 04:56:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20547) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFL0b-0003yU-8H for qemu-devel@nongnu.org; Tue, 12 Mar 2013 04:56:33 -0400 From: Gerd Hoffmann Date: Tue, 12 Mar 2013 09:56:16 +0100 Message-Id: <1363078589-15233-7-git-send-email-kraxel@redhat.com> In-Reply-To: <1363078589-15233-1-git-send-email-kraxel@redhat.com> References: <1363078589-15233-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 06/19] chardev: switch file init to qapi List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Gerd Hoffmann This patch switches over the 'file' chardev initialization to the new qapi code path. Signed-off-by: Gerd Hoffmann --- qemu-char.c | 43 +++++++++++++++---------------------------- 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 1991c82..66ae8aa 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -817,18 +817,6 @@ static CharDriverState *qemu_chr_open_fd(int fd_in, int fd_out) 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) { int fd_in, fd_out; @@ -1965,20 +1953,6 @@ static CharDriverState *qemu_chr_open_win_con(QemuOpts *opts) 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) { HANDLE hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); @@ -3178,6 +3152,19 @@ static CharDriverState *qemu_chr_open_pp(QemuOpts *opts) #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 { const char *name; /* old, pre qapi */ @@ -3746,14 +3733,14 @@ static void register_types(void) register_char_driver("socket", qemu_chr_open_socket); register_char_driver("udp", qemu_chr_open_udp); register_char_driver("memory", qemu_chr_open_ringbuf); + register_char_driver_qapi("file", CHARDEV_BACKEND_KIND_FILE, + qemu_chr_parse_file_out); #ifdef _WIN32 - register_char_driver("file", qemu_chr_open_win_file_out); register_char_driver("pipe", qemu_chr_open_win_pipe); register_char_driver("console", qemu_chr_open_win_con); register_char_driver("serial", qemu_chr_open_win); register_char_driver("stdio", qemu_chr_open_win_stdio); #else - register_char_driver("file", qemu_chr_open_file_out); register_char_driver("pipe", qemu_chr_open_pipe); register_char_driver("stdio", qemu_chr_open_stdio); #endif -- 1.7.9.7