ch_domain: Add virChrdevs for console support

Add and initialize a virChrdevs to the _virCHDomainObjPrivate
structure in order to eventually track the consoles in use by a domain.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: William Douglas <william.douglas@intel.com>

diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c
index 780a46ba00aaa49ac4d59d06d5014e29f5173913..1bb35272da3687cedc5b22a5f456267b7fc646ab 100644 (file)
--- a/src/ch/ch_domain.c
+++ b/src/ch/ch_domain.c
@@ -22,6 +22,7 @@
 
 #include "ch_domain.h"
 #include "viralloc.h"
+#include "virchrdev.h"
 #include "virlog.h"
 #include "virtime.h"
 
@@ -146,6 +147,12 @@ virCHDomainObjPrivateAlloc(void *opaque G_GNUC_UNUSED)
         return NULL;
     }
 
+    if (!(priv->chrdevs = virChrdevAlloc())) {
+        virCHDomainObjFreeJob(priv);
+        g_free(priv);
+        return NULL;
+    }
+
     return priv;
 }
 
@@ -154,6 +161,7 @@ virCHDomainObjPrivateFree(void *data)
 {
     virCHDomainObjPrivate *priv = data;
 
+    virChrdevFree(priv->chrdevs);
     virCHDomainObjFreeJob(priv);
     g_free(priv);
 }

diff --git a/src/ch/ch_domain.h b/src/ch/ch_domain.h
index b4e0d4c2129be7b582385c461ecd509bb55e2c5e..61b34b04675c666a7c84f451b01ca3368a6841dd 100644 (file)
--- a/src/ch/ch_domain.h
+++ b/src/ch/ch_domain.h
@@ -22,6 +22,7 @@
 
 #include "ch_conf.h"
 #include "ch_monitor.h"
+#include "virchrdev.h"
 
 /* Give up waiting for mutex after 30 seconds */
 #define CH_JOB_WAIT_TIME (1000ull * 30)
@@ -52,6 +53,8 @@ struct _virCHDomainObjPrivate {
     struct virCHDomainJobObj job;
 
     virCHMonitor *monitor;
+
+     virChrdevs *chrdevs;
 };
 
 extern virDomainXMLPrivateDataCallbacks virCHDriverPrivateDataCallbacks;