[Spice-devel] [PATCH 08/13] Move RedsMigSpice to main-channel.h

[Frediano Ziglio]

From: Jonathon Jongsma <jjongsma at redhat.com>

This is the place that needs the complete type definition. If it is
defined in reds.h, it can create circular references.
---
 server/main_channel.h | 9 ++++++++-
 server/reds.h         | 7 -------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/server/main_channel.h b/server/main_channel.h
index c8e9ade..d371d79 100644
--- a/server/main_channel.h
+++ b/server/main_channel.h
@@ -21,7 +21,6 @@
 #include <stdint.h>
 #include <spice/vd_agent.h>
 #include "common/marshaller.h"
-#include "reds.h"
 #include "red_channel.h"
 
 // TODO: Defines used to calculate receive buffer size, and also by reds.c
@@ -33,6 +32,14 @@
 #define MAIN_CHANNEL_RECEIVE_BUF_SIZE \
     (4096 + (REDS_AGENT_WINDOW_SIZE + REDS_NUM_INTERNAL_AGENT_MESSAGES) * SPICE_AGENT_MAX_DATA_SIZE)
 
+struct RedsMigSpice {
+    char *host;
+    char *cert_subject;
+    int port;
+    int sport;
+};
+typedef struct RedsMigSpice RedsMigSpice;
+
 typedef struct MainChannel {
     RedChannel base;
     uint8_t recv_buf[MAIN_CHANNEL_RECEIVE_BUF_SIZE];
diff --git a/server/reds.h b/server/reds.h
index 0483c71..a9c2df9 100644
--- a/server/reds.h
+++ b/server/reds.h
@@ -44,13 +44,6 @@ struct SpiceMigrateState {
     int dummy;
 };
 
-typedef struct RedsMigSpice {
-    char *host;
-    char *cert_subject;
-    int port;
-    int sport;
-} RedsMigSpice;
-
 /* main thread only */
 void reds_handle_channel_event(int event, SpiceChannelEventInfo *info);
 
-- 
2.1.0