From 359dc694f7a6cf53ecb1e7ec25aff9bb3876af8d Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 16 Oct 2018 11:54:02 +0200
Subject: [PATCH] qemu: blockjob: Unexport qemuBlockJobEventProcess
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The function is now only called locally. Some code movement was
necessary to avoid forward declarations.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---
 src/qemu/qemu_blockjob.c | 80 ++++++++++++++++++++--------------------
 src/qemu/qemu_blockjob.h |  6 ---
 2 files changed, 40 insertions(+), 46 deletions(-)

diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index 828140138d..dd033c0b5d 100644
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -70,45 +70,6 @@ qemuBlockJobEmitEvents(virQEMUDriverPtr driver,
 }
 
 
-/**
- * qemuBlockJobUpdate:
- * @vm: domain
- * @disk: domain disk
- * @error: error (output parameter)
- *
- * Update disk's mirror state in response to a block job event stored in
- * blockJobStatus by qemuProcessHandleBlockJob event handler.
- *
- * Returns the block job event processed or -1 if there was no pending event.
- */
-int
-qemuBlockJobUpdate(virDomainObjPtr vm,
-                   qemuDomainAsyncJob asyncJob,
-                   virDomainDiskDefPtr disk,
-                   char **error)
-{
-    qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
-    qemuDomainObjPrivatePtr priv = vm->privateData;
-    int status = diskPriv->blockJobStatus;
-
-    if (error)
-        *error = NULL;
-
-    if (status != -1) {
-        qemuBlockJobEventProcess(priv->driver, vm, disk, asyncJob,
-                                 diskPriv->blockJobType,
-                                 diskPriv->blockJobStatus);
-        diskPriv->blockJobStatus = -1;
-        if (error)
-            VIR_STEAL_PTR(*error, diskPriv->blockJobError);
-        else
-            VIR_FREE(diskPriv->blockJobError);
-    }
-
-    return status;
-}
-
-
 /**
  * qemuBlockJobEventProcess:
  * @driver: qemu driver
@@ -121,7 +82,7 @@ qemuBlockJobUpdate(virDomainObjPtr vm,
  * from QEMU. For mirror state's that must survive libvirt
  * restart, also update the domain's status XML.
  */
-void
+static void
 qemuBlockJobEventProcess(virQEMUDriverPtr driver,
                          virDomainObjPtr vm,
                          virDomainDiskDefPtr disk,
@@ -236,6 +197,45 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver,
 }
 
 
+/**
+ * qemuBlockJobUpdate:
+ * @vm: domain
+ * @disk: domain disk
+ * @error: error (output parameter)
+ *
+ * Update disk's mirror state in response to a block job event stored in
+ * blockJobStatus by qemuProcessHandleBlockJob event handler.
+ *
+ * Returns the block job event processed or -1 if there was no pending event.
+ */
+int
+qemuBlockJobUpdate(virDomainObjPtr vm,
+                   qemuDomainAsyncJob asyncJob,
+                   virDomainDiskDefPtr disk,
+                   char **error)
+{
+    qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
+    qemuDomainObjPrivatePtr priv = vm->privateData;
+    int status = diskPriv->blockJobStatus;
+
+    if (error)
+        *error = NULL;
+
+    if (status != -1) {
+        qemuBlockJobEventProcess(priv->driver, vm, disk, asyncJob,
+                                 diskPriv->blockJobType,
+                                 diskPriv->blockJobStatus);
+        diskPriv->blockJobStatus = -1;
+        if (error)
+            VIR_STEAL_PTR(*error, diskPriv->blockJobError);
+        else
+            VIR_FREE(diskPriv->blockJobError);
+    }
+
+    return status;
+}
+
+
 /**
  * qemuBlockJobSyncBegin:
  * @disk: domain disk
diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h
index 445799ff76..fa4f18f8ee 100644
--- a/src/qemu/qemu_blockjob.h
+++ b/src/qemu/qemu_blockjob.h
@@ -30,12 +30,6 @@ int qemuBlockJobUpdate(virDomainObjPtr vm,
                        qemuDomainAsyncJob asyncJob,
                        virDomainDiskDefPtr disk,
                        char **error);
-void qemuBlockJobEventProcess(virQEMUDriverPtr driver,
-                              virDomainObjPtr vm,
-                              virDomainDiskDefPtr disk,
-                              qemuDomainAsyncJob asyncJob,
-                              int type,
-                              int status);
 
 void qemuBlockJobSyncBegin(virDomainDiskDefPtr disk);
 void qemuBlockJobSyncEnd(virDomainObjPtr vm,
-- 
GitLab