From: Ján Tomko <jtomko@redhat.com>
Date: Thu, 13 Mar 2025 14:55:53 +0000 (+0100)
Subject: qemu: remove qemuCaps from qemuBuildObjectCommandline
X-Git-Tag: v11.2.0-rc1~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc43efc31273bce2876a26c72af6b806b3ecf750;p=thirdparty%2Flibvirt.git

qemu: remove qemuCaps from qemuBuildObjectCommandline

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 158b9f1571..564b70c379 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1962,8 +1962,7 @@ qemuBuildFloppyCommandLineControllerOptions(virCommand *cmd,
 
 static int
 qemuBuildObjectCommandline(virCommand *cmd,
-                           virJSONValue *objProps,
-                           virQEMUCaps *qemuCaps G_GNUC_UNUSED)
+                           virJSONValue *objProps)
 {
     if (!objProps)
         return 0;
@@ -1983,15 +1982,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;
         }
     }