node_device: implement node device lifecycle event APIs

diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index 9e3e6fe5a9426ae305e1e7877350faec52d659a1..8f23a986cd97bf87d104055991f74daa6d61ac1a 100644 (file)
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -31,6 +31,7 @@
 # include "virthread.h"
 # include "virpci.h"
 # include "device_conf.h"
+# include "object_event.h"
 
 # include <libxml/tree.h>
 
@@ -229,6 +230,9 @@ struct _virNodeDeviceDriverState {
 
     virNodeDeviceObjList devs;         /* currently-known devices */
     void *privateData;                 /* driver-specific private data */
+
+    /* Immutable pointer, self-locking APIs */
+    virObjectEventStatePtr nodeDeviceEventState;
 };
 
 

diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index 500caeb2317281bd6fa592cb2d4f3a359b513ede..91bb142b24c16b17a42c3f19eb719b9d188febe6 100644 (file)
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -35,6 +35,7 @@
 #include "virfile.h"
 #include "virstring.h"
 #include "node_device_conf.h"
+#include "node_device_event.h"
 #include "node_device_driver.h"
 #include "node_device_hal.h"
 #include "node_device_linux_sysfs.h"
@@ -677,6 +678,47 @@ nodeDeviceDestroy(virNodeDevicePtr dev)
     return ret;
 }
 
+int
+nodeConnectNodeDeviceEventRegisterAny(virConnectPtr conn,
+                                      virNodeDevicePtr dev,
+                                      int eventID,
+                                      virConnectNodeDeviceEventGenericCallback callback,
+                                      void *opaque,
+                                      virFreeCallback freecb)
+{
+    int callbackID = -1;
+
+    if (virConnectNodeDeviceEventRegisterAnyEnsureACL(conn) < 0)
+        goto cleanup;
+
+    if (virNodeDeviceEventStateRegisterID(conn, driver->nodeDeviceEventState,
+                                          dev, eventID, callback,
+                                          opaque, freecb, &callbackID) < 0)
+        callbackID = -1;
+ cleanup:
+    return callbackID;
+}
+
+int
+nodeConnectNodeDeviceEventDeregisterAny(virConnectPtr conn,
+                                        int callbackID)
+{
+    int ret = -1;
+
+    if (virConnectNodeDeviceEventDeregisterAnyEnsureACL(conn) < 0)
+        goto cleanup;
+
+    if (virObjectEventStateDeregisterID(conn,
+                                        driver->nodeDeviceEventState,
+                                        callbackID) < 0)
+        goto cleanup;
+
+    ret = 0;
+
+ cleanup:
+    return ret;
+}
+
 int nodedevRegister(void)
 {
 #ifdef WITH_UDEV

diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h
index 0f4ea577c89eac0b4c78925c549581e45f079f90..56f89ab03ac6ecfe4dbba4e7bf1c10164a2f08ec 100644 (file)
--- a/src/node_device/node_device_driver.h
+++ b/src/node_device/node_device_driver.h
@@ -63,4 +63,14 @@ virNodeDevicePtr nodeDeviceCreateXML(virConnectPtr conn,
                                      const char *xmlDesc, unsigned int flags);
 int nodeDeviceDestroy(virNodeDevicePtr dev);
 
+int
+nodeConnectNodeDeviceEventRegisterAny(virConnectPtr conn,
+                                      virNodeDevicePtr dev,
+                                      int eventID,
+                                      virConnectNodeDeviceEventGenericCallback callback,
+                                      void *opaque,
+                                      virFreeCallback freecb);
+int
+nodeConnectNodeDeviceEventDeregisterAny(virConnectPtr conn,
+                                        int callbackID);
 #endif /* __VIR_NODE_DEVICE_H__ */