[PATCH 4/4] qemu: domain: Unexport qemuDomainObjTaintMsg

Peter Krempa pkrempa at redhat.com
Wed Mar 1 16:28:40 UTC 2023


The function is used only inside qemu_domain.c unexport and move it
above it's user.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_domain.c | 30 ++++++++++++++++--------------
 src/qemu/qemu_domain.h |  7 -------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 40d5efd750..a083e7e1ef 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -6638,20 +6638,12 @@ qemuDomainDefFormatLive(virQEMUDriver *driver,
 }


-void qemuDomainObjTaint(virQEMUDriver *driver,
-                        virDomainObj *obj,
-                        virDomainTaintFlags taint,
-                        qemuDomainLogContext *logCtxt)
-{
-    qemuDomainObjTaintMsg(driver, obj, taint, logCtxt, NULL);
-    qemuDomainSaveStatus(obj);
-}
-
-void qemuDomainObjTaintMsg(virQEMUDriver *driver,
-                           virDomainObj *obj,
-                           virDomainTaintFlags taint,
-                           qemuDomainLogContext *logCtxt,
-                           const char *fmt, ...)
+static void G_GNUC_PRINTF(5, 6)
+qemuDomainObjTaintMsg(virQEMUDriver *driver,
+                      virDomainObj *obj,
+                      virDomainTaintFlags taint,
+                      qemuDomainLogContext *logCtxt,
+                      const char *fmt, ...)
 {
     virErrorPtr orig_err = NULL;
     g_autofree char *timestamp = NULL;
@@ -6725,6 +6717,16 @@ void qemuDomainObjTaintMsg(virQEMUDriver *driver,
     virErrorRestore(&orig_err);
 }

+
+void qemuDomainObjTaint(virQEMUDriver *driver,
+                        virDomainObj *obj,
+                        virDomainTaintFlags taint,
+                        qemuDomainLogContext *logCtxt)
+{
+    qemuDomainObjTaintMsg(driver, obj, taint, logCtxt, NULL);
+    qemuDomainSaveStatus(obj);
+}
+
 static void
 qemuDomainObjCheckMachineTaint(virQEMUDriver *driver,
                                virDomainObj *obj,
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 6adc067681..54c2e02557 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -629,13 +629,6 @@ void qemuDomainObjTaint(virQEMUDriver *driver,
                         virDomainTaintFlags taint,
                         qemuDomainLogContext *logCtxt);

-void qemuDomainObjTaintMsg(virQEMUDriver *driver,
-                           virDomainObj *obj,
-                           virDomainTaintFlags taint,
-                           qemuDomainLogContext *logCtxt,
-                           const char *msg,
-                           ...) G_GNUC_PRINTF(5, 6);
-
 char **qemuDomainObjGetTainting(virQEMUDriver *driver,
                                 virDomainObj *obj);

-- 
2.39.2



More information about the libvir-list mailing list