[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH]: remove stdout_fd, stderr_fd from virDomainObj



Hi,
After applying the previous two patches the qemu driver doesn't need
these anymore and they can then be removed from lxc/uml as well.
 -- Guido
>From 2be075e11c0df03de29afdf0b0a05db2d06b4386 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx sigxcpu org>
Date: Tue, 20 Jan 2009 08:12:24 +0100
Subject: [PATCH] nuke stderr_fd, stdout_fd from virDomainObj

---
 src/domain_conf.h |    4 ----
 src/lxc_driver.c  |    4 +---
 src/uml_driver.c  |    3 +--
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/domain_conf.h b/src/domain_conf.h
index c236a66..44b5169 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 2e9625a..2e20c1b 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 91bb6e5..17a1e7f 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);
 
-- 
1.6.0.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]