]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
Make qemuCapsProbeCommand static
authorDaniel P. Berrange <berrange@redhat.com>
Mon, 20 Aug 2012 15:05:45 +0000 (16:05 +0100)
committerDaniel P. Berrange <berrange@redhat.com>
Thu, 13 Sep 2012 11:24:13 +0000 (12:24 +0100)
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
src/qemu/qemu_capabilities.h

index 809ec6dc16f5bb2aafeac1f2a6abc563eab4fda9..387a58180d82150d170a30cc6f1ebe6cb9f6d432 100644 (file)
@@ -254,6 +254,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>)]
  */
@@ -1748,23 +1768,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;
-}
index 4789335ceff040138d2c4b4e041a358f3f476478..67e28ae64345afe66793570f274c3da78a537bc6 100644 (file)
@@ -195,9 +195,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__*/