diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2016-12-12 18:51:52 +0300 |
---|---|---|
committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2017-01-31 23:31:21 +0400 |
commit | 6fdafac1c165821054e1d0786bd6630e90f2379f (patch) | |
tree | 2d50927d52eeeddaf4a66ae7d7be6a1e1b5d8bec | |
parent | 3b4482a26dd6d722004fcb7ee031064ee50288e3 (diff) |
char: move file chardev in its own file
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Eric Blake <eblake@redhat.com>
-rw-r--r-- | chardev/Makefile.objs | 1 | ||||
-rw-r--r-- | chardev/char-file.c | 139 | ||||
-rw-r--r-- | chardev/char.c | 106 |
3 files changed, 140 insertions, 106 deletions
diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs index dddef029e7..0051a7a819 100644 --- a/chardev/Makefile.objs +++ b/chardev/Makefile.objs @@ -1,5 +1,6 @@ chardev-obj-y += char.o chardev-obj-$(CONFIG_POSIX) += char-fd.o +chardev-obj-y += char-file.o chardev-obj-y += char-io.o chardev-obj-y += char-mux.o chardev-obj-y += char-null.o diff --git a/chardev/char-file.c b/chardev/char-file.c new file mode 100644 index 0000000000..8bae25350d --- /dev/null +++ b/chardev/char-file.c @@ -0,0 +1,139 @@ +/* + * QEMU System Emulator + * + * Copyright (c) 2003-2008 Fabrice Bellard + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu-common.h" +#include "sysemu/char.h" + +#ifdef _WIN32 +#include "char-win.h" +#else +#include "char-fd.h" +#endif + +static void qmp_chardev_open_file(Chardev *chr, + ChardevBackend *backend, + bool *be_opened, + Error **errp) +{ + ChardevFile *file = backend->u.file.data; +#ifdef _WIN32 + HANDLE out; + DWORD accessmode; + DWORD flags; + + if (file->has_in) { + error_setg(errp, "input file not supported"); + return; + } + + if (file->has_append && file->append) { + /* Append to file if it already exists. */ + accessmode = FILE_GENERIC_WRITE & ~FILE_WRITE_DATA; + flags = OPEN_ALWAYS; + } else { + /* Truncate file if it already exists. */ + accessmode = GENERIC_WRITE; + flags = CREATE_ALWAYS; + } + + out = CreateFile(file->out, accessmode, FILE_SHARE_READ, NULL, flags, + FILE_ATTRIBUTE_NORMAL, NULL); + if (out == INVALID_HANDLE_VALUE) { + error_setg(errp, "open %s failed", file->out); + return; + } + + qemu_chr_open_win_file(chr, out); +#else + int flags, in = -1, out; + + flags = O_WRONLY | O_CREAT | O_BINARY; + if (file->has_append && file->append) { + flags |= O_APPEND; + } else { + flags |= O_TRUNC; + } + + out = qmp_chardev_open_file_source(file->out, flags, errp); + if (out < 0) { + return; + } + + if (file->has_in) { + flags = O_RDONLY; + in = qmp_chardev_open_file_source(file->in, flags, errp); + if (in < 0) { + qemu_close(out); + return; + } + } + + qemu_chr_open_fd(chr, in, out); +#endif +} + +static void qemu_chr_parse_file_out(QemuOpts *opts, ChardevBackend *backend, + Error **errp) +{ + const char *path = qemu_opt_get(opts, "path"); + ChardevFile *file; + + backend->type = CHARDEV_BACKEND_KIND_FILE; + if (path == NULL) { + error_setg(errp, "chardev: file: no filename given"); + return; + } + file = backend->u.file.data = g_new0(ChardevFile, 1); + qemu_chr_parse_common(opts, qapi_ChardevFile_base(file)); + file->out = g_strdup(path); + + file->has_append = true; + file->append = qemu_opt_get_bool(opts, "append", false); +} + +static void char_file_class_init(ObjectClass *oc, void *data) +{ + ChardevClass *cc = CHARDEV_CLASS(oc); + + cc->parse = qemu_chr_parse_file_out; + cc->open = qmp_chardev_open_file; +} + +static const TypeInfo char_file_type_info = { + .name = TYPE_CHARDEV_FILE, +#ifdef _WIN32 + .parent = TYPE_CHARDEV_WIN, +#else + .parent = TYPE_CHARDEV_FD, +#endif + .class_init = char_file_class_init, +}; + +static void register_types(void) +{ + type_register_static(&char_file_type_info); +} + +type_init(register_types); diff --git a/chardev/char.c b/chardev/char.c index 05fceb0d73..7ec867ffc8 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -1687,26 +1687,6 @@ void qemu_chr_parse_common(QemuOpts *opts, ChardevCommon *backend) backend->logappend = qemu_opt_get_bool(opts, "logappend", false); } - -static void qemu_chr_parse_file_out(QemuOpts *opts, ChardevBackend *backend, - Error **errp) -{ - const char *path = qemu_opt_get(opts, "path"); - ChardevFile *file; - - backend->type = CHARDEV_BACKEND_KIND_FILE; - if (path == NULL) { - error_setg(errp, "chardev: file: no filename given"); - return; - } - file = backend->u.file.data = g_new0(ChardevFile, 1); - qemu_chr_parse_common(opts, qapi_ChardevFile_base(file)); - file->out = g_strdup(path); - - file->has_append = true; - file->append = qemu_opt_get_bool(opts, "append", false); -} - static void qemu_chr_parse_stdio(QemuOpts *opts, ChardevBackend *backend, Error **errp) { @@ -2260,41 +2240,6 @@ QemuOptsList qemu_chardev_opts = { #ifdef _WIN32 -static void qmp_chardev_open_file(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) -{ - ChardevFile *file = backend->u.file.data; - HANDLE out; - DWORD accessmode; - DWORD flags; - - if (file->has_in) { - error_setg(errp, "input file not supported"); - return; - } - - if (file->has_append && file->append) { - /* Append to file if it already exists. */ - accessmode = FILE_GENERIC_WRITE & ~FILE_WRITE_DATA; - flags = OPEN_ALWAYS; - } else { - /* Truncate file if it already exists. */ - accessmode = GENERIC_WRITE; - flags = CREATE_ALWAYS; - } - - out = CreateFile(file->out, accessmode, FILE_SHARE_READ, NULL, flags, - FILE_ATTRIBUTE_NORMAL, NULL); - if (out == INVALID_HANDLE_VALUE) { - error_setg(errp, "open %s failed", file->out); - return; - } - - qemu_chr_open_win_file(chr, out); -} - static void qmp_chardev_open_serial(Chardev *chr, ChardevBackend *backend, bool *be_opened, @@ -2307,38 +2252,6 @@ static void qmp_chardev_open_serial(Chardev *chr, #else /* WIN32 */ -static void qmp_chardev_open_file(Chardev *chr, - ChardevBackend *backend, - bool *be_opened, - Error **errp) -{ - ChardevFile *file = backend->u.file.data; - int flags, in = -1, out; - - flags = O_WRONLY | O_CREAT | O_BINARY; - if (file->has_append && file->append) { - flags |= O_APPEND; - } else { - flags |= O_TRUNC; - } - - out = qmp_chardev_open_file_source(file->out, flags, errp); - if (out < 0) { - return; - } - - if (file->has_in) { - flags = O_RDONLY; - in = qmp_chardev_open_file_source(file->in, flags, errp); - if (in < 0) { - qemu_close(out); - return; - } - } - - qemu_chr_open_fd(chr, in, out); -} - #ifdef HAVE_CHARDEV_SERIAL static void qmp_chardev_open_serial(Chardev *chr, ChardevBackend *backend, @@ -2415,24 +2328,6 @@ static const TypeInfo char_parallel_type_info = { #endif /* WIN32 */ -static void char_file_class_init(ObjectClass *oc, void *data) -{ - ChardevClass *cc = CHARDEV_CLASS(oc); - - cc->parse = qemu_chr_parse_file_out; - cc->open = qmp_chardev_open_file; -} - -static const TypeInfo char_file_type_info = { - .name = TYPE_CHARDEV_FILE, -#ifdef _WIN32 - .parent = TYPE_CHARDEV_WIN, -#else - .parent = TYPE_CHARDEV_FD, -#endif - .class_init = char_file_class_init, -}; - #ifdef HAVE_CHARDEV_SERIAL static void char_serial_class_init(ObjectClass *oc, void *data) @@ -2558,7 +2453,6 @@ void qemu_chr_cleanup(void) static void register_types(void) { type_register_static(&char_type_info); - type_register_static(&char_file_type_info); type_register_static(&char_stdio_type_info); #ifdef HAVE_CHARDEV_SERIAL type_register_static(&char_serial_type_info); |