[PATCH v2 01/13] libvirt: add stateShutdownPrepare/stateShutdownWait to drivers
stateShutdownPrepare is supposed to inform driver that it will be closed soon
so that the driver can prepare and finish all background threads quickly on
stateShutdownWait call.
Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com>
Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413(a)gmail.com>
---
scripts/check-drivername.py | 2 ++
src/driver-state.h | 8 ++++++++
src/libvirt.c | 42 ++++++++++++++++++++++++++++++++++++++++++
src/libvirt_internal.h | 2 ++
src/libvirt_private.syms | 2 ++
5 files changed, 56 insertions(+)
diff --git a/scripts/check-drivername.py b/scripts/check-drivername.py
index 39eff83..cce8e7d 100644
--- a/scripts/check-drivername.py
+++ b/scripts/check-drivername.py
@@ -50,6 +50,8 @@ for drvfile in drvfiles:
"virDrvStateCleanup",
"virDrvStateReload",
"virDrvStateStop",
+ "virDrvStateShutdownPrepare",
+ "virDrvStateShutdownWait",
"virDrvConnectSupportsFeature",
"virDrvConnectURIProbe",
"virDrvDomainMigratePrepare",
diff --git a/src/driver-state.h b/src/driver-state.h
index 6b3f501..767d8e8 100644
--- a/src/driver-state.h
+++ b/src/driver-state.h
@@ -45,6 +45,12 @@ typedef int
typedef int
(*virDrvStateStop)(void);
+typedef int
+(*virDrvStateShutdownPrepare)(void);
+
+typedef int
+(*virDrvStateShutdownWait)(void);
+
typedef struct _virStateDriver virStateDriver;
typedef virStateDriver *virStateDriverPtr;
@@ -55,4 +61,6 @@ struct _virStateDriver {
virDrvStateCleanup stateCleanup;
virDrvStateReload stateReload;
virDrvStateStop stateStop;
+ virDrvStateShutdownPrepare stateShutdownPrepare;
+ virDrvStateShutdownWait stateShutdownWait;
};
diff --git a/src/libvirt.c b/src/libvirt.c
index b2d0ba3..c5089ea 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -673,6 +673,48 @@ virStateInitialize(bool privileged,
/**
+ * virStateShutdownPrepare:
+ *
+ * Run each virtualization driver's shutdown prepare method.
+ *
+ * Returns 0 if all succeed, -1 upon any failure.
+ */
+int
+virStateShutdownPrepare(void)
+{
+ size_t i;
+
+ for (i = 0; i < virStateDriverTabCount; i++) {
+ if (virStateDriverTab[i]->stateShutdownPrepare &&
+ virStateDriverTab[i]->stateShutdownPrepare() < 0)
+ return -1;
+ }
+ return 0;
+}
+
+
+/**
+ * virStateShutdownWait:
+ *
+ * Run each virtualization driver's shutdown wait method.
+ *
+ * Returns 0 if all succeed, -1 upon any failure.
+ */
+int
+virStateShutdownWait(void)
+{
+ size_t i;
+
+ for (i = 0; i < virStateDriverTabCount; i++) {
+ if (virStateDriverTab[i]->stateShutdownWait &&
+ virStateDriverTab[i]->stateShutdownWait() < 0)
+ return -1;
+ }
+ return 0;
+}
+
+
+/**
* virStateCleanup:
*
* Run each virtualization driver's cleanup method.
diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h
index 72c6127..e27030b 100644
--- a/src/libvirt_internal.h
+++ b/src/libvirt_internal.h
@@ -34,6 +34,8 @@ int virStateInitialize(bool privileged,
const char *root,
virStateInhibitCallback inhibit,
void *opaque);
+int virStateShutdownPrepare(void);
+int virStateShutdownWait(void);
int virStateCleanup(void);
int virStateReload(void);
int virStateStop(void);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 73b72c9..cf3ccab 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1503,6 +1503,8 @@ virSetSharedStorageDriver;
virStateCleanup;
virStateInitialize;
virStateReload;
+virStateShutdownPrepare;
+virStateShutdownWait;
virStateStop;
virStreamInData;
--
1.8.3.1