From c29ce35af6c6067b98808d13f78f868670694ab6 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Mon, 20 Aug 2012 16:05:45 +0100 Subject: [PATCH] Make qemuCapsProbeCommand static The qemuCapsProbeCommand API is only used by the capabilities code, so can be static Signed-off-by: Daniel P. Berrange --- 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 809ec6dc16..387a58180d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -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: * [(default)|(alias of )] */ @@ -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; -} diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 4789335cef..67e28ae643 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -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__*/