From: Ján Tomko <jtomko@redhat.com>
Date: Wed, 24 Nov 2021 12:32:42 +0000 (+0100)
Subject: qemu: absorb qemuDomainObjExitMonitorInternal
X-Git-Tag: v8.0.0-rc1~466
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a9a93e2ebf5fe7be4700bc85d56e8e57f6ffebf;p=thirdparty%2Flibvirt.git

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@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 741123fe53..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
  *