Implement capabilities and nodeinfo APIs

diff --git a/ChangeLog b/ChangeLog
index efc51dba07229fd1ff4a0fe318dda834a5476f46..1566a53159d20a53d760580b32bf45009580cabb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jun  3 14:29:52 BST 2009 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/lxc_driver.c: Implement capabilities and nodeinfo APIs
+
 Wed Jun  3 14:28:52 BST 2009 Daniel P. Berrange <berrange@redhat.com>
 
        Generic shared impls of all NUMA apis

diff --git a/src/lxc_driver.c b/src/lxc_driver.c
index 0109f15f80037a4801cc8dbc9007c85711e84dd6..f2279a7f7edb721e487adaad90f88d7ff9a2004f 100644 (file)
--- a/src/lxc_driver.c
+++ b/src/lxc_driver.c
@@ -47,6 +47,7 @@
 #include "veth.h"
 #include "event.h"
 #include "cgroup.h"
+#include "nodeinfo.h"
 
 
 #define VIR_FROM_THIS VIR_FROM_LXC
@@ -115,6 +116,19 @@ static int lxcClose(virConnectPtr conn)
     return 0;
 }
 
+static char *lxcGetCapabilities(virConnectPtr conn) {
+    lxc_driver_t *driver = conn->privateData;
+    char *xml;
+
+    lxcDriverLock(driver);
+    if ((xml = virCapabilitiesFormatXML(driver->caps)) == NULL)
+        virReportOOMError(conn);
+    lxcDriverUnlock(driver);
+
+    return xml;
+}
+
+
 static virDomainPtr lxcDomainLookupByID(virConnectPtr conn,
                                         int id)
 {
@@ -1429,8 +1443,8 @@ static virDriver lxcDriver = {
     lxcVersion, /* version */
     lxcGetHostname, /* getHostname */
     NULL, /* getMaxVcpus */
-    NULL, /* nodeGetInfo */
-    NULL, /* getCapabilities */
+    nodeGetInfo, /* nodeGetInfo */
+    lxcGetCapabilities, /* getCapabilities */
     lxcListDomains, /* listDomains */
     lxcNumDomains, /* numOfDomains */
     lxcDomainCreateAndStart, /* domainCreateXML */
@@ -1478,8 +1492,8 @@ static virDriver lxcDriver = {
     NULL, /* domainInterfaceStats */
     NULL, /* domainBlockPeek */
     NULL, /* domainMemoryPeek */
-    NULL, /* nodeGetCellsFreeMemory */
-    NULL, /* getFreeMemory */
+    nodeGetCellsFreeMemory, /* nodeGetCellsFreeMemory */
+    nodeGetFreeMemory,  /* getFreeMemory */
     NULL, /* domainEventRegister */
     NULL, /* domainEventDeregister */
     NULL, /* domainMigratePrepare2 */