From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Tue, 27 Feb 2018 17:15:45 +0000 (+0100)
Subject: console: move struct lxc_terminal{_info}
X-Git-Tag: lxc-3.0.0.beta1~5^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13bb312d24b653abd56e7c0742fccf9b55769b4b;p=thirdparty%2Flxc.git

console: move struct lxc_terminal{_info}

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/conf.h b/src/lxc/conf.h
index b1595e6a9..1f7cd3807 100644
--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -35,6 +35,7 @@
 #endif
 #include <stdbool.h>
 
+#include "console.h"
 #include "list.h"
 #include "ringbuf.h"
 #include "start.h" /* for lxc_handler */
@@ -133,20 +134,6 @@ struct id_map {
 	unsigned long hostid, nsid, range;
 };
 
-/*
- * Defines a structure containing a pty information for
- * virtualizing a tty
- * @name   : the path name of the slave pty side
- * @master : the file descriptor of the master
- * @slave  : the file descriptor of the slave
- */
-struct lxc_terminal_info {
-	char name[MAXPATHLEN];
-	int master;
-	int slave;
-	int busy;
-};
-
 /*
  * Defines the number of tty configured and contains the
  * instantiated ptys
@@ -159,47 +146,7 @@ struct lxc_tty_info {
 
 struct lxc_tty_state;
 
-/*
- * Defines the structure to store the console information
- * @peer   : the file descriptor put/get console traffic
- * @name   : the file name of the slave pty
- */
-struct lxc_terminal {
-	int slave;
-	int master;
-	int peer;
-	struct lxc_terminal_info peerpty;
-	struct lxc_epoll_descr *descr;
-	char *path;
-	char name[MAXPATHLEN];
-	struct termios *tios;
-	struct lxc_tty_state *tty_state;
-
-	struct /* lxc_console_log */ {
-		/* size of the log file */
-		uint64_t log_size;
-
-		/* path to the log file */
-		char *log_path;
-
-		/* fd to the log file */
-		int log_fd;
-
-		/* whether the log file will be rotated */
-		unsigned int log_rotate;
-	};
-
-	struct /* lxc_pty_ringbuf */ {
-		/* size of the ringbuffer */
-		uint64_t buffer_size;
-
-		/* the in-memory ringbuffer */
-		struct lxc_ringbuf ringbuf;
-	};
-};
-
-/*
- * Defines a structure to store the rootfs location, the
+/* Defines a structure to store the rootfs location, the
  * optionals pivot_root, rootfs mount paths
  * @path       : the rootfs source (directory or device)
  * @mount      : where it is mounted
diff --git a/src/lxc/console.h b/src/lxc/console.h
index 17b280648..3212171df 100644
--- a/src/lxc/console.h
+++ b/src/lxc/console.h
@@ -24,11 +24,61 @@
 #ifndef __LXC_CONSOLE_H
 #define __LXC_CONSOLE_H
 
+#include "config.h"
+
 #include <signal.h>
 #include <stdio.h>
 
-#include "conf.h"
 #include "list.h"
+#include "ringbuf.h"
+
+struct lxc_conf;
+
+/* Defines a structure containing a pty information for virtualizing a tty
+ * @name   : the path name of the slave pty side
+ * @master : the file descriptor of the master
+ * @slave  : the file descriptor of the slave
+ */
+struct lxc_terminal_info {
+	char name[MAXPATHLEN];
+	int master;
+	int slave;
+	int busy;
+};
+
+struct lxc_terminal {
+	int slave;
+	int master;
+	int peer;
+	struct lxc_terminal_info peerpty;
+	struct lxc_epoll_descr *descr;
+	char *path;
+	char name[MAXPATHLEN];
+	struct termios *tios;
+	struct lxc_tty_state *tty_state;
+
+	struct /* lxc_console_log */ {
+		/* size of the log file */
+		uint64_t log_size;
+
+		/* path to the log file */
+		char *log_path;
+
+		/* fd to the log file */
+		int log_fd;
+
+		/* whether the log file will be rotated */
+		unsigned int log_rotate;
+	};
+
+	struct /* lxc_pty_ringbuf */ {
+		/* size of the ringbuffer */
+		uint64_t buffer_size;
+
+		/* the in-memory ringbuffer */
+		struct lxc_ringbuf ringbuf;
+	};
+};
 
 struct lxc_epoll_descr; /* defined in mainloop.h */
 struct lxc_container; /* defined in lxccontainer.h */