github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-07-04 02:56:52 +00:00
Code Issues Projects Releases Wiki Activity

dm: bugfix for remote launch guest issue

Browse Source 
when stdio is set as a virtio-console, guest run in backend, the open
file descriptor is not referring to a terminal.

Tracked-On: #3473
Signed-off-by: Gao Junhao <junhao.gao@intel.com>
Reviewed-by: Jian Jun Chen <jian.jun.chen@intel.com>
This commit is contained in:
Gao Junhao 2019-07-25 13:07:39 +00:00 committed by wenlingz
parent 4a27d08360
commit c175141c77
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -906,13 +906,6 @@ virtio_console_add_backend(struct virtio_console *console, char *opt)
be->evp = mevent_add(fd, EVF_READ, be->evp = mevent_add(fd, EVF_READ,
virtio_console_accept_new_connection, be, virtio_console_accept_new_connection, be,
virtio_console_teardown_backend, be); virtio_console_teardown_backend, be);
}
else if (isatty(fd) || (be->be_type == VIRTIO_CONSOLE_BE_SOCKET
&& !strcmp(be->socket_type,"client"))) {
be->evp = mevent_add(fd, EVF_READ,
virtio_console_backend_read, be,
virtio_console_teardown_backend, be);
}
if (be->evp == NULL) { if (be->evp == NULL) {
WPRINTF(("vtcon: mevent_add failed\n")); WPRINTF(("vtcon: mevent_add failed\n"));
error = -1; error = -1;
@ -920,6 +913,19 @@ virtio_console_add_backend(struct virtio_console *console, char *opt)
} }
console->ref_count++; console->ref_count++;
} }
else if (isatty(fd) || (be->be_type == VIRTIO_CONSOLE_BE_SOCKET
&& !strcmp(be->socket_type,"client"))) {
be->evp = mevent_add(fd, EVF_READ,
virtio_console_backend_read, be,
virtio_console_teardown_backend, be);
if (be->evp == NULL) {
WPRINTF(("vtcon: mevent_add failed\n"));
error = -1;
goto out;
}
console->ref_count++;
}
}
virtio_console_open_port(be->port, true); virtio_console_open_port(be->port, true);
be->open = true; be->open = true;