From nobody Sun Feb 8 21:33:43 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; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1610999686; cv=none; d=zohomail.com; s=zohoarc; b=cB1SLW2/mkb0RMHgn52alAMlqfM399GBAIl76kFOf4yB9NRnLTT0j7sNPkN6kLkV2v03oFMO8ssyF0V/7CVkdWj5jxNPkWe1y+8qtT3J5va5ukFACIajzBXKinUci+eblD/5/lA9riBH1kYInzZSG5G4ShtvZiqxe3RqfVKZiME= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610999686; 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; bh=FZXurWTdm4Ly6GwqLwDAG3x2PFpZvziK7HUh7r3/Gu0=; b=Gi0XpHhc7h5woz23B5kEIwBXwCqhHb8GWxwipVWRael8LtTJDSsInyxHXMaZNZsx47K5b88b8slV0D60aHqFjJHwegokFACugHmxfhNX/fB+m1GN5Xk2R1RUTRl6ubO8ON3w0jlGRTygDZtWYwzSC7goGlRzchSwH0DXPcMYPDQ= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail 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 1610999686202340.0674682298592; Mon, 18 Jan 2021 11:54:46 -0800 (PST) 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-333-1PCQodf3NFqlIpqmZSVLiQ-1; Mon, 18 Jan 2021 14:54:43 -0500 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 9310C1005D4C; Mon, 18 Jan 2021 19:54:31 +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 695C727C30; Mon, 18 Jan 2021 19:54:31 +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 278051809CAC; Mon, 18 Jan 2021 19:54:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 10IJs3f0032493 for ; Mon, 18 Jan 2021 14:54:03 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4071563796; Mon, 18 Jan 2021 19:54:03 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 382346D9DB for ; Mon, 18 Jan 2021 19:53:54 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9F60D187504C for ; Mon, 18 Jan 2021 19:53:54 +0000 (UTC) Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-39-PCYcxLJ6MeWbCwljwWYk6Q-1; Mon, 18 Jan 2021 14:53:52 -0500 Received: by mail-qv1-f41.google.com with SMTP id l7so8075599qvt.4 for ; Mon, 18 Jan 2021 11:53:52 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:a75a:cb34:ba60:6de6:be1d]) by smtp.gmail.com with ESMTPSA id 16sm11309085qkf.112.2021.01.18.11.53.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 11:53:51 -0800 (PST) X-MC-Unique: 1PCQodf3NFqlIpqmZSVLiQ-1 X-MC-Unique: PCYcxLJ6MeWbCwljwWYk6Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FZXurWTdm4Ly6GwqLwDAG3x2PFpZvziK7HUh7r3/Gu0=; b=ecXVlJTYC3A0TigBxBJz3entlCDYaOVZ3WRSFEBw7E2yEC2j32ea574KAZvcTS+Ky5 EYdx4/07M1AX/1HHiyX85riP0gjbKyKyy28B+PIj2lO0UWzxr8HvMG4W3Z6nMJCnPCXT PMSyeUb09HZ3pcndJTCRHUQ5z8CPe06PpQyLetsAg0SYY/CtbZPpfioHDHCYJr0PfTqA 85XGXpcMgUNJjyqEe3ErjeRO+IeDoIqIg93kMzuka5xSV9LoqUthMR4eV5iMidF0ouAW EK3v3vUyuKQ0Fwq6v+MAKHuthXPXeOVIOy/g9u3I3PUzydoGF548cog47lJmkAlh5pTi KLYg== X-Gm-Message-State: AOAM531C2mO6HUvxRN8G9FDf4jdELEgFTHoDi+Um5GWAuhjVbhbSSWLY rKbuAIwyXEtpIU5xg9F+KlTYfFyouWfLOQ== X-Google-Smtp-Source: ABdhPJz74o8oe137ABg3QFqeDiA9GK0UBOl1Xv7yctA9hlJZqdhbiMdgSieit41f5lSF/3ZLHW8PbQ== X-Received: by 2002:a0c:e9c2:: with SMTP id q2mr1328166qvo.1.1610999631847; Mon, 18 Jan 2021 11:53:51 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH RESEND 03/20] domain_driver.c: use PCI address with virDomainDriverNodeDeviceGetPCIInfo() Date: Mon, 18 Jan 2021 16:53:19 -0300 Message-Id: <20210118195336.2090823-4-danielhb413@gmail.com> In-Reply-To: <20210118195336.2090823-1-danielhb413@gmail.com> References: <20210118195336.2090823-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza 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 Content-Type: text/plain; charset="utf-8" Instead of receiving 4 uints in order and write domain/bus/slot/function, receive a virPCIDeviceAddressPtr instead and write into it. This change will allow us to simplify the API for virPCIDeviceNew() in the next patch. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Laine Stump --- src/hypervisor/domain_driver.c | 13 +++++-------- src/hypervisor/domain_driver.h | 5 +---- src/libxl/libxl_driver.c | 18 +++++++++--------- src/qemu/qemu_driver.c | 18 +++++++++--------- 4 files changed, 24 insertions(+), 30 deletions(-) diff --git a/src/hypervisor/domain_driver.c b/src/hypervisor/domain_driver.c index 68dbf10ac6..cdb53bcf3e 100644 --- a/src/hypervisor/domain_driver.c +++ b/src/hypervisor/domain_driver.c @@ -341,20 +341,17 @@ virDomainDriverSetupPersistentDefBlkioParams(virDomai= nDefPtr persistentDef, =20 int virDomainDriverNodeDeviceGetPCIInfo(virNodeDeviceDefPtr def, - unsigned *domain, - unsigned *bus, - unsigned *slot, - unsigned *function) + virPCIDeviceAddressPtr devAddr) { virNodeDevCapsDefPtr cap; =20 cap =3D def->caps; while (cap) { if (cap->data.type =3D=3D VIR_NODE_DEV_CAP_PCI_DEV) { - *domain =3D cap->data.pci_dev.domain; - *bus =3D cap->data.pci_dev.bus; - *slot =3D cap->data.pci_dev.slot; - *function =3D cap->data.pci_dev.function; + devAddr->domain =3D cap->data.pci_dev.domain; + devAddr->bus =3D cap->data.pci_dev.bus; + devAddr->slot =3D cap->data.pci_dev.slot; + devAddr->function =3D cap->data.pci_dev.function; break; } =20 diff --git a/src/hypervisor/domain_driver.h b/src/hypervisor/domain_driver.h index 2bb053d559..86b92d0284 100644 --- a/src/hypervisor/domain_driver.h +++ b/src/hypervisor/domain_driver.h @@ -48,7 +48,4 @@ int virDomainDriverSetupPersistentDefBlkioParams(virDomai= nDefPtr persistentDef, int nparams); =20 int virDomainDriverNodeDeviceGetPCIInfo(virNodeDeviceDefPtr def, - unsigned *domain, - unsigned *bus, - unsigned *slot, - unsigned *function); + virPCIDeviceAddressPtr devAddr); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 0821d39c9b..360d553a22 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5780,7 +5780,7 @@ libxlNodeDeviceDetachFlags(virNodeDevicePtr dev, unsigned int flags) { virPCIDevicePtr pci =3D NULL; - unsigned domain =3D 0, bus =3D 0, slot =3D 0, function =3D 0; + virPCIDeviceAddress devAddr; int ret =3D -1; virNodeDeviceDefPtr def =3D NULL; char *xml =3D NULL; @@ -5815,10 +5815,10 @@ libxlNodeDeviceDetachFlags(virNodeDevicePtr dev, if (virNodeDeviceDetachFlagsEnsureACL(dev->conn, def) < 0) goto cleanup; =20 - if (virDomainDriverNodeDeviceGetPCIInfo(def, &domain, &bus, &slot, &fu= nction) < 0) + if (virDomainDriverNodeDeviceGetPCIInfo(def, &devAddr) < 0) goto cleanup; =20 - pci =3D virPCIDeviceNew(domain, bus, slot, function); + pci =3D virPCIDeviceNew(devAddr.domain, devAddr.bus, devAddr.slot, dev= Addr.function); if (!pci) goto cleanup; =20 @@ -5853,7 +5853,7 @@ static int libxlNodeDeviceReAttach(virNodeDevicePtr dev) { virPCIDevicePtr pci =3D NULL; - unsigned domain =3D 0, bus =3D 0, slot =3D 0, function =3D 0; + virPCIDeviceAddress devAddr; int ret =3D -1; virNodeDeviceDefPtr def =3D NULL; char *xml =3D NULL; @@ -5886,10 +5886,10 @@ libxlNodeDeviceReAttach(virNodeDevicePtr dev) if (virNodeDeviceReAttachEnsureACL(dev->conn, def) < 0) goto cleanup; =20 - if (virDomainDriverNodeDeviceGetPCIInfo(def, &domain, &bus, &slot, &fu= nction) < 0) + if (virDomainDriverNodeDeviceGetPCIInfo(def, &devAddr) < 0) goto cleanup; =20 - pci =3D virPCIDeviceNew(domain, bus, slot, function); + pci =3D virPCIDeviceNew(devAddr.domain, devAddr.bus, devAddr.slot, dev= Addr.function); if (!pci) goto cleanup; =20 @@ -5911,7 +5911,7 @@ static int libxlNodeDeviceReset(virNodeDevicePtr dev) { virPCIDevicePtr pci =3D NULL; - unsigned domain =3D 0, bus =3D 0, slot =3D 0, function =3D 0; + virPCIDeviceAddress devAddr; int ret =3D -1; virNodeDeviceDefPtr def =3D NULL; char *xml =3D NULL; @@ -5944,10 +5944,10 @@ libxlNodeDeviceReset(virNodeDevicePtr dev) if (virNodeDeviceResetEnsureACL(dev->conn, def) < 0) goto cleanup; =20 - if (virDomainDriverNodeDeviceGetPCIInfo(def, &domain, &bus, &slot, &fu= nction) < 0) + if (virDomainDriverNodeDeviceGetPCIInfo(def, &devAddr) < 0) goto cleanup; =20 - pci =3D virPCIDeviceNew(domain, bus, slot, function); + pci =3D virPCIDeviceNew(devAddr.domain, devAddr.bus, devAddr.slot, dev= Addr.function); if (!pci) goto cleanup; =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0a732a241d..28781cc34b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11962,7 +11962,7 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, { virQEMUDriverPtr driver =3D dev->conn->privateData; virPCIDevicePtr pci =3D NULL; - unsigned domain =3D 0, bus =3D 0, slot =3D 0, function =3D 0; + virPCIDeviceAddress devAddr; int ret =3D -1; virNodeDeviceDefPtr def =3D NULL; g_autofree char *xml =3D NULL; @@ -11997,10 +11997,10 @@ qemuNodeDeviceDetachFlags(virNodeDevicePtr dev, if (virNodeDeviceDetachFlagsEnsureACL(dev->conn, def) < 0) goto cleanup; =20 - if (virDomainDriverNodeDeviceGetPCIInfo(def, &domain, &bus, &slot, &fu= nction) < 0) + if (virDomainDriverNodeDeviceGetPCIInfo(def, &devAddr) < 0) goto cleanup; =20 - pci =3D virPCIDeviceNew(domain, bus, slot, function); + pci =3D virPCIDeviceNew(devAddr.domain, devAddr.bus, devAddr.slot, dev= Addr.function); if (!pci) goto cleanup; =20 @@ -12046,7 +12046,7 @@ qemuNodeDeviceReAttach(virNodeDevicePtr dev) { virQEMUDriverPtr driver =3D dev->conn->privateData; virPCIDevicePtr pci =3D NULL; - unsigned domain =3D 0, bus =3D 0, slot =3D 0, function =3D 0; + virPCIDeviceAddress devAddr; int ret =3D -1; virNodeDeviceDefPtr def =3D NULL; g_autofree char *xml =3D NULL; @@ -12078,10 +12078,10 @@ qemuNodeDeviceReAttach(virNodeDevicePtr dev) if (virNodeDeviceReAttachEnsureACL(dev->conn, def) < 0) goto cleanup; =20 - if (virDomainDriverNodeDeviceGetPCIInfo(def, &domain, &bus, &slot, &fu= nction) < 0) + if (virDomainDriverNodeDeviceGetPCIInfo(def, &devAddr) < 0) goto cleanup; =20 - pci =3D virPCIDeviceNew(domain, bus, slot, function); + pci =3D virPCIDeviceNew(devAddr.domain, devAddr.bus, devAddr.slot, dev= Addr.function); if (!pci) goto cleanup; =20 @@ -12100,7 +12100,7 @@ qemuNodeDeviceReset(virNodeDevicePtr dev) { virQEMUDriverPtr driver =3D dev->conn->privateData; virPCIDevicePtr pci; - unsigned domain =3D 0, bus =3D 0, slot =3D 0, function =3D 0; + virPCIDeviceAddress devAddr; int ret =3D -1; virNodeDeviceDefPtr def =3D NULL; g_autofree char *xml =3D NULL; @@ -12132,10 +12132,10 @@ qemuNodeDeviceReset(virNodeDevicePtr dev) if (virNodeDeviceResetEnsureACL(dev->conn, def) < 0) goto cleanup; =20 - if (virDomainDriverNodeDeviceGetPCIInfo(def, &domain, &bus, &slot, &fu= nction) < 0) + if (virDomainDriverNodeDeviceGetPCIInfo(def, &devAddr) < 0) goto cleanup; =20 - pci =3D virPCIDeviceNew(domain, bus, slot, function); + pci =3D virPCIDeviceNew(devAddr.domain, devAddr.bus, devAddr.slot, dev= Addr.function); if (!pci) goto cleanup; =20 --=20 2.26.2