github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-23 14:07:42 +00:00
Code Issues Projects Releases Wiki Activity

dm: support VMs communication with virtio-console

Browse Source 
Adding the feature of communication between VMs using virtio-console
based on appointed socket file. Not appointing the socket type will set
the socket type to be server in default.

Example:
Server: adding "-s 5,virtio-console,socket:console=/path/console.sock:server"
Client: adding "-s 6,virtio-console,socket:console=/path/console.sock:client"

Tracked-On: #3232
Signed-off-by: Gao Junhao <junhao.gao@intel.com>
Acked-by: Yu Wang <yu1.wang@intel.com>
This commit is contained in:
Conghui Chen 2019-06-06 03:34:56 +08:00 committed by ACRN System Integration
parent c0bffc2f58
commit 765669ee35
1 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
devicemodel/hw/pci/virtio/virtio_console.c
View File

@ -115,6 +115,7 @@ struct virtio_console_backend {
enum virtio_console_be_type be_type; enum virtio_console_be_type be_type;
int pts_fd; /* only valid for PTY */ int pts_fd; /* only valid for PTY */
const char *portpath; const char *portpath;
const char *socket_type;
}; };
struct virtio_console { struct virtio_console {
@ -729,28 +730,46 @@ virtio_console_config_backend(struct virtio_console_backend *be)
addr.sun_family = AF_UNIX; addr.sun_family = AF_UNIX;
strcpy(addr.sun_path, be->portpath); strcpy(addr.sun_path, be->portpath);
if (be->socket_type == NULL || !strcmp(be->socket_type,"server")) {
unlink(be->portpath); unlink(be->portpath);
if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)) == -1) { if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
WPRINTF(("Bind Error = %d\n", errno)); WPRINTF(("Bind Error = %d\n", errno));
return -1; return -1;
} }
if (listen(fd, 64) == -1) { if (listen(fd, 64) == -1) {
WPRINTF(("Listen Error= %d\n", errno)); WPRINTF(("Listen Error= %d\n", errno));
return -1; return -1;
} }
if (make_socket_non_blocking(fd) == -1) { if (make_socket_non_blocking(fd) == -1) {
WPRINTF(("Backend config: fcntl Error\n")); WPRINTF(("Backend config: fcntl Error\n"));
return -1; return -1;
} }
be->evp = mevent_add(fd, EVF_READ, virtio_console_accept_new_connection, be, NULL, NULL);
be->evp = mevent_add(fd, EVF_READ, virtio_console_accept_new_connection, be,
NULL, NULL);
if (be->evp == NULL) { if (be->evp == NULL) {
WPRINTF(("Socket Accept mevent_add failed\n")); WPRINTF(("Socket Accept mevent_add failed\n"));
return -1; return -1;
} }
} else if (!strcmp(be->socket_type,"client")) {
if (access(be->portpath,0)) {
WPRINTF(("%s not exist\n", be->portpath));
return -1;
}
/*
* When the VM reset, client will not able to connect to server.
* But here only show some warning.
* TODO: implement re-connect function
*/
if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
WPRINTF(("vtcon: connect error[%d] \n", errno));
} else {
if (make_socket_non_blocking(fd) == -1) {
WPRINTF(("Backend config: fcntl Error\n"));
}
}
} else {
WPRINTF(("Socket type not exist\n"));
return -1;
}
default: default:
break; /* nothing to do */ break; /* nothing to do */
@ -780,11 +799,12 @@ virtio_console_add_backend(struct virtio_console *console, char *opts)
char *backend = NULL; char *backend = NULL;
char *portname = NULL; char *portname = NULL;
char *portpath = NULL; char *portpath = NULL;
char *socket_type = NULL;
char *opt; char *opt;
enum virtio_console_be_type be_type = VIRTIO_CONSOLE_BE_INVALID; enum virtio_console_be_type be_type = VIRTIO_CONSOLE_BE_INVALID;
/* virtio-console,[@]stdio|tty|pty|file:portname[=portpath] /* virtio-console,[@]stdio|tty|pty|file:portname[=portpath]
* [,[@]stdio|tty|pty|file:portname[=portpath]] * [,[@]stdio|tty|pty|file:portname[=portpath][:socket_type]]
*/ */
while ((opt = strsep(&opts, ",")) != NULL) { while ((opt = strsep(&opts, ",")) != NULL) {
backend = strsep(&opt, ":"); backend = strsep(&opt, ":");
@ -810,8 +830,14 @@ virtio_console_add_backend(struct virtio_console *console, char *opts)
} }
if (opt != NULL) { if (opt != NULL) {
if (be_type == VIRTIO_CONSOLE_BE_SOCKET) {
portname = strsep(&opt, "=");
portpath = strsep(&opt, ":");
socket_type = opt;
} else {
portname = strsep(&opt, "="); portname = strsep(&opt, "=");
portpath = opt; portpath = opt;
}
if (portpath == NULL if (portpath == NULL
&& be_type != VIRTIO_CONSOLE_BE_STDIO && be_type != VIRTIO_CONSOLE_BE_STDIO
&& be_type != VIRTIO_CONSOLE_BE_PTY && be_type != VIRTIO_CONSOLE_BE_PTY
@ -839,6 +865,7 @@ virtio_console_add_backend(struct virtio_console *console, char *opts)
be->fd = fd; be->fd = fd;
be->be_type = be_type; be->be_type = be_type;
be->portpath = portpath; be->portpath = portpath;
be->socket_type = socket_type;
if (virtio_console_config_backend(be) < 0) { if (virtio_console_config_backend(be) < 0) {
WPRINTF(("vtcon: virtio_console_config_backend failed\n")); WPRINTF(("vtcon: virtio_console_config_backend failed\n"));