External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-30 01:43:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove stdout_fd, stderr_fd from virDomainObj

Browse Source 
* 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:
Daniel Veillard 2009-01-20 16:10:20 +00:00
parent 6d004d3f8a
commit 458a673cb7
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 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 * src/domain_conf.h src/qemu_driver.c: use monitor fd for QEmu/KVM

4
src/domain_conf.h
View File

@ -460,10 +460,6 @@ struct _virDomainObj {
virMutex lock; virMutex lock;
int stdin_fd; int stdin_fd;
int stdout_fd;
int stdout_watch;
int stderr_fd;
int stderr_watch;
int monitor; int monitor;
int monitor_watch; int monitor_watch;
char *monitorpath; char *monitorpath;

4
src/lxc_driver.c
View File

@ -779,12 +779,10 @@ static int lxcControllerStart(virConnectPtr conn,
ADD_ARG(NULL); ADD_ARG(NULL);
vm->stdin_fd = -1; vm->stdin_fd = -1;
vm->stdout_fd = vm->stderr_fd = logfd;
FD_SET(appPty, &keepfd); FD_SET(appPty, &keepfd);
if (virExec(conn, largv, NULL, &keepfd, &child, 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) VIR_EXEC_NONE) < 0)
goto cleanup; goto cleanup;

3
src/uml_driver.c
View File

@ -810,13 +810,12 @@ static int umlStartVMDaemon(virConnectPtr conn,
vm->monitor = -1; vm->monitor = -1;
vm->stdin_fd = -1; vm->stdin_fd = -1;
vm->stdout_fd = vm->stderr_fd = logfd;
for (i = 0 ; i < ntapfds ; i++) for (i = 0 ; i < ntapfds ; i++)
FD_SET(tapfds[i], &keepfd); FD_SET(tapfds[i], &keepfd);
ret = virExec(conn, argv, progenv, &keepfd, &pid, ret = virExec(conn, argv, progenv, &keepfd, &pid,
vm->stdin_fd, &vm->stdout_fd, &vm->stderr_fd, vm->stdin_fd, &logfd, &logfd,
VIR_EXEC_DAEMON); VIR_EXEC_DAEMON);
close(logfd); close(logfd);