From nobody Sun Feb 8 12:39:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1565710854; cv=none; d=zoho.com; s=zohoarc; b=kxhI/R9PBgRAWbKtHT3ngmG/IRlNqs+gcqL2pLSuC0x72ZJk+NcDBfwdctuYM1HxwK9i7azIe62wlEkGr79ueSxT+5QdaUtG8v0lA/KTs1RsnTbQOPhilVi1rEz/uGy9zgvH44U2kah5iF6CCdb8wYX3kQytEP8qMcJG9diQ8Tg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565710854; h=Content-Type:Content-Transfer-Encoding:Cc: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:ARC-Authentication-Results; bh=MsmfFEF5uzXKWgbdrAdFWUJp1GaKAEdbAXEc4SOg01s=; b=CjTFaENn3tr88fkgfapXZq1BoAV3Pte5JoOuDpNG+U1wmpvGBSvZ7KDTbn9nhqlHwghF2DT3a0t1echk2RSps0dxx8Ur1MwxqQpKAWGmPTHETpT6QW80kCxvEsTArOXIV4h9eSZakLr9ZFNTR2tIX9LLrCxhuDLcDPOcyGMehXY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1565710854007263.98006673631073; Tue, 13 Aug 2019 08:40:54 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8FFC430622E4; Tue, 13 Aug 2019 15:40:51 +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 6080310190A1; Tue, 13 Aug 2019 15:40:51 +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 137C5180B536; Tue, 13 Aug 2019 15:40:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x7DFejWx009946 for ; Tue, 13 Aug 2019 11:40:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 419EB82E27; Tue, 13 Aug 2019 15:40:45 +0000 (UTC) Received: from mx1.redhat.com (ext-mx12.extmail.prod.ext.phx2.redhat.com [10.5.110.41]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3C79882489 for ; Tue, 13 Aug 2019 15:40:42 +0000 (UTC) Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AF7C2316E534 for ; Tue, 13 Aug 2019 15:40:41 +0000 (UTC) Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x7DFXMQ5032298 for ; Tue, 13 Aug 2019 11:40:41 -0400 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0b-001b2d01.pphosted.com with ESMTP id 2uby40axk8-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 13 Aug 2019 11:40:40 -0400 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 13 Aug 2019 16:40:39 +0100 Received: from b06avi18626390.portsmouth.uk.ibm.com (9.149.26.192) by e06smtp03.uk.ibm.com (192.168.101.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 13 Aug 2019 16:40:38 +0100 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06avi18626390.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x7DFeILp35127650 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 13 Aug 2019 15:40:18 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1659AA4060; Tue, 13 Aug 2019 15:40:37 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DADCBA405F; Tue, 13 Aug 2019 15:40:36 +0000 (GMT) Received: from localhost.localdomain (unknown [9.152.222.28]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 13 Aug 2019 15:40:36 +0000 (GMT) From: Boris Fiuczynski To: libvir-list@redhat.com Date: Tue, 13 Aug 2019 17:40:29 +0200 In-Reply-To: <20190813154030.11283-1-fiuczy@linux.ibm.com> References: <20190813154030.11283-1-fiuczy@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 19081315-0012-0000-0000-0000033E358F X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19081315-0013-0000-0000-00002178459E Message-Id: <20190813154030.11283-6-fiuczy@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-13_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908130159 X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 238 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Tue, 13 Aug 2019 15:40:42 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Tue, 13 Aug 2019 15:40:42 +0000 (UTC) for IP:'148.163.158.5' DOMAIN:'mx0b-001b2d01.pphosted.com' HELO:'mx0a-001b2d01.pphosted.com' FROM:'fiuczy@linux.ibm.com' RCPT:'' X-RedHat-Spam-Score: -0.7 (RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS) 148.163.158.5 mx0b-001b2d01.pphosted.com 148.163.158.5 mx0b-001b2d01.pphosted.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.41 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: jjherne@linux.ibm.com, bwalk@linux.ibm.com, pkrempa@redhat.com, mhartmay@linux.ibm.com Subject: [libvirt] [PATCH v2 5/6] qemu: refactor mdev validation method signatures 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 13 Aug 2019 15:40:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Refactoring the method signatures in preparation for checking boot index of the mediated devices. Signed-off-by: Boris Fiuczynski Reviewed-by: Marc Hartmayer Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 9a9b6676e3..7331d93868 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5158,10 +5158,13 @@ qemuDomainDeviceDefValidateNetwork(const virDomainN= etDef *net) =20 =20 static int -qemuDomainMdevDefVFIOPCIValidate(const virDomainHostdevSubsysMediatedDev *= dev, +qemuDomainMdevDefVFIOPCIValidate(const virDomainHostdevDef *hostdev, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { + const virDomainHostdevSubsysMediatedDev *dev; + + dev =3D &hostdev->source.subsys.u.mdev; if (dev->display =3D=3D VIR_TRISTATE_SWITCH_ABSENT) return 0; =20 @@ -5194,17 +5197,18 @@ qemuDomainMdevDefVFIOPCIValidate(const virDomainHos= tdevSubsysMediatedDev *dev, =20 =20 static int -qemuDomainMdevDefVFIOAPValidate(const virDomainDef *def) +qemuDomainMdevDefVFIOAPValidate(const virDomainHostdevDef *hostdev ATTRIBU= TE_UNUSED, + const virDomainDef *def) { size_t i; bool vfioap_found =3D false; =20 /* VFIO-AP is restricted to a single mediated device only */ for (i =3D 0; i < def->nhostdevs; i++) { - virDomainHostdevDefPtr hostdev =3D def->hostdevs[i]; + virDomainHostdevDefPtr hdev =3D def->hostdevs[i]; =20 - if (virHostdevIsMdevDevice(hostdev) && - hostdev->source.subsys.u.mdev.model =3D=3D VIR_MDEV_MODEL_TYPE= _VFIO_AP) { + if (virHostdevIsMdevDevice(hdev) && + hdev->source.subsys.u.mdev.model =3D=3D VIR_MDEV_MODEL_TYPE_VF= IO_AP) { if (vfioap_found) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Only one hostdev of model vfio-ap is " @@ -5220,15 +5224,18 @@ qemuDomainMdevDefVFIOAPValidate(const virDomainDef = *def) =20 =20 static int -qemuDomainMdevDefValidate(const virDomainHostdevSubsysMediatedDev *mdevsrc, +qemuDomainMdevDefValidate(const virDomainHostdevDef *hostdev, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { + const virDomainHostdevSubsysMediatedDev *mdevsrc; + + mdevsrc =3D &hostdev->source.subsys.u.mdev; switch ((virMediatedDeviceModelType) mdevsrc->model) { case VIR_MDEV_MODEL_TYPE_VFIO_PCI: - return qemuDomainMdevDefVFIOPCIValidate(mdevsrc, def, qemuCaps); + return qemuDomainMdevDefVFIOPCIValidate(hostdev, def, qemuCaps); case VIR_MDEV_MODEL_TYPE_VFIO_AP: - return qemuDomainMdevDefVFIOAPValidate(def); + return qemuDomainMdevDefVFIOAPValidate(hostdev, def); case VIR_MDEV_MODEL_TYPE_VFIO_CCW: break; case VIR_MDEV_MODEL_TYPE_LAST: @@ -5247,8 +5254,6 @@ qemuDomainDeviceDefValidateHostdev(const virDomainHos= tdevDef *hostdev, const virDomainDef *def, virQEMUCapsPtr qemuCaps) { - const virDomainHostdevSubsysMediatedDev *mdevsrc; - /* forbid capabilities mode hostdev in this kind of hypervisor */ if (hostdev->mode =3D=3D VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -5279,8 +5284,7 @@ qemuDomainDeviceDefValidateHostdev(const virDomainHos= tdevDef *hostdev, "supported by mediated devices")); return -1; } - mdevsrc =3D &hostdev->source.subsys.u.mdev; - return qemuDomainMdevDefValidate(mdevsrc, def, qemuCaps); + return qemuDomainMdevDefValidate(hostdev, def, qemuCaps); case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: default: virReportEnumRangeError(virDomainHostdevSubsysType, --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list