[Spice-devel] [PATCH 12/16] Change reds_on_char_device_state_destroy() to take RedsState arg

Frediano Ziglio fziglio at redhat.com
Wed Jan 20 07:43:38 PST 2016


From: Jonathon Jongsma <jjongsma at redhat.com>

---
 server/char-device.c | 2 +-
 server/reds.c        | 2 +-
 server/reds.h        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/char-device.c b/server/char-device.c
index 19e8419..7c209cd 100644
--- a/server/char-device.c
+++ b/server/char-device.c
@@ -740,7 +740,7 @@ static void spice_char_device_state_unref(SpiceCharDeviceState *char_dev)
 
 void spice_char_device_state_destroy(SpiceCharDeviceState *char_dev)
 {
-    reds_on_char_device_state_destroy(char_dev);
+    reds_on_char_device_state_destroy(reds, char_dev);
     if (char_dev->write_to_dev_timer) {
         core->timer_remove(char_dev->write_to_dev_timer);
         char_dev->write_to_dev_timer = NULL;
diff --git a/server/reds.c b/server/reds.c
index 8adc656..c2f06af 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -3112,7 +3112,7 @@ static void reds_char_device_remove_state(RedsState *reds, SpiceCharDeviceState
     spice_error("char dev state not found %p", st);
 }
 
-void reds_on_char_device_state_destroy(SpiceCharDeviceState *dev)
+void reds_on_char_device_state_destroy(RedsState *reds, SpiceCharDeviceState *dev)
 {
     reds_char_device_remove_state(reds, dev);
 }
diff --git a/server/reds.h b/server/reds.h
index 294f68c..e398607 100644
--- a/server/reds.h
+++ b/server/reds.h
@@ -111,7 +111,7 @@ int reds_on_migrate_dst_set_seamless(RedsState *reds, MainChannelClient *mcc, ui
 void reds_on_client_semi_seamless_migrate_complete(RedsState *reds, RedClient *client);
 void reds_on_client_seamless_migrate_complete(RedsState *reds, RedClient *client);
 void reds_on_main_channel_migrate(RedsState *reds, MainChannelClient *mcc);
-void reds_on_char_device_state_destroy(SpiceCharDeviceState *dev);
+void reds_on_char_device_state_destroy(RedsState *reds, SpiceCharDeviceState *dev);
 
 void reds_set_client_mm_time_latency(RedsState *reds, RedClient *client, uint32_t latency);
 
-- 
2.4.3



More information about the Spice-devel mailing list