diff options
author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2014-10-24 17:16:35 +0200 |
---|---|---|
committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2015-01-15 18:34:26 +0100 |
commit | 3c6b4e415fa1e2ce212d09ba15c90cd58b4ec4b4 (patch) | |
tree | 06a919e075b687e12b7553e9ca9ed317b8de63d0 | |
parent | 72cc0cff710f8be3e721fed82ab2ce519f03ccb4 (diff) |
Remove spice-experimental
Remove unneded symbols that nobody should be using anyway.
ABI is modified with this patch, but the library version is not bumped.
-rw-r--r-- | server/Makefile.am | 1 | ||||
-rw-r--r-- | server/reds.c | 18 | ||||
-rw-r--r-- | server/smartcard.h | 2 | ||||
-rw-r--r-- | server/spice-experimental.h | 40 |
4 files changed, 0 insertions, 61 deletions
diff --git a/server/Makefile.am b/server/Makefile.am index 3cef2430..89a375ce 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -51,7 +51,6 @@ libspice_serverinclude_HEADERS = \ spice-audio.h \ spice-char.h \ spice-core.h \ - spice-experimental.h \ spice-input.h \ spice-migration.h \ spice-qxl.h \ diff --git a/server/reds.c b/server/reds.c index a351b882..f61d5d30 100644 --- a/server/reds.c +++ b/server/reds.c @@ -54,7 +54,6 @@ #include "common/ring.h" #include "spice.h" -#include "spice-experimental.h" #include "reds.h" #include "agent-msg-filter.h" #include "inputs_channel.h" @@ -3165,9 +3164,6 @@ SPICE_GNUC_VISIBLE int spice_server_add_interface(SpiceServer *s, } spice_server_char_device_add_interface(s, sin); - } else if (strcmp(interface->type, SPICE_INTERFACE_NET_WIRE) == 0) { - spice_warning("unsupported net wire interface"); - return -1; } else if (strcmp(interface->type, SPICE_INTERFACE_MIGRATION) == 0) { spice_info("SPICE_INTERFACE_MIGRATION"); if (migration_interface) { @@ -3781,20 +3777,6 @@ SPICE_GNUC_VISIBLE int spice_server_migrate_start(SpiceServer *s) return 0; } -SPICE_GNUC_VISIBLE int spice_server_migrate_client_state(SpiceServer *s) -{ - spice_assert(reds == s); - - if (!reds_main_channel_connected()) { - return SPICE_MIGRATE_CLIENT_NONE; - } else if (reds->mig_wait_connect) { - return SPICE_MIGRATE_CLIENT_WAITING; - } else { - return SPICE_MIGRATE_CLIENT_READY; - } - return 0; -} - SPICE_GNUC_VISIBLE int spice_server_migrate_end(SpiceServer *s, int completed) { SpiceMigrateInterface *sif; diff --git a/server/smartcard.h b/server/smartcard.h index 221c777e..f9cbbfc3 100644 --- a/server/smartcard.h +++ b/server/smartcard.h @@ -18,8 +18,6 @@ #ifndef __SMART_CARD_H__ #define __SMART_CARD_H__ -#include "spice-experimental.h" - // Maximal length of APDU #define APDUBufSize 270 diff --git a/server/spice-experimental.h b/server/spice-experimental.h deleted file mode 100644 index f16d555f..00000000 --- a/server/spice-experimental.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef __SPICE_EXPERIMENTAL_H__ -#define __SPICE_EXPERIMENTAL_H__ - -#include "spice.h" - -/* tunnel interface */ - -#define SPICE_INTERFACE_NET_WIRE "net_wire" -#define SPICE_INTERFACE_NET_WIRE_MAJOR 1 -#define SPICE_INTERFACE_NET_WIRE_MINOR 1 -typedef struct SpiceNetWireInterface SpiceNetWireInterface; -typedef struct SpiceNetWireInstance SpiceNetWireInstance; -typedef struct SpiceNetWireState SpiceNetWireState; - -struct SpiceNetWireInterface { - SpiceBaseInterface base; - - struct in_addr (*get_ip)(SpiceNetWireInstance *sin); - int (*can_send_packet)(SpiceNetWireInstance *sin); - void (*send_packet)(SpiceNetWireInstance *sin, const uint8_t *pkt, int len); -}; - -struct SpiceNetWireInstance { - SpiceBaseInstance base; - SpiceNetWireState *st; -}; - -void spice_server_net_wire_recv_packet(SpiceNetWireInstance *sin, - const uint8_t *pkt, int len); - -/* spice seamless client migration (broken) */ -enum { - SPICE_MIGRATE_CLIENT_NONE = 1, - SPICE_MIGRATE_CLIENT_WAITING, - SPICE_MIGRATE_CLIENT_READY, -}; - -int spice_server_migrate_client_state(SpiceServer *s); - -#endif // __SPICE_EXPERIMENTAL_H__ |