From 9a9a93e2ebf5fe7be4700bc85d56e8e57f6ffebf Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A1n=20Tomko?= Date: Wed, 24 Nov 2021 13:32:42 +0100 Subject: [PATCH] qemu: absorb qemuDomainObjExitMonitorInternal MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Michal Privoznik --- 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 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 * -- 2.47.2