From nobody Mon Feb 9 07:38:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1618836064; cv=none; d=zohomail.com; s=zohoarc; b=QxqDg6dSwQ66YXAWxCUr7YLDYkp9jLeTv849m+3//NEyk0YfBUc5ZjL+RPtblLZmVsalmj8pCY6YR10vbC/Ao55zaqlHNurBNMTLwZzIkRY5crvSwxBBUJdafagwnDJQfk9HQlmPNZTdNvo2Na/FAFwa6yfSA0d24Xgx2xHx8sI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618836064; 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=0OB1JYQyaLdBmjOy38zqMtQ9jJBY8xoksORzBwDxo/Q=; b=XdYOIsnRh3Zr1VwlxhG8sXu393tfYfhyP3vpfhg39uGWhJz7Bs3JczRIA8zpVISjWvEP01EwGNj20jiJXXHBy4We+YVp/Gv5a8XhoU8q6xtIGRXQ49zIrRPuzrAg0J+j7qTAQnY8O5JRcZX3M/VLf/Xrsv6/aPXQtk9PGZke4Ag= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 161883606470273.36704644944268; Mon, 19 Apr 2021 05:41:04 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-139-BEk9-_BfOfyM4gTm1sd05Q-1; Mon, 19 Apr 2021 08:39:18 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6C0A85B364; Mon, 19 Apr 2021 12:39:12 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4882918E53; Mon, 19 Apr 2021 12:39:12 +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 119011806D19; Mon, 19 Apr 2021 12:39:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13JCZwFY019075 for ; Mon, 19 Apr 2021 08:35:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7EA8C19C79; Mon, 19 Apr 2021 12:35:58 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id D9AF219C66 for ; Mon, 19 Apr 2021 12:35:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618836063; 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=0OB1JYQyaLdBmjOy38zqMtQ9jJBY8xoksORzBwDxo/Q=; b=L5KBpocHJT++2mo1V7sHktBEu/vYJI8xo8TOezsAfMMttNu0hOubF2/t1vnGuKYj9UmjWc /U+BdeqLvAo284X0klbOCWngSDP3kyMvzGyI8AexXPPh3XqjLpCnWzvoRI+JfuvNfLhmkt W222cNa6SZngj6Rt3M6C/BbxY+oVpKA= X-MC-Unique: BEk9-_BfOfyM4gTm1sd05Q-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 08/38] qemuBuildDeviceAddressStr: Remove unused 'qemuCaps' Date: Mon, 19 Apr 2021 14:35:12 +0200 Message-Id: <03295f7683729c4d96203858682ad126b87f06de.1618834490.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.14 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The qemuCaps is left for the device commandline formatters for now as it might come in handy. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Pavel Hrdina Reviewed-by: Neal Gompa --- src/qemu/qemu_command.c | 73 ++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 63b6533c68..1b32f02543 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -343,8 +343,7 @@ qemuVirCommandGetDevSet(virCommand *cmd, int fd) static int qemuBuildDeviceAddressStr(virBuffer *buf, const virDomainDef *domainDef, - virDomainDeviceInfo *info, - virQEMUCaps *qemuCaps G_GNUC_UNUSED) + virDomainDeviceInfo *info) { g_autofree char *devStr =3D NULL; const char *contAlias =3D NULL; @@ -1831,14 +1830,14 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, qemuBuildVirtioOptionsStr(&opt, disk->virtio); - if (qemuBuildDeviceAddressStr(&opt, def, &disk->info, qemuCaps) < = 0) + if (qemuBuildDeviceAddressStr(&opt, def, &disk->info) < 0) return NULL; break; case VIR_DOMAIN_DISK_BUS_USB: virBufferAddLit(&opt, "usb-storage"); - if (qemuBuildDeviceAddressStr(&opt, def, &disk->info, qemuCaps) < = 0) + if (qemuBuildDeviceAddressStr(&opt, def, &disk->info) < 0) return NULL; break; @@ -2304,7 +2303,7 @@ qemuBuildVHostUserFsCommandLine(virCommand *cmd, if (fs->info.bootIndex) virBufferAsprintf(&opt, ",bootindex=3D%u", fs->info.bootIndex); - if (qemuBuildDeviceAddressStr(&opt, def, &fs->info, priv->qemuCaps) < = 0) + if (qemuBuildDeviceAddressStr(&opt, def, &fs->info) < 0) return -1; virCommandAddArgBuffer(cmd, &opt); @@ -2379,7 +2378,7 @@ qemuBuildFSDevStr(const virDomainDef *def, qemuBuildVirtioOptionsStr(&opt, fs->virtio); - if (qemuBuildDeviceAddressStr(&opt, def, &fs->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&opt, def, &fs->info) < 0) return NULL; return virBufferContentAndReset(&opt); @@ -2773,7 +2772,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD= ef, qemuBuildIoEventFdStr(&buf, def->ioeventfd, qemuCaps); - if (qemuBuildDeviceAddressStr(&buf, domainDef, &def->info, qemuCaps) <= 0) + if (qemuBuildDeviceAddressStr(&buf, domainDef, &def->info) < 0) return -1; *devstr =3D virBufferContentAndReset(&buf); @@ -3419,7 +3418,7 @@ qemuBuildMemoryDimmBackendStr(virBuffer *buf, char * qemuBuildMemoryDeviceStr(const virDomainDef *def, virDomainMemoryDef *mem, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char *device =3D NULL; @@ -3472,7 +3471,7 @@ qemuBuildMemoryDeviceStr(const virDomainDef *def, virBufferAsprintf(&buf, "memdev=3Dmem%s,id=3D%s", mem->info.alias, mem->info.alias); - if (qemuBuildDeviceAddressStr(&buf, def, &mem->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, def, &mem->info) < 0) return NULL; return virBufferContentAndReset(&buf); @@ -3632,7 +3631,7 @@ qemuBuildNicDevStr(virDomainDef *def, virBufferAsprintf(&buf, ",mac=3D%s", virMacAddrFormat(&net->mac, macaddr)); - if (qemuBuildDeviceAddressStr(&buf, def, &net->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, def, &net->info) < 0) return NULL; if (qemuBuildRomStr(&buf, &net->info) < 0) return NULL; @@ -3841,7 +3840,7 @@ qemuBuildHostNetStr(virDomainNetDef *net, char * qemuBuildWatchdogDevStr(const virDomainDef *def, virDomainWatchdogDef *dev, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; @@ -3853,7 +3852,7 @@ qemuBuildWatchdogDevStr(const virDomainDef *def, } virBufferAsprintf(&buf, "%s,id=3D%s", model, dev->info.alias); - if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, def, &dev->info) < 0) return NULL; return virBufferContentAndReset(&buf); @@ -3920,7 +3919,7 @@ qemuBuildMemballoonCommandLine(virCommand *cmd, } virBufferAsprintf(&buf, ",id=3D%s", def->memballoon->info.alias); - if (qemuBuildDeviceAddressStr(&buf, def, &def->memballoon->info, qemuC= aps) < 0) + if (qemuBuildDeviceAddressStr(&buf, def, &def->memballoon->info) < 0) return -1; if (def->memballoon->autodeflate !=3D VIR_TRISTATE_SWITCH_ABSENT) { @@ -4021,7 +4020,7 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def, virQEMUBuildBufferEscapeComma(&buf, dev->source.evdev); } - if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, def, &dev->info) < 0) return NULL; qemuBuildVirtioOptionsStr(&buf, dev->virtio); @@ -4032,7 +4031,7 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def, static char * qemuBuildUSBInputDevStr(const virDomainDef *def, virDomainInputDef *dev, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; @@ -4048,7 +4047,7 @@ qemuBuildUSBInputDevStr(const virDomainDef *def, break; } - if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, def, &dev->info) < 0) return NULL; return virBufferContentAndReset(&buf); @@ -4156,7 +4155,7 @@ qemuBuildSoundDevStr(const virDomainDef *def, return NULL; virBufferAsprintf(&buf, ",audiodev=3D%s", audioid); } - if (qemuBuildDeviceAddressStr(&buf, def, &sound->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, def, &sound->info) < 0) return NULL; return virBufferContentAndReset(&buf); @@ -4354,7 +4353,7 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, virBufferAsprintf(&buf, ",xres=3D%u,yres=3D%u", video->res->x, vid= eo->res->y); } - if (qemuBuildDeviceAddressStr(&buf, def, &video->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, def, &video->info) < 0) return NULL; qemuBuildVirtioOptionsStr(&buf, video->virtio); @@ -4536,7 +4535,7 @@ char * qemuBuildPCIHostdevDevStr(const virDomainDef *def, virDomainHostdevDef *dev, unsigned int bootIndex, /* used iff dev->info->b= ootIndex =3D=3D 0 */ - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virDomainHostdevSubsysPCI *pcisrc =3D &dev->source.subsys.u.pci; @@ -4571,7 +4570,7 @@ qemuBuildPCIHostdevDevStr(const virDomainDef *def, bootIndex =3D dev->info->bootIndex; if (bootIndex) virBufferAsprintf(&buf, ",bootindex=3D%u", bootIndex); - if (qemuBuildDeviceAddressStr(&buf, def, dev->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, def, dev->info) < 0) return NULL; if (qemuBuildRomStr(&buf, dev->info) < 0) return NULL; @@ -4619,7 +4618,7 @@ qemuBuildUSBHostdevDevStr(const virDomainDef *def, if (dev->info->bootIndex) virBufferAsprintf(&buf, ",bootindex=3D%u", dev->info->bootIndex); - if (qemuBuildDeviceAddressStr(&buf, def, dev->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, def, dev->info) < 0) return NULL; return virBufferContentAndReset(&buf); @@ -4629,13 +4628,13 @@ qemuBuildUSBHostdevDevStr(const virDomainDef *def, static char * qemuBuildHubDevStr(const virDomainDef *def, virDomainHubDef *dev, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virBufferAddLit(&buf, "usb-hub"); virBufferAsprintf(&buf, ",id=3D%s", dev->info.alias); - if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, def, &dev->info) < 0) return NULL; return virBufferContentAndReset(&buf); @@ -4713,7 +4712,7 @@ qemuBuildSCSIVHostHostdevDevStr(const virDomainDef *d= ef, vhostfdName, dev->info->alias); - if (qemuBuildDeviceAddressStr(&buf, def, dev->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, def, dev->info) < 0) return NULL; return virBufferContentAndReset(&buf); @@ -5132,7 +5131,7 @@ qemuBuildHostdevMdevModelTypeString(virDomainHostdevS= ubsysMediatedDev *mdev) char * qemuBuildHostdevMediatedDevStr(const virDomainDef *def, virDomainHostdevDef *dev, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; virDomainHostdevSubsysMediatedDev *mdevsrc =3D &dev->source.subsys.u.m= dev; @@ -5152,7 +5151,7 @@ qemuBuildHostdevMediatedDevStr(const virDomainDef *de= f, virBufferAsprintf(&buf, ",display=3D%s", virTristateSwitchTypeToString(mdevsrc->display)); - if (qemuBuildDeviceAddressStr(&buf, def, dev->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, def, dev->info) < 0) return NULL; if (dev->info->bootIndex) @@ -5632,7 +5631,7 @@ qemuBuildRNGDevStr(const virDomainDef *def, qemuBuildVirtioOptionsStr(&buf, dev->virtio); - if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, def, &dev->info) < 0) return NULL; return virBufferContentAndReset(&buf); @@ -9064,7 +9063,7 @@ qemuBuildSmartcardCommandLine(virLogManager *logManag= er, static char * qemuBuildShmemDevLegacyStr(virDomainDef *def, virDomainShmemDef *shmem, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; @@ -9088,7 +9087,7 @@ qemuBuildShmemDevLegacyStr(virDomainDef *def, } } - if (qemuBuildDeviceAddressStr(&buf, def, &shmem->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, def, &shmem->info) < 0) return NULL; return virBufferContentAndReset(&buf); @@ -9097,7 +9096,7 @@ qemuBuildShmemDevLegacyStr(virDomainDef *def, char * qemuBuildShmemDevStr(virDomainDef *def, virDomainShmemDef *shmem, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; @@ -9129,7 +9128,7 @@ qemuBuildShmemDevStr(virDomainDef *def, virTristateSwitchTypeToString(shmem->msi.ioevent= fd)); } - if (qemuBuildDeviceAddressStr(&buf, def, &shmem->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, def, &shmem->info) < 0) return NULL; return virBufferContentAndReset(&buf); @@ -9577,7 +9576,7 @@ qemuBuildConsoleCommandLine(virLogManager *logManager, char * qemuBuildRedirdevDevStr(const virDomainDef *def, virDomainRedirdevDef *dev, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { size_t i; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; @@ -9620,7 +9619,7 @@ qemuBuildRedirdevDevStr(const virDomainDef *def, if (dev->info.bootIndex) virBufferAsprintf(&buf, ",bootindex=3D%u", dev->info.bootIndex); - if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, def, &dev->info) < 0) return NULL; return virBufferContentAndReset(&buf); @@ -9743,7 +9742,7 @@ qemuBuildDomainLoaderCommandLine(virCommand *cmd, static char * qemuBuildTPMDevStr(const virDomainDef *def, virDomainTPMDef *tpm, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char *model =3D virDomainTPMModelTypeToString(tpm->model); @@ -9754,7 +9753,7 @@ qemuBuildTPMDevStr(const virDomainDef *def, virBufferAsprintf(&buf, "%s,tpmdev=3Dtpm-%s,id=3D%s", model, tpm->info.alias, tpm->info.alias); - if (qemuBuildDeviceAddressStr(&buf, def, &tpm->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, def, &tpm->info) < 0) return NULL; return virBufferContentAndReset(&buf); @@ -10324,7 +10323,7 @@ qemuBuildVsockDevStr(virDomainDef *def, qemuBuildVirtioOptionsStr(&buf, vsock->virtio); - if (qemuBuildDeviceAddressStr(&buf, def, &vsock->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, def, &vsock->info) < 0) return NULL; return virBufferContentAndReset(&buf); @@ -10762,7 +10761,7 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, virDomainChrSerialTargetModelTypeToString(serial->ta= rgetModel), serial->info.alias, serial->info.alias); - if (qemuBuildDeviceAddressStr(&buf, def, &serial->info, qemuCaps) < 0) + if (qemuBuildDeviceAddressStr(&buf, def, &serial->info) < 0) return -1; *deviceStr =3D virBufferContentAndReset(&buf); --=20 2.30.2