[Spice-devel] [PATCH 35/39] zap MigrationInterface
Gerd Hoffmann
kraxel at redhat.com
Tue May 18 08:43:12 PDT 2010
Remove remaining MigrationInterface bits.
Signed-off-by: Gerd Hoffmann <kraxel at redhat.com>
---
server/reds.c | 16 ----------------
server/vd_interface.h | 11 -----------
2 files changed, 0 insertions(+), 27 deletions(-)
diff --git a/server/reds.c b/server/reds.c
index 3c832b5..891cd74 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -55,7 +55,6 @@
#endif
SpiceCoreInterface *core = NULL;
-static MigrationInterface *mig = NULL;
static SpiceKbdInstance *keyboard = NULL;
static SpiceMouseInstance *mouse = NULL;
static SpiceTabletInstance *tablet = NULL;
@@ -688,7 +687,6 @@ static void reds_mig_cleanup()
reds->mig_wait_connect = FALSE;
reds->mig_wait_disconnect = FALSE;
core->timer_cancel(reds->mig_timer);
- mig->notifier_done(mig, reds->mig_notifier);
}
}
@@ -3315,7 +3313,6 @@ static void reds_mig_finished(int completed)
if (reds->peer == NULL) {
red_printf("no peer connected");
- mig->notifier_done(mig, reds->mig_notifier);
return;
}
reds->mig_inprogress = TRUE;
@@ -3457,19 +3454,6 @@ __visible__ int spice_server_add_interface(SpiceServer *s,
mouse = SPICE_CONTAINEROF(sin, SpiceMouseInstance, base);
mouse->st = spice_new0(SpiceMouseState, 1);
- } else if (strcmp(interface->type, VD_INTERFACE_MIGRATION) == 0) {
- red_printf("VD_INTERFACE_MIGRATION");
- if (mig) {
- red_printf("already have migration");
- return -1;
- }
- if (interface->major_version != VD_INTERFACE_MIGRATION_MAJOR ||
- interface->minor_version < VD_INTERFACE_MIGRATION_MINOR) {
- red_printf("unsuported migration interface");
- return -1;
- }
- mig = (MigrationInterface *)interface;
-
} else if (strcmp(interface->type, SPICE_INTERFACE_QXL) == 0) {
QXLInstance *qxl;
diff --git a/server/vd_interface.h b/server/vd_interface.h
index a5a20ec..5d50ee9 100644
--- a/server/vd_interface.h
+++ b/server/vd_interface.h
@@ -264,17 +264,6 @@ struct SpiceTabletInstance {
SpiceTabletState *st;
};
-#define VD_INTERFACE_MIGRATION "migration"
-#define VD_INTERFACE_MIGRATION_MAJOR 1
-#define VD_INTERFACE_MIGRATION_MINOR 1
-typedef struct MigrationInterface MigrationInterface;
-
-struct MigrationInterface {
- SpiceBaseInterface base;
-
- void (*notifier_done)(MigrationInterface *mig, VDObjectRef notifier);
-};
-
enum VDIArgType{
ARG_TYPE_INVALID,
ARG_TYPE_INT,
--
1.6.6.1
More information about the Spice-devel
mailing list