~ubuntu-branches/ubuntu/quantal/libvirt/quantal

« back to all changes in this revision

Viewing changes to debian/patches/netcf-daemon-fix-wrong-macro-name

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2012-08-08 07:54:16 UTC
  • Revision ID: package-import@ubuntu.com-20120808075416-ydw40hvvliag1bjb
Tags: 0.9.13-0ubuntu6
* enable netcf support (LP: #520386)
  - debian/control: build-dep on libnetcf-dev
  - debian/rules: add --with-netcf to configure args
* add patch netcf-daemon-fix-wrong-macro-name from upstream so netcf support
  can actually work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
commit 98518178a235532c280b4a18a85d7b1323d09c7f
 
2
Author: Osier Yang <jyang@redhat.com>
 
3
Date:   Fri Jul 20 22:25:17 2012 +0800
 
4
 
 
5
    daemon: Fix the wrong macro name
 
6
    
 
7
    WITH_INTERFACE is not defined, it should be WITH_NETCF there to load
 
8
    the interface driver.
 
9
    
 
10
    Eric posted patch weeks ago to resolve the problems in the whole
 
11
    build system, but it's not finalised yet:
 
12
    
 
13
    https://www.redhat.com/archives/libvir-list/2012-June/msg01299.html
 
14
    
 
15
    I'm going to simply fix the wrong macro name here so that the
 
16
    interface driver could loaded, and continue the work on the listing
 
17
    API for interface driver.
 
18
 
 
19
diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
 
20
index a7bb9dd..ffbe067 100644
 
21
--- a/daemon/libvirtd.c
 
22
+++ b/daemon/libvirtd.c
 
23
@@ -378,7 +378,7 @@ static void daemonInitialize(void)
 
24
 # ifdef WITH_NWFILTER
 
25
     virDriverLoadModule("nwfilter");
 
26
 # endif
 
27
-# ifdef WITH_INTERFACE
 
28
+# ifdef WITH_NETCF
 
29
     virDriverLoadModule("interface");
 
30
 # endif
 
31
 # ifdef WITH_QEMU
 
32
diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c
 
33
index 8762de4..4d6e91e 100644
 
34
--- a/tests/virdrivermoduletest.c
 
35
+++ b/tests/virdrivermoduletest.c
 
36
@@ -79,7 +79,7 @@ mymain(void)
 
37
 #ifdef WITH_NWFILTER
 
38
     TEST("nwfilter", NULL);
 
39
 #endif
 
40
-#ifdef WITH_INTERFACE
 
41
+#ifdef WITH_NETCF
 
42
     TEST("interface", NULL);
 
43
 #endif
 
44
 #ifdef WITH_QEMU