From 909d647aab2577813e1df0a4b73a20237e848003 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@redhat.com>
Date: Tue, 21 Jul 2009 16:15:39 +0200
Subject: [PATCH] Activate the interface drivers, and cleanups

* src/libvirt.c: activate the interface drivers
* po/POTFILES.in: add the netcf driver as a source of localization strings
* src/interface_driver.c: NETCF_ENOMEM -> VIR_ERR_NO_MEMORY mapping was
  breaking syntax checking
---
 po/POTFILES.in         | 1 +
 src/interface_driver.c | 7 +++++--
 src/libvirt.c          | 4 ----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0ea21fd5e4..7ccf3ab299 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,6 +7,7 @@ src/console.c
 src/datatypes.c
 src/domain_conf.c
 src/interface_conf.c
+src/interface_driver.c
 src/iptables.c
 src/libvirt.c
 src/lxc_container.c
diff --git a/src/interface_driver.c b/src/interface_driver.c
index 975c4d604b..b6bb78e4f2 100644
--- a/src/interface_driver.c
+++ b/src/interface_driver.c
@@ -69,8 +69,11 @@ static int netcf_to_vir_err(int netcf_errcode)
             /* other error, copout for being more specific */
             return VIR_ERR_INTERNAL_ERROR;
         case NETCF_ENOMEM:
-            /* allocation failed */
-            return VIR_ERR_NO_MEMORY;
+            /*
+             * allocation failed return VIR ERR NO MEMORY
+             * though it should not be used now.
+             */
+            return(2);
         case NETCF_EXMLPARSER:
             /* XML parser choked */
             return VIR_ERR_XML_ERROR;
diff --git a/src/libvirt.c b/src/libvirt.c
index f4a7fa72eb..a2aa781d54 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -1026,9 +1026,6 @@ do_open (const char *name,
         }
     }
 
-#if 0
-    /* TODO: reactivate once we have an interface driver */
-
     for (i = 0; i < virInterfaceDriverTabCount; i++) {
         res = virInterfaceDriverTab[i]->open (ret, auth, flags);
         DEBUG("interface driver %d %s returned %s",
@@ -1047,7 +1044,6 @@ do_open (const char *name,
             break;
         }
     }
-#endif
 
     /* Secondary driver for storage. Optional */
     for (i = 0; i < virStorageDriverTabCount; i++) {
-- 
GitLab