[Spice-devel] [PATCH 3/3] move chardevs out of experimental
Gerd Hoffmann
kraxel at redhat.com
Tue Dec 14 04:10:53 PST 2010
While we are at it: There is no reason for chardev
support to stay in the experimental area, so move it out.
qemu should not need the "spice-experimental.h" file.
Signed-off-by: Gerd Hoffmann <kraxel at redhat.com>
---
server/spice-experimental.h | 25 -------------------------
server/spice.h | 26 ++++++++++++++++++++++++++
2 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/server/spice-experimental.h b/server/spice-experimental.h
index f1b7385..482ac44 100644
--- a/server/spice-experimental.h
+++ b/server/spice-experimental.h
@@ -3,31 +3,6 @@
#include "spice.h"
-/* char device interfaces */
-#define SPICE_INTERFACE_CHAR_DEVICE "char_device"
-#define SPICE_INTERFACE_CHAR_DEVICE_MAJOR 1
-#define SPICE_INTERFACE_CHAR_DEVICE_MINOR 1
-typedef struct SpiceCharDeviceInterface SpiceCharDeviceInterface;
-typedef struct SpiceCharDeviceInstance SpiceCharDeviceInstance;
-typedef struct SpiceCharDeviceState SpiceCharDeviceState;
-
-struct SpiceCharDeviceInterface {
- SpiceBaseInterface base;
-
- void (*state)(SpiceCharDeviceInstance *sin, int connected);
- int (*write)(SpiceCharDeviceInstance *sin, const uint8_t *buf, int len);
- int (*read)(SpiceCharDeviceInstance *sin, uint8_t *buf, int len);
-};
-
-struct SpiceCharDeviceInstance {
- SpiceBaseInstance base;
- const char* subtype;
- SpiceCharDeviceState *st;
-};
-
-void spice_server_char_device_wakeup(SpiceCharDeviceInstance *sin);
-const char** spice_server_char_device_recognized_subtypes(void);
-
/* tunnel interface */
#define SPICE_INTERFACE_NET_WIRE "net_wire"
diff --git a/server/spice.h b/server/spice.h
index 87303ab..f6a4fe0 100644
--- a/server/spice.h
+++ b/server/spice.h
@@ -322,6 +322,32 @@ void spice_server_record_stop(SpiceRecordInstance *sin);
uint32_t spice_server_record_get_samples(SpiceRecordInstance *sin,
uint32_t *samples, uint32_t bufsize);
+/* char device interfaces */
+
+#define SPICE_INTERFACE_CHAR_DEVICE "char_device"
+#define SPICE_INTERFACE_CHAR_DEVICE_MAJOR 1
+#define SPICE_INTERFACE_CHAR_DEVICE_MINOR 1
+typedef struct SpiceCharDeviceInterface SpiceCharDeviceInterface;
+typedef struct SpiceCharDeviceInstance SpiceCharDeviceInstance;
+typedef struct SpiceCharDeviceState SpiceCharDeviceState;
+
+struct SpiceCharDeviceInterface {
+ SpiceBaseInterface base;
+
+ void (*state)(SpiceCharDeviceInstance *sin, int connected);
+ int (*write)(SpiceCharDeviceInstance *sin, const uint8_t *buf, int len);
+ int (*read)(SpiceCharDeviceInstance *sin, uint8_t *buf, int len);
+};
+
+struct SpiceCharDeviceInstance {
+ SpiceBaseInstance base;
+ const char* subtype;
+ SpiceCharDeviceState *st;
+};
+
+void spice_server_char_device_wakeup(SpiceCharDeviceInstance *sin);
+const char** spice_server_char_device_recognized_subtypes(void);
+
/* spice server setup */
/* Don't use features incompatible with a specific spice
--
1.7.1
More information about the Spice-devel
mailing list