[PATCH 4/5] node_device: Move fwd declaration of udevNodeRegister() into correct header file

Michal Privoznik mprivozn at redhat.com
Tue Oct 25 15:15:31 UTC 2022


Currently, udevNodeRegister() is forward declared in
node_device_driver.h even though the function is implemented in
node_device_udev.c which warrants node_device_udev.h header file.
Move the declaration into the correct file.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/node_device/node_device_driver.c | 3 +++
 src/node_device/node_device_driver.h | 6 ------
 src/node_device/node_device_udev.h   | 3 +++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index 8e93b0dd6f..5bde05d593 100644
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -35,6 +35,9 @@
 #include "node_device_conf.h"
 #include "node_device_event.h"
 #include "node_device_driver.h"
+#if WITH_UDEV
+# include "node_device_udev.h"
+#endif
 #include "virvhba.h"
 #include "viraccessapicheck.h"
 #include "virutil.h"
diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h
index 7311b603ac..6f835bc71a 100644
--- a/src/node_device/node_device_driver.h
+++ b/src/node_device/node_device_driver.h
@@ -28,12 +28,6 @@
 
 #define LINUX_NEW_DEVICE_WAIT_TIME 60
 
-#ifdef WITH_UDEV
-int
-udevNodeRegister(void);
-#endif
-
-
 typedef enum {
     MDEVCTL_CMD_START,
     MDEVCTL_CMD_STOP,
diff --git a/src/node_device/node_device_udev.h b/src/node_device/node_device_udev.h
index 8f60cbfe1b..3d1a156863 100644
--- a/src/node_device/node_device_udev.h
+++ b/src/node_device/node_device_udev.h
@@ -19,3 +19,6 @@
  */
 
 #pragma once
+
+int
+udevNodeRegister(void);
-- 
2.37.4



More information about the libvir-list mailing list