[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 07/20] Make qemuCapsProbeCommand static



From: "Daniel P. Berrange" <berrange redhat com>

The qemuCapsProbeCommand API is only used by the capabilities
code, so can be static

Signed-off-by: Daniel P. Berrange <berrange redhat com>
---
 src/qemu/qemu_capabilities.c | 40 ++++++++++++++++++++--------------------
 src/qemu/qemu_capabilities.h |  3 ---
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index b8c1f36..b6193d9 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -253,6 +253,26 @@ static const struct qemu_arch_info const arch_info_xen[] = {
 };
 
 
+static virCommandPtr
+qemuCapsProbeCommand(const char *qemu,
+                     qemuCapsPtr caps)
+{
+    virCommandPtr cmd = virCommandNew(qemu);
+
+    if (caps) {
+        if (qemuCapsGet(caps, QEMU_CAPS_NO_USER_CONFIG))
+            virCommandAddArg(cmd, "-no-user-config");
+        else if (qemuCapsGet(caps, QEMU_CAPS_NODEFCONFIG))
+            virCommandAddArg(cmd, "-nodefconfig");
+    }
+
+    virCommandAddEnvPassCommon(cmd);
+    virCommandClearCaps(cmd);
+
+    return cmd;
+}
+
+
 /* Format is:
  * <machine> <desc> [(default)|(alias of <canonical>)]
  */
@@ -1744,23 +1764,3 @@ qemuCapsGet(qemuCapsPtr caps,
     else
         return b;
 }
-
-
-virCommandPtr
-qemuCapsProbeCommand(const char *qemu,
-                     qemuCapsPtr caps)
-{
-    virCommandPtr cmd = virCommandNew(qemu);
-
-    if (caps) {
-        if (qemuCapsGet(caps, QEMU_CAPS_NO_USER_CONFIG))
-            virCommandAddArg(cmd, "-no-user-config");
-        else if (qemuCapsGet(caps, QEMU_CAPS_NODEFCONFIG))
-            virCommandAddArg(cmd, "-nodefconfig");
-    }
-
-    virCommandAddEnvPassCommon(cmd);
-    virCommandClearCaps(cmd);
-
-    return cmd;
-}
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 1e817c6..830b283 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -194,9 +194,6 @@ int qemuCapsParseHelpStr(const char *qemu,
 int qemuCapsParseDeviceStr(const char *str,
                            qemuCapsPtr caps);
 
-virCommandPtr qemuCapsProbeCommand(const char *qemu,
-                                   qemuCapsPtr caps);
-
 VIR_ENUM_DECL(qemuCaps);
 
 #endif /* __QEMU_CAPABILITIES_H__*/
-- 
1.7.11.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]