[libvirt PATCH 7/7] qemu: absorb qemuDomainObjExitMonitorInternal
qemuDomainObjExitMonitor is just an alias for it at this point.
This also removes the incomplete ATTRIBUTE_NONNULL(1) annotation.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_domain.c | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index dea7dae4b3..080510e683 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5857,9 +5857,14 @@ qemuDomainObjEnterMonitorInternal(virQEMUDriver *driver,
return 0;
}
-static void ATTRIBUTE_NONNULL(1)
-qemuDomainObjExitMonitorInternal(virQEMUDriver *driver,
- virDomainObj *obj)
+/* obj must NOT be locked before calling
+ *
+ * Should be paired with an earlier qemuDomainObjEnterMonitor() call
+ *
+ */
+void
+qemuDomainObjExitMonitor(virQEMUDriver *driver,
+ virDomainObj *obj)
{
qemuDomainObjPrivate *priv = obj->privateData;
bool hasRefs;
@@ -5890,16 +5895,6 @@ void qemuDomainObjEnterMonitor(virQEMUDriver *driver,
QEMU_ASYNC_JOB_NONE));
}
-/* obj must NOT be locked before calling
- *
- * Should be paired with an earlier qemuDomainObjEnterMonitor() call
- */
-void qemuDomainObjExitMonitor(virQEMUDriver *driver,
- virDomainObj *obj)
-{
- qemuDomainObjExitMonitorInternal(driver, obj);
-}
-
/*
* obj must be locked before calling
*
--
2.31.1