[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/21] qemu-char: convert file backend to data-drive
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 04/21] qemu-char: convert file backend to data-driven creation |
Date: |
Mon, 12 Oct 2015 10:03:07 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
qemu-char.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index a6411d6..13fd394 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -4010,8 +4010,12 @@ QemuOptsList qemu_chardev_opts = {
#ifdef _WIN32
-static CharDriverState *qmp_chardev_open_file(ChardevFile *file, Error **errp)
+static CharDriverState *qmp_chardev_open_file(const char *id,
+ ChardevBackend *backend,
+ ChardevReturn *ret,
+ Error **errp)
{
+ ChardevFile *file = backend->file;
HANDLE out;
if (file->has_in) {
@@ -4055,8 +4059,12 @@ static int qmp_chardev_open_file_source(char *src, int
flags,
return fd;
}
-static CharDriverState *qmp_chardev_open_file(ChardevFile *file, Error **errp)
+static CharDriverState *qmp_chardev_open_file(const char *id,
+ ChardevBackend *backend,
+ ChardevReturn *ret,
+ Error **errp)
{
+ ChardevFile *file = backend->file;
int flags, in = -1, out;
flags = O_WRONLY | O_TRUNC | O_CREAT | O_BINARY;
@@ -4242,7 +4250,7 @@ ChardevReturn *qmp_chardev_add(const char *id,
ChardevBackend *backend,
if (chr == NULL) {
switch (backend->kind) {
case CHARDEV_BACKEND_KIND_FILE:
- chr = qmp_chardev_open_file(backend->file, &local_err);
+ abort();
break;
#ifdef HAVE_CHARDEV_SERIAL
case CHARDEV_BACKEND_KIND_SERIAL:
@@ -4380,7 +4388,7 @@ static void register_types(void)
register_char_driver("ringbuf", CHARDEV_BACKEND_KIND_RINGBUF,
qemu_chr_parse_ringbuf, NULL);
register_char_driver("file", CHARDEV_BACKEND_KIND_FILE,
- qemu_chr_parse_file_out, NULL);
+ qemu_chr_parse_file_out, qmp_chardev_open_file);
register_char_driver("stdio", CHARDEV_BACKEND_KIND_STDIO,
qemu_chr_parse_stdio, NULL);
register_char_driver("serial", CHARDEV_BACKEND_KIND_SERIAL,
--
2.5.0
- [Qemu-devel] [PATCH 00/22] qemu-char: refactoring of chardev creation, Paolo Bonzini, 2015/10/12
- [Qemu-devel] [PATCH 02/21] qemu-char: cleanup HAVE_CHARDEV_*, Paolo Bonzini, 2015/10/12
- [Qemu-devel] [PATCH 03/21] qemu-char: add create to register_char_driver, Paolo Bonzini, 2015/10/12
- [Qemu-devel] [PATCH 05/21] qemu-char: convert serial backend to data-driven creation, Paolo Bonzini, 2015/10/12
- [Qemu-devel] [PATCH 04/21] qemu-char: convert file backend to data-driven creation,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 06/21] qemu-char: convert parallel backend to data-driven creation, Paolo Bonzini, 2015/10/12
- [Qemu-devel] [PATCH 12/21] qemu-char: convert mux backend to data-driven creation, Paolo Bonzini, 2015/10/12
- [Qemu-devel] [PATCH 09/21] qemu-char: convert UDP backend to data-driven creation, Paolo Bonzini, 2015/10/12
- [Qemu-devel] [PATCH 13/21] qemu-char: convert msmouse backend to data-driven creation, Paolo Bonzini, 2015/10/12