proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-02 09:26:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

console: move struct lxc_terminal{_info}

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2018-02-27 18:15:45 +01:00
parent 99a04585ab
commit 13bb312d24
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
2 changed files with 53 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/lxc/conf.h
View File

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

52
src/lxc/console.h
View File

@ -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 */