src: Fix return types of .stateInitialize callbacks

The virStateDriver struct has .stateInitialize callback which is
declared to return virDrvStateInitResult enum. But some drivers
return a plain int in their implementation which is UB.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index 4203b13f948a0e528adbdfb49d29add911074827..2bd1e4c3878c103cdfbdc075ed1b97533ca5a685 100644 (file)
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -1176,7 +1176,7 @@ bhyveStateCleanup(void)
     return 0;
 }
 
-static int
+static virDrvStateInitResult
 bhyveStateInitialize(bool privileged,
                      const char *root,
                      bool monolithic G_GNUC_UNUSED,

diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c
index 7308f40249e246ddf65e1987d23cfe5fff74e4b5..fbeac608251c7a0faa74ca15c132299b42200a6e 100644 (file)
--- a/src/ch/ch_driver.c
+++ b/src/ch/ch_driver.c
@@ -1365,11 +1365,12 @@ static int chStateCleanup(void)
     return 0;
 }
 
-static int chStateInitialize(bool privileged,
-                             const char *root,
-                             bool monolithic G_GNUC_UNUSED,
-                             virStateInhibitCallback callback G_GNUC_UNUSED,
-                             void *opaque G_GNUC_UNUSED)
+static virDrvStateInitResult
+chStateInitialize(bool privileged,
+                  const char *root,
+                  bool monolithic G_GNUC_UNUSED,
+                  virStateInhibitCallback callback G_GNUC_UNUSED,
+                  void *opaque G_GNUC_UNUSED)
 {
     int ret = VIR_DRV_STATE_INIT_ERROR;
     int rv;

diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c
index d4a11157ccc9dc4f1b023cb69548e674d81b5dfe..16e121566369916a781577c1da45df5c02705265 100644 (file)
--- a/src/interface/interface_backend_netcf.c
+++ b/src/interface/interface_backend_netcf.c
@@ -86,7 +86,7 @@ virNetcfDriverStateDispose(void *obj)
 }
 
 
-static int
+static virDrvStateInitResult
 netcfStateInitialize(bool privileged,
                      const char *root,
                      bool monolithic G_GNUC_UNUSED,

diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c
index 8bb19d77642beda958ad660120d9259ed655d98d..fdf11a831810d963cd75ce843402a7e765772f0c 100644 (file)
--- a/src/interface/interface_backend_udev.c
+++ b/src/interface/interface_backend_udev.c
@@ -1091,7 +1091,7 @@ udevInterfaceIsActive(virInterfacePtr ifinfo)
 static int
 udevStateCleanup(void);
 
-static int
+static virDrvStateInitResult
 udevStateInitialize(bool privileged,
                     const char *root,
                     bool monolithic G_GNUC_UNUSED,

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 4d5eb920bf2e21df50484bd4aee98785179308f4..7dcae5841350c18c950d6fdd9c15e9eaf33e97cd 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -645,7 +645,7 @@ libxlAddDom0(libxlDriverPrivate *driver)
     return ret;
 }
 
-static int
+static virDrvStateInitResult
 libxlStateInitialize(bool privileged,
                      const char *root,
                      bool monolithic G_GNUC_UNUSED,

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 1842ae8f0e99cc7cc4ed71e02587f6c21a29db97..f76d09e8a906f3793d47f42fa5e4a96d01c8ec75 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -1429,11 +1429,12 @@ lxcSecurityInit(virLXCDriverConfig *cfg)
 }
 
 
-static int lxcStateInitialize(bool privileged,
-                              const char *root,
-                              bool monolithic G_GNUC_UNUSED,
-                              virStateInhibitCallback callback G_GNUC_UNUSED,
-                              void *opaque G_GNUC_UNUSED)
+static virDrvStateInitResult
+lxcStateInitialize(bool privileged,
+                   const char *root,
+                   bool monolithic G_GNUC_UNUSED,
+                   virStateInhibitCallback callback G_GNUC_UNUSED,
+                   void *opaque G_GNUC_UNUSED)
 {
     virLXCDriverConfig *cfg = NULL;
     bool autostart = true;

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index e5f9ecf9e836ec68ddc12d72874404f29a17072d..d7c1ef172dde693388581076c20b367b1cf89fe6 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -576,7 +576,7 @@ firewalld_dbus_signal_callback(GDBusConnection *connection G_GNUC_UNUSED,
  *
  * Initialization function for the QEMU daemon
  */
-static int
+static virDrvStateInitResult
 networkStateInitialize(bool privileged,
                        const char *root,
                        bool monolithic G_GNUC_UNUSED,

diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index f1e402f8f7f69ad0492dbb70b4f55735c14c8037..237cd7f64556baf782059def83d6e645f84460c4 100644 (file)
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -2229,7 +2229,7 @@ mdevctlEventHandleCallback(GFileMonitor *monitor G_GNUC_UNUSED,
 }
 
 
-static int
+static virDrvStateInitResult
 nodeStateInitialize(bool privileged,
                     const char *root,
                     bool monolithic G_GNUC_UNUSED,

diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 09719edd75fa1d075c4a16912b18c093382b0b52..8ece91bf7cecd02052ae0c2f5ed5111d30ca064b 100644 (file)
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -208,7 +208,7 @@ nwfilterStateCleanup(void)
  *
  * Initialization function for the QEMU daemon
  */
-static int
+static virDrvStateInitResult
 nwfilterStateInitialize(bool privileged,
                         const char *root,
                         bool monolithic G_GNUC_UNUSED,

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d01f788aea8aabc33c2727702fbdd47e0394c454..e2698c792462717fbe5b413712bfb8e3bc86780f 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -546,7 +546,7 @@ qemuDomainFindMaxID(virDomainObj *vm,
  *
  * Initialization function for the QEMU daemon
  */
-static int
+static virDrvStateInitResult
 qemuStateInitialize(bool privileged,
                     const char *root,
                     bool monolithic G_GNUC_UNUSED,

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 7b73d97b7a74a257a49ee246967ed948cc159722..e76d9e9ba49704dbde132d72a466e2a226ab2666 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -174,7 +174,7 @@ static void make_nonnull_domain_snapshot(remote_nonnull_domain_snapshot *snapsho
 /* Helper functions for remoteOpen. */
 
 
-static int
+static virDrvStateInitResult
 remoteStateInitialize(bool privileged G_GNUC_UNUSED,
                       const char *root G_GNUC_UNUSED,
                       bool monolithic,

diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
index c7bd65b4e96263c1cb2c38809dc988875ba52c45..a2d6b879d0805ef655c392c12090c80142c73821 100644 (file)
--- a/src/secret/secret_driver.c
+++ b/src/secret/secret_driver.c
@@ -488,7 +488,7 @@ secretStateCleanup(void)
 }
 
 
-static int
+static virDrvStateInitResult
 secretStateInitialize(bool privileged,
                       const char *root,
                       bool monolithic G_GNUC_UNUSED,

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index 314fe930e055cc740841a5180fc9a991635b28fe..86c03762d2717216eac29e7458e14fe23e3f590b 100644 (file)
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -239,7 +239,7 @@ storageDriverAutostart(void)
  *
  * Initialization function for the Storage Driver
  */
-static int
+static virDrvStateInitResult
 storageStateInitialize(bool privileged,
                        const char *root,
                        bool monolithic G_GNUC_UNUSED,

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 380fdcb57eaccd7935a73a42c32d368e8ed3831d..4edea4bf1837cd9a81fd0487b0de536d85cc8348 100644 (file)
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -4068,7 +4068,7 @@ vzStateCleanup(void)
     return 0;
 }
 
-static int
+static virDrvStateInitResult
 vzStateInitialize(bool privileged,
                   const char *root,
                   bool monolithic G_GNUC_UNUSED,