pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2025-12-27 07:14:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove spice-experimental

Browse Source 
Remove unneded symbols that nobody should be using anyway.
ABI is modified with this patch, but the library version is not bumped.
This commit is contained in:
Marc-André Lureau 2014-10-24 17:16:35 +02:00
parent 72cc0cff71
commit 3c6b4e415f
4 changed files with 0 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/Makefile.am
View File

@ -51,7 +51,6 @@ libspice_serverinclude_HEADERS = \
spice-audio.h \ spice-audio.h \
spice-char.h \ spice-char.h \
spice-core.h \ spice-core.h \
spice-experimental.h \
spice-input.h \ spice-input.h \
spice-migration.h \ spice-migration.h \
spice-qxl.h \ spice-qxl.h \

18
server/reds.c
View File

@ -54,7 +54,6 @@
#include "common/ring.h" #include "common/ring.h"
#include "spice.h" #include "spice.h"
#include "spice-experimental.h"
#include "reds.h" #include "reds.h"
#include "agent-msg-filter.h" #include "agent-msg-filter.h"
#include "inputs_channel.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); 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) { } else if (strcmp(interface->type, SPICE_INTERFACE_MIGRATION) == 0) {
spice_info("SPICE_INTERFACE_MIGRATION"); spice_info("SPICE_INTERFACE_MIGRATION");
if (migration_interface) { if (migration_interface) {
@ -3781,20 +3777,6 @@ SPICE_GNUC_VISIBLE int spice_server_migrate_start(SpiceServer *s)
return 0; 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) SPICE_GNUC_VISIBLE int spice_server_migrate_end(SpiceServer *s, int completed)
{ {
SpiceMigrateInterface *sif; SpiceMigrateInterface *sif;

2
server/smartcard.h
View File

@ -18,8 +18,6 @@
#ifndef __SMART_CARD_H__ #ifndef __SMART_CARD_H__
#define __SMART_CARD_H__ #define __SMART_CARD_H__
#include "spice-experimental.h"
// Maximal length of APDU // Maximal length of APDU
#define APDUBufSize 270 #define APDUBufSize 270

40
server/spice-experimental.h
View File

@ -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__