diff --git a/ChangeLog b/ChangeLog index fa63ff8e78..2ebe11b6fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Jan 20 17:08:20 CET 2009 Daniel Veillard + + * 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 * src/domain_conf.h src/qemu_driver.c: use monitor fd for QEmu/KVM diff --git a/src/domain_conf.h b/src/domain_conf.h index c236a66ce4..44b5169bac 100644 --- a/src/domain_conf.h +++ b/src/domain_conf.h @@ -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; diff --git a/src/lxc_driver.c b/src/lxc_driver.c index 2e9625a619..2e20c1b8c6 100644 --- a/src/lxc_driver.c +++ b/src/lxc_driver.c @@ -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; diff --git a/src/uml_driver.c b/src/uml_driver.c index 91bb6e5aeb..17a1e7f81d 100644 --- a/src/uml_driver.c +++ b/src/uml_driver.c @@ -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);