From nobody Sat Feb 7 06:27:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1639053309; cv=none; d=zohomail.com; s=zohoarc; b=AMSfG7iFpEKc/OWt2eOOKoarTia5rDPnr6M8aslTxgxF83QzoC1OrMN9+0j1OJJV4nIwAWDqZfVImyEKTZ00sz/rZQ+KZAag4djL3CpyzAXNqdDb55fcuW5qDd9H2WRDZ46pg3tJ//4diKWLAgU759NC9yYGTX6vSiHLQ/iHYmQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639053309; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Q0zKp/mnr5kh+SW0elXzaAkNINbrRBcQq7canTC1Bso=; b=J5HxLPfj1rsisCVdcVQVquBfIkKdoswYZ+cCCP5a1G9ygxMcaBsrA5n1IoPZf0t24C49Aayk1+YhWZchgXd4/HCNe7Wog3iaokjy3siwuWP4VxjbXid660iOb7K2FJ16LJ9opezhJIRl4rqRNW4VZXUr6owgt39bR1deLuHupKg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1639053309030217.14965185096503; Thu, 9 Dec 2021 04:35:09 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-140-K4HOyq4UNVWAksbuZ_fsyw-1; Thu, 09 Dec 2021 07:33:54 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3240A801962; Thu, 9 Dec 2021 12:33:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 103B860C7F; Thu, 9 Dec 2021 12:33:50 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D7B9C4A70B; Thu, 9 Dec 2021 12:33:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1B9CVBTe017670 for ; Thu, 9 Dec 2021 07:31:11 -0500 Received: by smtp.corp.redhat.com (Postfix) id 22BB11B472; Thu, 9 Dec 2021 12:31:11 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 656B2694C0 for ; Thu, 9 Dec 2021 12:31:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639053307; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Q0zKp/mnr5kh+SW0elXzaAkNINbrRBcQq7canTC1Bso=; b=CCnkScZ4Z2JqGU17kJE7LoEXt5OGQyfe5sQ5e5pEJwKb3vvTTBN2jb+vLgbp4ByHB2s3yH i2t+DdMUC+bcKL7w8lBdDLl85uG86z3qXyGhOUVHeXjZHXGDxbcsHIV4U2s4/QHjcdswFs HENvu5Kej/Qht1dsrPifxzYmSkfP/Hg= X-MC-Unique: K4HOyq4UNVWAksbuZ_fsyw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 09/24] qemuBuildChrChardevStr: Remove unused arguments and clean up callers Date: Thu, 9 Dec 2021 13:30:44 +0100 Message-Id: <34e413954d3ed394d8792405af5457a496246bfd.1639052639.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639053311038100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 145 +++++++++++++++------------------------- src/qemu/qemu_command.h | 2 - src/qemu/qemu_process.c | 4 -- 3 files changed, 55 insertions(+), 96 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 918361d55c..5c2b8d65fd 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5039,11 +5039,8 @@ qemuOpenChrChardevUNIXSocket(const virDomainChrSourc= eDef *dev) /* This function outputs a -chardev command line option which describes on= ly the * host side of the character device */ static char * -qemuBuildChrChardevStr(virLogManager *logManager G_GNUC_UNUSED, - virSecurityManager *secManager G_GNUC_UNUSED, - virCommand *cmd, +qemuBuildChrChardevStr(virCommand *cmd, virQEMUDriverConfig *cfg, - const virDomainDef *def G_GNUC_UNUSED, const virDomainChrSourceDef *dev, const char *alias, virQEMUCaps *qemuCaps) @@ -5512,11 +5509,8 @@ qemuBuildHostdevCommandLine(virCommand *cmd, static int -qemuBuildMonitorCommandLine(virLogManager *logManager, - virSecurityManager *secManager, - virCommand *cmd, +qemuBuildMonitorCommandLine(virCommand *cmd, virQEMUDriverConfig *cfg, - virDomainDef *def, qemuDomainObjPrivate *priv) { g_autofree char *chrdev =3D NULL; @@ -5524,9 +5518,10 @@ qemuBuildMonitorCommandLine(virLogManager *logManage= r, if (!priv->monConfig) return 0; - if (!(chrdev =3D qemuBuildChrChardevStr(logManager, secManager, - cmd, cfg, def, - priv->monConfig, "monitor", + if (!(chrdev =3D qemuBuildChrChardevStr(cmd, + cfg, + priv->monConfig, + "monitor", priv->qemuCaps))) return -1; virCommandAddArg(cmd, "-chardev"); @@ -5646,11 +5641,8 @@ qemuBuildSclpDevProps(virDomainChrDef *dev) static int -qemuBuildRNGBackendChrdevStr(virLogManager *logManager, - virSecurityManager *secManager, - virCommand *cmd, +qemuBuildRNGBackendChrdevStr(virCommand *cmd, virQEMUDriverConfig *cfg, - const virDomainDef *def, virDomainRNGDef *rng, virQEMUCaps *qemuCaps, char **chr) @@ -5665,8 +5657,8 @@ qemuBuildRNGBackendChrdevStr(virLogManager *logManage= r, return 0; case VIR_DOMAIN_RNG_BACKEND_EGD: - if (!(*chr =3D qemuBuildChrChardevStr(logManager, secManager, - cmd, cfg, def, + if (!(*chr =3D qemuBuildChrChardevStr(cmd, + cfg, rng->source.chardev, rng->info.alias, qemuCaps))) @@ -5757,9 +5749,7 @@ qemuBuildRNGDevProps(const virDomainDef *def, static int -qemuBuildRNGCommandLine(virLogManager *logManager, - virSecurityManager *secManager, - virCommand *cmd, +qemuBuildRNGCommandLine(virCommand *cmd, virQEMUDriverConfig *cfg, const virDomainDef *def, virQEMUCaps *qemuCaps) @@ -5779,8 +5769,7 @@ qemuBuildRNGCommandLine(virLogManager *logManager, } /* possibly add character device for backend */ - if (qemuBuildRNGBackendChrdevStr(logManager, secManager, cmd, cfg,= def, - rng, qemuCaps, &chardev) < 0) + if (qemuBuildRNGBackendChrdevStr(cmd, cfg, rng, qemuCaps, &chardev= ) < 0) return -1; if (chardev) @@ -8606,10 +8595,7 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfig *cf= g, static int qemuInterfaceVhostuserConnect(virQEMUDriver *driver, - virLogManager *logManager, - virSecurityManager *secManager, virCommand *cmd, - virDomainDef *def, virDomainNetDef *net, virQEMUCaps *qemuCaps, char **chardev) @@ -8618,10 +8604,11 @@ qemuInterfaceVhostuserConnect(virQEMUDriver *driver, switch ((virDomainChrType)net->data.vhostuser->type) { case VIR_DOMAIN_CHR_TYPE_UNIX: - if (!(*chardev =3D qemuBuildChrChardevStr(logManager, secManager, - cmd, cfg, def, + if (!(*chardev =3D qemuBuildChrChardevStr(cmd, + cfg, net->data.vhostuser, - net->info.alias, qemuCaps)= )) + net->info.alias, + qemuCaps))) return -1; break; @@ -8650,8 +8637,6 @@ qemuInterfaceVhostuserConnect(virQEMUDriver *driver, static int qemuBuildInterfaceCommandLine(virQEMUDriver *driver, virDomainObj *vm, - virLogManager *logManager, - virSecurityManager *secManager, virCommand *cmd, virDomainNetDef *net, virQEMUCaps *qemuCaps, @@ -8742,8 +8727,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, case VIR_DOMAIN_NET_TYPE_VHOSTUSER: requireNicdev =3D true; - if (qemuInterfaceVhostuserConnect(driver, logManager, secManager, - cmd, def, net, qemuCaps, &charde= v) < 0) + if (qemuInterfaceVhostuserConnect(driver, cmd, net, qemuCaps, &cha= rdev) < 0) goto cleanup; if (virNetDevOpenvswitchGetVhostuserIfname(net->data.vhostuser->da= ta.nix.path, @@ -8980,8 +8964,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, static int qemuBuildNetCommandLine(virQEMUDriver *driver, virDomainObj *vm, - virLogManager *logManager, - virSecurityManager *secManager, virCommand *cmd, virQEMUCaps *qemuCaps, virNetDevVPortProfileOp vmop, @@ -8997,7 +8979,7 @@ qemuBuildNetCommandLine(virQEMUDriver *driver, for (i =3D 0; i < def->nnets; i++) { virDomainNetDef *net =3D def->nets[i]; - if (qemuBuildInterfaceCommandLine(driver, vm, logManager, secManag= er, cmd, net, + if (qemuBuildInterfaceCommandLine(driver, vm, cmd, net, qemuCaps, vmop, standalone, nnicindexes, nicindexes) < 0) @@ -9019,9 +9001,7 @@ qemuBuildNetCommandLine(virQEMUDriver *driver, static int -qemuBuildSmartcardCommandLine(virLogManager *logManager, - virSecurityManager *secManager, - virCommand *cmd, +qemuBuildSmartcardCommandLine(virCommand *cmd, virQEMUDriverConfig *cfg, const virDomainDef *def, virQEMUCaps *qemuCaps) @@ -9068,8 +9048,8 @@ qemuBuildSmartcardCommandLine(virLogManager *logManag= er, g_autofree char *chardevstr =3D NULL; g_autofree char *chardevalias =3D g_strdup_printf("char%s", smartc= ard->info.alias); - if (!(chardevstr =3D qemuBuildChrChardevStr(logManager, secManager, - cmd, cfg, def, + if (!(chardevstr =3D qemuBuildChrChardevStr(cmd, + cfg, smartcard->data.passthru, smartcard->info.alias, qemuCaps))) { @@ -9217,9 +9197,7 @@ qemuBuildShmemBackendMemProps(virDomainShmemDef *shme= m) static int -qemuBuildShmemCommandLine(virLogManager *logManager, - virSecurityManager *secManager, - virCommand *cmd, +qemuBuildShmemCommandLine(virCommand *cmd, virQEMUDriverConfig *cfg, virDomainDef *def, virDomainShmemDef *shmem, @@ -9286,11 +9264,11 @@ qemuBuildShmemCommandLine(virLogManager *logManager, return -1; if (shmem->server.enabled) { - chardev =3D qemuBuildChrChardevStr(logManager, secManager, - cmd, cfg, def, - shmem->server.chr, - shmem->info.alias, - qemuCaps); + chardev =3D qemuBuildChrChardevStr(cmd, + cfg, + shmem->server.chr, + shmem->info.alias, + qemuCaps); if (!chardev) return -1; @@ -9386,9 +9364,7 @@ qemuChrIsPlatformDevice(const virDomainDef *def, static int -qemuBuildSerialCommandLine(virLogManager *logManager, - virSecurityManager *secManager, - virCommand *cmd, +qemuBuildSerialCommandLine(virCommand *cmd, virQEMUDriverConfig *cfg, const virDomainDef *def, virQEMUCaps *qemuCaps) @@ -9410,8 +9386,8 @@ qemuBuildSerialCommandLine(virLogManager *logManager, if (serial->source->type =3D=3D VIR_DOMAIN_CHR_TYPE_SPICEPORT && != havespice) continue; - if (!(devstr =3D qemuBuildChrChardevStr(logManager, secManager, - cmd, cfg, def, + if (!(devstr =3D qemuBuildChrChardevStr(cmd, + cfg, serial->source, serial->info.alias, qemuCaps))) @@ -9445,9 +9421,7 @@ qemuBuildSerialCommandLine(virLogManager *logManager, static int -qemuBuildParallelsCommandLine(virLogManager *logManager, - virSecurityManager *secManager, - virCommand *cmd, +qemuBuildParallelsCommandLine(virCommand *cmd, virQEMUDriverConfig *cfg, const virDomainDef *def, virQEMUCaps *qemuCaps) @@ -9458,8 +9432,8 @@ qemuBuildParallelsCommandLine(virLogManager *logManag= er, virDomainChrDef *parallel =3D def->parallels[i]; g_autofree char *devstr =3D NULL; - if (!(devstr =3D qemuBuildChrChardevStr(logManager, secManager, - cmd, cfg, def, + if (!(devstr =3D qemuBuildChrChardevStr(cmd, + cfg, parallel->source, parallel->info.alias, qemuCaps))) @@ -9477,9 +9451,7 @@ qemuBuildParallelsCommandLine(virLogManager *logManag= er, static int -qemuBuildChannelsCommandLine(virLogManager *logManager, - virSecurityManager *secManager, - virCommand *cmd, +qemuBuildChannelsCommandLine(virCommand *cmd, virQEMUDriverConfig *cfg, const virDomainDef *def, virQEMUCaps *qemuCaps) @@ -9491,8 +9463,8 @@ qemuBuildChannelsCommandLine(virLogManager *logManage= r, g_autofree char *chardevstr =3D NULL; g_autoptr(virJSONValue) netdevprops =3D NULL; - if (!(chardevstr =3D qemuBuildChrChardevStr(logManager, secManager, - cmd, cfg, def, + if (!(chardevstr =3D qemuBuildChrChardevStr(cmd, + cfg, channel->source, channel->info.alias, qemuCaps))) @@ -9527,9 +9499,7 @@ qemuBuildChannelsCommandLine(virLogManager *logManage= r, static int -qemuBuildConsoleCommandLine(virLogManager *logManager, - virSecurityManager *secManager, - virCommand *cmd, +qemuBuildConsoleCommandLine(virCommand *cmd, virQEMUDriverConfig *cfg, const virDomainDef *def, virQEMUCaps *qemuCaps) @@ -9543,8 +9513,8 @@ qemuBuildConsoleCommandLine(virLogManager *logManager, switch (console->targetType) { case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLP: - if (!(devstr =3D qemuBuildChrChardevStr(logManager, secManager, - cmd, cfg, def, + if (!(devstr =3D qemuBuildChrChardevStr(cmd, + cfg, console->source, console->info.alias, qemuCaps))) @@ -9558,8 +9528,8 @@ qemuBuildConsoleCommandLine(virLogManager *logManager, break; case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLPLM: - if (!(devstr =3D qemuBuildChrChardevStr(logManager, secManager, - cmd, cfg, def, + if (!(devstr =3D qemuBuildChrChardevStr(cmd, + cfg, console->source, console->info.alias, qemuCaps))) @@ -9573,8 +9543,8 @@ qemuBuildConsoleCommandLine(virLogManager *logManager, break; case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO: - if (!(devstr =3D qemuBuildChrChardevStr(logManager, secManager, - cmd, cfg, def, + if (!(devstr =3D qemuBuildChrChardevStr(cmd, + cfg, console->source, console->info.alias, qemuCaps))) @@ -9658,9 +9628,7 @@ qemuBuildRedirdevDevProps(const virDomainDef *def, static int -qemuBuildRedirdevCommandLine(virLogManager *logManager, - virSecurityManager *secManager, - virCommand *cmd, +qemuBuildRedirdevCommandLine(virCommand *cmd, virQEMUDriverConfig *cfg, const virDomainDef *def, virQEMUCaps *qemuCaps) @@ -9672,8 +9640,8 @@ qemuBuildRedirdevCommandLine(virLogManager *logManage= r, g_autoptr(virJSONValue) devprops =3D NULL; char *devstr; - if (!(devstr =3D qemuBuildChrChardevStr(logManager, secManager, - cmd, cfg, def, + if (!(devstr =3D qemuBuildChrChardevStr(cmd, + cfg, redirdev->source, redirdev->info.alias, qemuCaps))) { @@ -10522,8 +10490,6 @@ qemuBuildCompatDeprecatedCommandLine(virCommand *cm= d, */ virCommand * qemuBuildCommandLine(virQEMUDriver *driver, - virLogManager *logManager, - virSecurityManager *secManager, virDomainObj *vm, const char *migrateURI, virDomainMomentObj *snapshot, @@ -10650,7 +10616,7 @@ qemuBuildCommandLine(virQEMUDriver *driver, virCommandAddArg(cmd, "-no-user-config"); virCommandAddArg(cmd, "-nodefaults"); - if (qemuBuildMonitorCommandLine(logManager, secManager, cmd, cfg, def,= priv) < 0) + if (qemuBuildMonitorCommandLine(cmd, cfg, priv) < 0) return NULL; if (qemuBuildClockCommandLine(cmd, def, qemuCaps) < 0) @@ -10684,24 +10650,24 @@ qemuBuildCommandLine(virQEMUDriver *driver, if (qemuBuildFilesystemCommandLine(cmd, def, qemuCaps, priv) < 0) return NULL; - if (qemuBuildNetCommandLine(driver, vm, logManager, secManager, cmd, + if (qemuBuildNetCommandLine(driver, vm, cmd, qemuCaps, vmop, standalone, nnicindexes, nicindexes) < 0) return NULL; - if (qemuBuildSmartcardCommandLine(logManager, secManager, cmd, cfg, de= f, qemuCaps) < 0) + if (qemuBuildSmartcardCommandLine(cmd, cfg, def, qemuCaps) < 0) return NULL; - if (qemuBuildSerialCommandLine(logManager, secManager, cmd, cfg, def, = qemuCaps) < 0) + if (qemuBuildSerialCommandLine(cmd, cfg, def, qemuCaps) < 0) return NULL; - if (qemuBuildParallelsCommandLine(logManager, secManager, cmd, cfg, de= f, qemuCaps) < 0) + if (qemuBuildParallelsCommandLine(cmd, cfg, def, qemuCaps) < 0) return NULL; - if (qemuBuildChannelsCommandLine(logManager, secManager, cmd, cfg, def= , qemuCaps) < 0) + if (qemuBuildChannelsCommandLine(cmd, cfg, def, qemuCaps) < 0) return NULL; - if (qemuBuildConsoleCommandLine(logManager, secManager, cmd, cfg, def,= qemuCaps) < 0) + if (qemuBuildConsoleCommandLine(cmd, cfg, def, qemuCaps) < 0) return NULL; if (qemuBuildTPMsCommandLine(cmd, def, qemuCaps) < 0) @@ -10725,7 +10691,7 @@ qemuBuildCommandLine(virQEMUDriver *driver, if (qemuBuildWatchdogCommandLine(cmd, def, qemuCaps) < 0) return NULL; - if (qemuBuildRedirdevCommandLine(logManager, secManager, cmd, cfg, def= , qemuCaps) < 0) + if (qemuBuildRedirdevCommandLine(cmd, cfg, def, qemuCaps) < 0) return NULL; if (qemuBuildHostdevCommandLine(cmd, def, qemuCaps) < 0) @@ -10737,7 +10703,7 @@ qemuBuildCommandLine(virQEMUDriver *driver, if (qemuBuildMemballoonCommandLine(cmd, def, qemuCaps) < 0) return NULL; - if (qemuBuildRNGCommandLine(logManager, secManager, cmd, cfg, def, qem= uCaps) < 0) + if (qemuBuildRNGCommandLine(cmd, cfg, def, qemuCaps) < 0) return NULL; if (qemuBuildNVRAMCommandLine(cmd, def) < 0) @@ -10771,8 +10737,7 @@ qemuBuildCommandLine(virQEMUDriver *driver, return NULL; for (i =3D 0; i < def->nshmems; i++) { - if (qemuBuildShmemCommandLine(logManager, secManager, cmd, cfg, - def, def->shmems[i], qemuCaps) < 0) + if (qemuBuildShmemCommandLine(cmd, cfg, def, def->shmems[i], qemuC= aps) < 0) return NULL; } diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 7dec2cb4af..dbdf3a4793 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -44,8 +44,6 @@ VIR_ENUM_DECL(qemuVideo); VIR_ENUM_DECL(qemuSoundCodec); virCommand *qemuBuildCommandLine(virQEMUDriver *driver, - virLogManager *logManager, - virSecurityManager *secManager, virDomainObj *vm, const char *migrateURI, virDomainMomentObj *snapshot, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index be49cc9360..d31ab103cf 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7463,8 +7463,6 @@ qemuProcessLaunch(virConnectPtr conn, VIR_DEBUG("Building emulator command line"); if (!(cmd =3D qemuBuildCommandLine(driver, - qemuDomainLogContextGetManager(logCtx= t), - driver->securityManager, vm, incoming ? incoming->launchURI : NULL, snapshot, vmop, @@ -7978,8 +7976,6 @@ qemuProcessCreatePretendCmdBuild(virQEMUDriver *drive= r, { VIR_DEBUG("Building emulator command line"); return qemuBuildCommandLine(driver, - NULL, - driver->securityManager, vm, migrateURI, NULL, --=20 2.31.1