Unused cleanups

[libvirt PATCH 05/10] qemu: remove qemuCaps from qemuBuildTLSx509CommandLine

Posted by Ján Tomko 9 months, 1 week ago

Also from qemuBuildGraphicsVNCCommandLine

Signed-off-by: Ján Tomko <jtomko@redhat.com>
---
 src/qemu/qemu_command.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 4f0a9a517c..ef1ba9269c 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1286,8 +1286,7 @@ qemuBuildTLSx509CommandLine(virCommand *cmd,
                             bool isListen,
                             bool verifypeer,
                             const char *certEncSecretAlias,
-                            const char *alias,
-                            virQEMUCaps *qemuCaps G_GNUC_UNUSED)
+                            const char *alias)
 {
     g_autoptr(virJSONValue) props = NULL;
 
@@ -1335,7 +1334,7 @@ qemuBuildChardevCommand(virCommand *cmd,
                                             dev->data.tcp.listen,
                                             chrSourcePriv->tlsVerify,
                                             tlsCertEncSecAlias,
-                                            objalias, qemuCaps) < 0) {
+                                            objalias) < 0) {
                 return -1;
             }
 
@@ -8026,7 +8025,6 @@ static int
 qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfig *cfg,
                                 const virDomainDef *def,
                                 virCommand *cmd,
-                                virQEMUCaps *qemuCaps,
                                 virDomainGraphicsDef *graphics)
 {
     g_autofree char *audioid = qemuGetAudioIDString(def, graphics->data.vnc.audioId);
@@ -8107,8 +8105,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfig *cfg,
                                         true,
                                         cfg->vncTLSx509verify,
                                         secretAlias,
-                                        gfxPriv->tlsAlias,
-                                        qemuCaps) < 0)
+                                        gfxPriv->tlsAlias) < 0)
             return -1;
 
         virBufferAsprintf(&opt, ",tls-creds=%s", gfxPriv->tlsAlias);
@@ -8417,7 +8414,7 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfig *cfg,
             break;
         case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
             if (qemuBuildGraphicsVNCCommandLine(cfg, def, cmd,
-                                                qemuCaps, graphics) < 0)
+                                                graphics) < 0)
                 return -1;
 
             break;
-- 
2.48.1

Re: [libvirt PATCH 05/10] qemu: remove qemuCaps from qemuBuildTLSx509CommandLine

Posted by Peter Krempa 9 months, 1 week ago

On Thu, Mar 13, 2025 at 16:30:19 +0100, Ján Tomko wrote:
> Also from qemuBuildGraphicsVNCCommandLine
> 
> Signed-off-by: Ján Tomko <jtomko@redhat.com>
> ---
>  src/qemu/qemu_command.c | 11 ++++-------
>  1 file changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index 4f0a9a517c..ef1ba9269c 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -1286,8 +1286,7 @@ qemuBuildTLSx509CommandLine(virCommand *cmd,


'qemuCaps' is documented above.

>                              bool isListen,
>                              bool verifypeer,
>                              const char *certEncSecretAlias,
> -                            const char *alias,
> -                            virQEMUCaps *qemuCaps G_GNUC_UNUSED)
> +                            const char *alias)
>  {
>      g_autoptr(virJSONValue) props = NULL;