diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2016-12-12 19:06:35 +0300 |
---|---|---|
committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2017-01-31 23:31:21 +0400 |
commit | 1fcb3841d066dde19619c09b22fee0a87fe0adcb (patch) | |
tree | e73bd9d89e1d4ddf218def4697df517261cacfc3 /chardev/char.c | |
parent | 7c7b2db0bd6d959ddc3d3fa178411d6c2df015b7 (diff) |
char: move pipe chardev in its own file
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'chardev/char.c')
-rw-r--r-- | chardev/char.c | 166 |
1 files changed, 0 insertions, 166 deletions
diff --git a/chardev/char.c b/chardev/char.c index 8ae8b5a4c3..b542c25cec 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -655,36 +655,6 @@ void qemu_chr_fe_take_focus(CharBackend *b) } #ifndef _WIN32 -static void qemu_chr_open_pipe(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) -{ - ChardevHostdev *opts = backend->u.pipe.data; - int fd_in, fd_out; - char *filename_in; - char *filename_out; - const char *filename = opts->device; - - filename_in = g_strdup_printf("%s.in", filename); - filename_out = g_strdup_printf("%s.out", filename); - TFR(fd_in = qemu_open(filename_in, O_RDWR | O_BINARY)); - TFR(fd_out = qemu_open(filename_out, O_RDWR | O_BINARY)); - g_free(filename_in); - g_free(filename_out); - if (fd_in < 0 || fd_out < 0) { - if (fd_in >= 0) - close(fd_in); - if (fd_out >= 0) - close(fd_out); - TFR(fd_in = fd_out = qemu_open(filename, O_RDWR | O_BINARY)); - if (fd_in < 0) { - error_setg_file_open(errp, errno, filename); - return; - } - } - qemu_chr_open_fd(chr, fd_in, fd_out); -} #if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) \ || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) \ @@ -1325,107 +1295,6 @@ static void qemu_chr_open_pp_fd(Chardev *chr, #define HAVE_CHARDEV_SERIAL 1 -#define MAXCONNECT 1 -#define NTIMEOUT 5000 - -static int win_chr_pipe_init(Chardev *chr, const char *filename, - Error **errp) -{ - WinChardev *s = WIN_CHARDEV(chr); - OVERLAPPED ov; - int ret; - DWORD size; - char *openname; - - s->fpipe = TRUE; - - s->hsend = CreateEvent(NULL, TRUE, FALSE, NULL); - if (!s->hsend) { - error_setg(errp, "Failed CreateEvent"); - goto fail; - } - s->hrecv = CreateEvent(NULL, TRUE, FALSE, NULL); - if (!s->hrecv) { - error_setg(errp, "Failed CreateEvent"); - goto fail; - } - - openname = g_strdup_printf("\\\\.\\pipe\\%s", filename); - s->hcom = CreateNamedPipe(openname, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, - PIPE_TYPE_BYTE | PIPE_READMODE_BYTE | - PIPE_WAIT, - MAXCONNECT, NSENDBUF, NRECVBUF, NTIMEOUT, NULL); - g_free(openname); - if (s->hcom == INVALID_HANDLE_VALUE) { - error_setg(errp, "Failed CreateNamedPipe (%lu)", GetLastError()); - s->hcom = NULL; - goto fail; - } - - ZeroMemory(&ov, sizeof(ov)); - ov.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); - ret = ConnectNamedPipe(s->hcom, &ov); - if (ret) { - error_setg(errp, "Failed ConnectNamedPipe"); - goto fail; - } - - ret = GetOverlappedResult(s->hcom, &ov, &size, TRUE); - if (!ret) { - error_setg(errp, "Failed GetOverlappedResult"); - if (ov.hEvent) { - CloseHandle(ov.hEvent); - ov.hEvent = NULL; - } - goto fail; - } - - if (ov.hEvent) { - CloseHandle(ov.hEvent); - ov.hEvent = NULL; - } - qemu_add_polling_cb(win_chr_pipe_poll, chr); - return 0; - - fail: - return -1; -} - - -static void qemu_chr_open_pipe(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) -{ - ChardevHostdev *opts = backend->u.pipe.data; - const char *filename = opts->device; - - if (win_chr_pipe_init(chr, filename, errp) < 0) { - return; - } -} - -static void qemu_chr_open_win_con(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) -{ - qemu_chr_open_win_file(chr, GetStdHandle(STD_OUTPUT_HANDLE)); -} - -static void char_console_class_init(ObjectClass *oc, void *data) -{ - ChardevClass *cc = CHARDEV_CLASS(oc); - - cc->open = qemu_chr_open_win_con; -} - -static const TypeInfo char_console_type_info = { - .name = TYPE_CHARDEV_CONSOLE, - .parent = TYPE_CHARDEV_WIN, - .class_init = char_console_class_init, -}; - #endif /* !_WIN32 */ int qemu_chr_wait_connected(Chardev *chr, Error **errp) @@ -1638,40 +1507,6 @@ static void qemu_chr_parse_parallel(QemuOpts *opts, ChardevBackend *backend, } #endif -static void qemu_chr_parse_pipe(QemuOpts *opts, ChardevBackend *backend, - Error **errp) -{ - const char *device = qemu_opt_get(opts, "path"); - ChardevHostdev *dev; - - backend->type = CHARDEV_BACKEND_KIND_PIPE; - if (device == NULL) { - error_setg(errp, "chardev: pipe: no device path given"); - return; - } - dev = backend->u.pipe.data = g_new0(ChardevHostdev, 1); - qemu_chr_parse_common(opts, qapi_ChardevHostdev_base(dev)); - dev->device = g_strdup(device); -} - -static void char_pipe_class_init(ObjectClass *oc, void *data) -{ - ChardevClass *cc = CHARDEV_CLASS(oc); - - cc->parse = qemu_chr_parse_pipe; - cc->open = qemu_chr_open_pipe; -} - -static const TypeInfo char_pipe_type_info = { - .name = TYPE_CHARDEV_PIPE, -#ifdef _WIN32 - .parent = TYPE_CHARDEV_WIN, -#else - .parent = TYPE_CHARDEV_FD, -#endif - .class_init = char_pipe_class_init, -}; - static const ChardevClass *char_get_class(const char *driver, Error **errp) { ObjectClass *oc; @@ -2343,7 +2178,6 @@ static void register_types(void) #ifdef HAVE_CHARDEV_PTY type_register_static(&char_pty_type_info); #endif - type_register_static(&char_pipe_type_info); /* this must be done after machine init, since we register FEs with muxes * as part of realize functions like serial_isa_realizefn when -nographic |