From nobody Mon Feb 9 07:26:57 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=1617980654; cv=none; d=zohomail.com; s=zohoarc; b=V9bWWgxC0ZU4F0BBEIh7s/SBgaeTqE3w474Osugtop898KgZ3/caP6ijov5/gBIF9bt3P7B+6JvHuKAI2uE2TQvBjF4+UusBcXkKvqsPZyFZqocGH3MUGmoX4zhrxVrjSYUJ5zrxpacTujVIi9z0m8zg0VuxuQ6EH8s+z2jLwsw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617980654; 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=0V9HCgyEQi3jCmfIU2RfR7ng/ddEAlb6tnT4kzXxP6Q=; b=donsU9aI7+vfaBi8TR9vjsryf02Oa3qorndrzyeH0Eju53xUu9ABDaLpECYFPMJMXBi0l1MHzmT9WEOAry8AurGX6IBmWs/xZATYnFxryRSbYtNd5HgI/DL2aWmmEX+LQ9hmJS+0W7NQh+auvTGF+epwBck4EYELFvMMKLaNngE= 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 SMTP id 161798065454161.13735673233805; Fri, 9 Apr 2021 08:04:14 -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-531-LjYmkOi_PKqiaNGVCB10ng-1; Fri, 09 Apr 2021 11:00:53 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1F037894C17; Fri, 9 Apr 2021 15:00:13 +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 DCE3019727; Fri, 9 Apr 2021 15:00: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 802EF180B617; Fri, 9 Apr 2021 15:00:12 +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 139EvbND023759 for ; Fri, 9 Apr 2021 10:57:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 98D646EF41; Fri, 9 Apr 2021 14:57:37 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09CFC60D79 for ; Fri, 9 Apr 2021 14:57:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617980459; 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=0V9HCgyEQi3jCmfIU2RfR7ng/ddEAlb6tnT4kzXxP6Q=; b=EyTUKxoqplvuY3ytp3o1xlaEkk6FC9S23Ydkmegl/Ve17BXKzG1h8glpiYx3M3qK/KBkAz i9NbEpRQFdGjp0/vXMHqgNz/AYLlcspbwFB7JJ9mHuf9phAM4xAPTln6VQKqTqcqiHeMvw AXdSyQC9oTBhmQidxxduLZd6/qnXHrI= X-MC-Unique: LjYmkOi_PKqiaNGVCB10ng-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [RFC PATCH 12/43] qemuAssignDeviceControllerAlias: Remove unused 'qemuCaps' argument Date: Fri, 9 Apr 2021 16:56:48 +0200 Message-Id: <58f03ea989733838f02b4e029e403954727e3a96.1617979432.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.84 on 10.5.11.23 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) Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_alias.c | 3 +-- src/qemu/qemu_alias.h | 1 - src/qemu/qemu_hotplug.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index a36b245811..7f93231e0b 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -122,7 +122,6 @@ qemuAssignDeviceChrAlias(virDomainDefPtr def, int qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef, - virQEMUCapsPtr qemuCaps G_GNUC_UNUSED, virDomainControllerDefPtr controller) { const char *prefix =3D virDomainControllerTypeToString(controller->typ= e); @@ -653,7 +652,7 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCap= sPtr qemuCaps) return -1; } for (i =3D 0; i < def->ncontrollers; i++) { - if (qemuAssignDeviceControllerAlias(def, qemuCaps, def->controller= s[i]) < 0) + if (qemuAssignDeviceControllerAlias(def, def->controllers[i]) < 0) return -1; } for (i =3D 0; i < def->ninputs; i++) { diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h index fc4bdf35fa..c2be4e2512 100644 --- a/src/qemu/qemu_alias.h +++ b/src/qemu/qemu_alias.h @@ -32,7 +32,6 @@ int qemuAssignDeviceChrAlias(virDomainDefPtr def, ssize_t idx); int qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef, - virQEMUCapsPtr qemuCaps, virDomainControllerDefPtr controller); int qemuAssignDeviceDiskAlias(virDomainDefPtr def, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 58d2abb862..cb5a536834 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -870,7 +870,7 @@ int qemuDomainAttachControllerDevice(virQEMUDriverPtr d= river, if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev, "controller"= ) < 0) return -1; - if (qemuAssignDeviceControllerAlias(vm->def, priv->qemuCaps, controlle= r) < 0) + if (qemuAssignDeviceControllerAlias(vm->def, controller) < 0) goto cleanup; if (qemuBuildControllerDevStr(vm->def, controller, priv->qemuCaps, &de= vstr) < 0) --=20 2.30.2