[libvirt PATCH 06/10] qemu: remove qemuCaps from qemuBuildObjectCommandline
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_command.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index ef1ba9269c..4b178cac71 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1964,8 +1964,7 @@ qemuBuildFloppyCommandLineControllerOptions(virCommand *cmd,
static int
qemuBuildObjectCommandline(virCommand *cmd,
- virJSONValue *objProps,
- virQEMUCaps *qemuCaps G_GNUC_UNUSED)
+ virJSONValue *objProps)
{
if (!objProps)
return 0;
@@ -1985,15 +1984,15 @@ qemuBuildBlockStorageSourceAttachDataCommandline(virCommand *cmd,
char *tmp;
size_t i;
- if (qemuBuildObjectCommandline(cmd, data->prmgrProps, qemuCaps) < 0 ||
- qemuBuildObjectCommandline(cmd, data->authsecretProps, qemuCaps) < 0 ||
- qemuBuildObjectCommandline(cmd, data->httpcookiesecretProps, qemuCaps) < 0
||
- qemuBuildObjectCommandline(cmd, data->tlsKeySecretProps, qemuCaps) < 0 ||
- qemuBuildObjectCommandline(cmd, data->tlsProps, qemuCaps) < 0)
+ if (qemuBuildObjectCommandline(cmd, data->prmgrProps) < 0 ||
+ qemuBuildObjectCommandline(cmd, data->authsecretProps) < 0 ||
+ qemuBuildObjectCommandline(cmd, data->httpcookiesecretProps) < 0 ||
+ qemuBuildObjectCommandline(cmd, data->tlsKeySecretProps) < 0 ||
+ qemuBuildObjectCommandline(cmd, data->tlsProps) < 0)
return -1;
for (i = 0; i < data->encryptsecretCount; ++i) {
- if (qemuBuildObjectCommandline(cmd, data->encryptsecretProps[i], qemuCaps)
< 0) {
+ if (qemuBuildObjectCommandline(cmd, data->encryptsecretProps[i]) < 0) {
return -1;
}
}
--
2.48.1