[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/15] char: move SpiceChardev and open_spice_port()
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 10/15] char: move SpiceChardev and open_spice_port() to spice.h header |
Date: |
Fri, 22 Feb 2019 08:53:21 +0100 |
From: Marc-André Lureau <address@hidden>
This will allow easier subclassing of SpiceChardev, in upcoming
"display: add -display spice-app launching external application"
patch.
Signed-off-by: Marc-André Lureau <address@hidden>
Tested-by: Victor Toso <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
include/chardev/spice.h | 27 +++++++++++++++++++++++++++
chardev/spice.c | 28 +++++-----------------------
2 files changed, 32 insertions(+), 23 deletions(-)
create mode 100644 include/chardev/spice.h
diff --git a/include/chardev/spice.h b/include/chardev/spice.h
new file mode 100644
index 000000000000..6431da320599
--- /dev/null
+++ b/include/chardev/spice.h
@@ -0,0 +1,27 @@
+#ifndef CHARDEV_SPICE_H_
+#define CHARDEV_SPICE_H_
+
+#include <spice.h>
+#include "chardev/char-fe.h"
+
+typedef struct SpiceChardev {
+ Chardev parent;
+
+ SpiceCharDeviceInstance sin;
+ bool active;
+ bool blocked;
+ const uint8_t *datapos;
+ int datalen;
+ QLIST_ENTRY(SpiceChardev) next;
+} SpiceChardev;
+
+#define TYPE_CHARDEV_SPICE "chardev-spice"
+#define TYPE_CHARDEV_SPICEVMC "chardev-spicevmc"
+#define TYPE_CHARDEV_SPICEPORT "chardev-spiceport"
+
+#define SPICE_CHARDEV(obj) OBJECT_CHECK(SpiceChardev, (obj),
TYPE_CHARDEV_SPICE)
+
+void qemu_chr_open_spice_port(Chardev *chr, ChardevBackend *backend,
+ bool *be_opened, Error **errp);
+
+#endif
diff --git a/chardev/spice.c b/chardev/spice.c
index c68e60115bb1..2202d50eee1e 100644
--- a/chardev/spice.c
+++ b/chardev/spice.c
@@ -2,30 +2,12 @@
#include "trace.h"
#include "ui/qemu-spice.h"
#include "chardev/char.h"
+#include "chardev/spice.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/option.h"
-#include <spice.h>
#include <spice/protocol.h>
-
-typedef struct SpiceChardev {
- Chardev parent;
-
- SpiceCharDeviceInstance sin;
- bool active;
- bool blocked;
- const uint8_t *datapos;
- int datalen;
- QLIST_ENTRY(SpiceChardev) next;
-} SpiceChardev;
-
-#define TYPE_CHARDEV_SPICE "chardev-spice"
-#define TYPE_CHARDEV_SPICEVMC "chardev-spicevmc"
-#define TYPE_CHARDEV_SPICEPORT "chardev-spiceport"
-
-#define SPICE_CHARDEV(obj) OBJECT_CHECK(SpiceChardev, (obj),
TYPE_CHARDEV_SPICE)
-
typedef struct SpiceCharSource {
GSource source;
SpiceChardev *scd;
@@ -315,10 +297,10 @@ static void qemu_chr_open_spice_vmc(Chardev *chr,
chr_open(chr, type);
}
-static void qemu_chr_open_spice_port(Chardev *chr,
- ChardevBackend *backend,
- bool *be_opened,
- Error **errp)
+void qemu_chr_open_spice_port(Chardev *chr,
+ ChardevBackend *backend,
+ bool *be_opened,
+ Error **errp)
{
ChardevSpicePort *spiceport = backend->u.spiceport.data;
const char *name = spiceport->fqdn;
--
2.9.3
- [Qemu-devel] [PULL 00/15] Ui 20190222 patches, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 04/15] ui/gtk: Fix the license information, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 09/15] spice: do not stop spice if VM is paused, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 13/15] qapi: document DisplayType enum, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 02/15] spice: set device address and device display ID in QXL interface, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 03/15] sdl2: drop qemu_input_event_send_key_qcode call, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 14/15] spice: use a default name for the server, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 10/15] char: move SpiceChardev and open_spice_port() to spice.h header,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 07/15] spice: avoid spice runtime assert, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 11/15] char: register spice ports after spice started, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 08/15] spice: merge options lists, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 05/15] char/spice: trigger HUP event, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 01/15] kbd-state: don't block auto-repeat events, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 12/15] build-sys: add gio-2.0 check, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 06/15] char/spice: discard write() if backend is disconnected, Gerd Hoffmann, 2019/02/22
- [Qemu-devel] [PULL 15/15] display: add -display spice-app launching a Spice client, Gerd Hoffmann, 2019/02/22
- Re: [Qemu-devel] [PULL 00/15] Ui 20190222 patches, Peter Maydell, 2019/02/25