travis: use libkvmi repo

.travis.yml

@@ -4,13 +4,15 @@ language: c
 
 # install libkvmi for all tests
 before_install:
-  # install in /tmp/kvm to avoid breaking astyle test
-  - git clone https://github.com/KVM-VMI/kvm --branch kvmi --depth 1 /tmp/kvm
-  - pushd /tmp/kvm/tools/kvm/kvmi
+  # install in /tmp/libkvmi to avoid breaking astyle test
+  - git clone https://github.com/bitdefender/libkvmi --branch kvmi-v6 /tmp/libkvmi
+  - pushd /tmp/libkvmi
+  - ./bootstrap
+  - ./configure
   - make
   - sudo make install
   - popd
-  - rm -rf kvm
+  - rm -rf /tmp/libkvmi
 
 jobs:
     include:

Makefile.am

@@ -150,6 +150,10 @@ libvmi_libvmi_la_CFLAGS= -fvisibility=hidden $(GLIB_CFLAGS) $(JSONC_CFLAGS)
 libvmi_libvmi_la_LDFLAGS= $(GLIB_LIBS) $(JSONC_LIBS) -no-undefined
 libvmi_libvmi_la_LDFLAGS+= -version-info $(VERSION)
 
+if WITH_KVM
+    libvmi_libvmi_la_CFLAGS += $(LIBKVMI_CFLAGS)
+endif
+
 if ENABLE_CONFIGFILE
     config_h_sources = libvmi/config/config_parser.h
     config_c_sources = libvmi/config/grammar.y libvmi/config/lexicon.l

configure.ac

@@ -317,7 +317,7 @@ PKG_CHECK_MODULES([JSONC], [json-c], [have_jsonc='yes'], [have_jsonc='no'])
         AC_DEFINE([ENABLE_KVM_LEGACY], [1],
                   [Define to 1 to enable legacy KVM driver support.])
     [else]
-        AC_CHECK_HEADER([kvmi/libkvmi.h], [],
+        PKG_CHECK_MODULES([LIBKVMI], [libkvmi], [],
             [AC_MSG_ERROR([No libkvmi headers found. Install the library or
              enable the legacy KVM driver with --enable-kvm-legacy])])
     [fi]

libvmi/CMakeLists.txt

@@ -135,10 +135,13 @@ if (ENABLE_KVM)
             endif ()
         else ()
             # KVM driver based on KVMi series, API is exposed via libkvmi
-            find_package(Libkvmi)
+            pkg_search_module(Libkvmi libkvmi)
             if (NOT Libkvmi_FOUND)
                 set(ENABLE_KVM OFF CACHE BOOL "Build KVM driver" FORCE)
                 message(WARNING "Cannot find libkvmi: disabling KVM driver")
+            else ()
+                message("Found libkvmi headers: ${Libkvmi_INCLUDE_DIRS}")
+                target_include_directories(vmi_shared PRIVATE ${Libkvmi_INCLUDE_DIRS})
             endif ()
         endif ()
         target_include_directories(vmi_shared PRIVATE ${JSON-C_INCLUDE_DIRS})

libvmi/driver/kvm/kvm.c

@@ -44,7 +44,7 @@
 #include <glib/gstdio.h>
 #include <libvirt/libvirt.h>
 #include <libvirt/virterror.h>
-#include <kvmi/libkvmi.h>
+#include <libkvmi.h>
 
 #include "private.h"
 #include "msr-index.h"

libvmi/driver/kvm/kvm_private.h

@@ -29,16 +29,17 @@
 #ifndef KVM_PRIVATE_H
 #define KVM_PRIVATE_H
 
+// config.h is parsed in private.h (ENABLE_KVM_LEGACY)
+#include "private.h"
+
 #include <libvirt/libvirt.h>
 #include <libvirt/virterror.h>
 #ifndef ENABLE_KVM_LEGACY
-# include <kvmi/libkvmi.h>
+# include <libkvmi.h>
+# include "libkvmi_wrapper.h"
 #endif
 
-
-#include "private.h"
 #include "libvirt_wrapper.h"
-#include "libkvmi_wrapper.h"
 
 typedef struct kvm_instance {
     virConnectPtr conn;

libvmi/driver/kvm/libkvmi_wrapper.h

@@ -23,10 +23,12 @@
 #define LIBKVMI_WRAPPER_H
 
 #include <stdint.h>
-#include <kvmi/libkvmi.h>
+#include <libkvmi.h>
 
 #include "private.h"
 
+struct kvm_instance;
+
 // wrapper struct
 typedef struct {
 

libvmi/driver/kvm/libvirt_wrapper.h

@@ -20,11 +20,11 @@
  * along with LibVMI.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
 #include <libvirt/libvirt.h>
 #include <dlfcn.h>
 
 #include "libvmi.h"
+#include "private.h"
 
 struct kvm_instance;