bhyve: Fix the build

After 1036ddadb276e we use bhyveDriverGetCapabilities from other
sources too, not only from bhyve_driver.c. However, the function
was static so not properly expose to other files. In order to
expose it, we need to move couple of #include-s too.
Then, there has been a copy paste error in
virBhyveProcessReconnect: s/privconn/data->driver/.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index f486f869c319655b0f2f43062f24e6d51bcdcf6a..921989069e76914b47c8d4bcf51782800dd46eb3 100644 (file)
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -30,7 +30,6 @@
 #include "datatypes.h"
 #include "virbuffer.h"
 #include "viruuid.h"
-#include "capabilities.h"
 #include "configmake.h"
 #include "viralloc.h"
 #include "network_conf.h"
@@ -58,7 +57,6 @@
 #include "bhyve_command.h"
 #include "bhyve_domain.h"
 #include "bhyve_process.h"
-#include "bhyve_utils.h"
 #include "bhyve_capabilities.h"
 
 #define VIR_FROM_THIS   VIR_FROM_BHYVE
@@ -127,7 +125,7 @@ bhyveAutostartDomains(bhyveConnPtr driver)
  *
  * Returns: a reference to a virCapsPtr instance or NULL
  */
-static virCapsPtr ATTRIBUTE_NONNULL(1)
+virCapsPtr ATTRIBUTE_NONNULL(1)
 bhyveDriverGetCapabilities(bhyveConnPtr driver)
 {
 

diff --git a/src/bhyve/bhyve_driver.h b/src/bhyve/bhyve_driver.h
index 221d5a0566ac342863c18b2fbb60da57a1d04640..a290c4a6c81df426f1ce4f25605eba0f5e70e920 100644 (file)
--- a/src/bhyve/bhyve_driver.h
+++ b/src/bhyve/bhyve_driver.h
@@ -23,10 +23,15 @@
 #ifndef __BHYVE_DRIVER_H__
 # define __BHYVE_DRIVER_H__
 
+#include "capabilities.h"
+#include "bhyve_utils.h"
+
 int bhyveRegister(void);
 
 unsigned bhyveDriverGetCaps(virConnectPtr conn);
 
 unsigned bhyveDriverGetGrubCaps(virConnectPtr conn);
 
+virCapsPtr bhyveDriverGetCapabilities(bhyveConnPtr driver);
+
 #endif /* __BHYVE_DRIVER_H__ */

diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c
index 9763d719cf375d647ddb8e82ee6fe98825790519..14588a9261d45693d7ce0dfff341cc1b0cf9eb61 100644 (file)
--- a/src/bhyve/bhyve_process.c
+++ b/src/bhyve/bhyve_process.c
@@ -32,6 +32,7 @@
 #include <net/if_tap.h>
 
 #include "bhyve_device.h"
+#include "bhyve_driver.h"
 #include "bhyve_command.h"
 #include "bhyve_monitor.h"
 #include "bhyve_process.h"
@@ -375,7 +376,7 @@ virBhyveProcessReconnect(virDomainObjPtr vm,
     if (!vm->pid)
         return 0;
 
-    caps = bhyveDriverGetCapabilities(privconn);
+    caps = bhyveDriverGetCapabilities(data->driver);
     if (!caps)
         return -1;