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

diff --git a/ChangeLog b/ChangeLog
index fa63ff8e7855179e329b247a2abc219695a8954e..2ebe11b6fbe491b09c6ea89305aec999d5157389 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/src/domain_conf.h b/src/domain_conf.h
index c236a66ce4308a15fcc10033f66d3569346e68d7..44b5169baca7e808332002ae7e40289a2cd2214a 100644 (file)
--- 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 2e9625a6195d87244e3ae7290476be46aec5ca3d..2e20c1b8c618ef0b92da6cd9c170625534126e21 100644 (file)
--- 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 91bb6e5aebdef7a0a7a0cf3ddd0e45cdedf2e69b..17a1e7f81d8bb7152e493c1c77d119f760d99b9e 100644 (file)
--- 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);