mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 17:34:18 +03:00
remove stdout_fd, stderr_fd from virDomainObj
* src/domain_conf.h src/lxc_driver.c src/uml_driver.c: virDomainObj doesn't need stdout and stderr fields anymore, patch from Guido Günther daniel
This commit is contained in:
parent
6d004d3f8a
commit
458a673cb7
@ -1,3 +1,9 @@
|
||||
Tue Jan 20 17:08:20 CET 2009 Daniel Veillard <veillard@redhat.com>
|
||||
|
||||
* src/domain_conf.h src/lxc_driver.c src/uml_driver.c: virDomainObj
|
||||
doesn't need stdout and stderr fields anymore, patch from
|
||||
Guido Günther
|
||||
|
||||
Tue Jan 20 16:48:00 CET 2009 Daniel Veillard <veillard@redhat.com>
|
||||
|
||||
* src/domain_conf.h src/qemu_driver.c: use monitor fd for QEmu/KVM
|
||||
|
@ -460,10 +460,6 @@ struct _virDomainObj {
|
||||
virMutex lock;
|
||||
|
||||
int stdin_fd;
|
||||
int stdout_fd;
|
||||
int stdout_watch;
|
||||
int stderr_fd;
|
||||
int stderr_watch;
|
||||
int monitor;
|
||||
int monitor_watch;
|
||||
char *monitorpath;
|
||||
|
@ -779,12 +779,10 @@ static int lxcControllerStart(virConnectPtr conn,
|
||||
ADD_ARG(NULL);
|
||||
|
||||
vm->stdin_fd = -1;
|
||||
vm->stdout_fd = vm->stderr_fd = logfd;
|
||||
|
||||
FD_SET(appPty, &keepfd);
|
||||
|
||||
if (virExec(conn, largv, NULL, &keepfd, &child,
|
||||
vm->stdin_fd, &vm->stdout_fd, &vm->stderr_fd,
|
||||
vm->stdin_fd, &logfd, &logfd,
|
||||
VIR_EXEC_NONE) < 0)
|
||||
goto cleanup;
|
||||
|
||||
|
@ -810,13 +810,12 @@ static int umlStartVMDaemon(virConnectPtr conn,
|
||||
|
||||
vm->monitor = -1;
|
||||
vm->stdin_fd = -1;
|
||||
vm->stdout_fd = vm->stderr_fd = logfd;
|
||||
|
||||
for (i = 0 ; i < ntapfds ; i++)
|
||||
FD_SET(tapfds[i], &keepfd);
|
||||
|
||||
ret = virExec(conn, argv, progenv, &keepfd, &pid,
|
||||
vm->stdin_fd, &vm->stdout_fd, &vm->stderr_fd,
|
||||
vm->stdin_fd, &logfd, &logfd,
|
||||
VIR_EXEC_DAEMON);
|
||||
close(logfd);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user