From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 571E8743EA for ; Mon, 21 Jun 2021 15:55:37 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 50B101C321 for ; Mon, 21 Jun 2021 15:55:37 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 683851C2DE for ; Mon, 21 Jun 2021 15:55:35 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3FE8942FEC for ; Mon, 21 Jun 2021 15:55:35 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Mon, 21 Jun 2021 15:55:16 +0200 Message-Id: <20210621135534.14807-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210621135534.14807-1-d.csapak@proxmox.com> References: <20210621135534.14807-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.852 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH common 2/3] SysFSTools: change 'product' to 'device' X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2021 13:55:37 -0000 so it is more consistend with the source (it comes from the file 'device') as well as the subsytem_device field the only place we use that field is in the same file in pci_dev_bind_to_vfio, which we also change here, so that should not be a breaking change (in qemu-server we only really use the existance and the has_fl_reset flag) Signed-off-by: Dominik Csapak --- src/PVE/SysFSTools.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PVE/SysFSTools.pm b/src/PVE/SysFSTools.pm index 7875b26..e595128 100644 --- a/src/PVE/SysFSTools.pm +++ b/src/PVE/SysFSTools.pm @@ -218,7 +218,7 @@ sub pci_device_info { $res = { name => $name, vendor => $vendor, - product => $product, + device => $product, domain => $domain, bus => $bus, slot => $slot, @@ -274,7 +274,7 @@ sub pci_dev_bind_to_vfio { my $testdir = "$vfio_basedir/$name"; return 1 if -d $testdir; - my $data = "$dev->{vendor} $dev->{product}"; + my $data = "$dev->{vendor} $dev->{device}"; return undef if !file_write("$vfio_basedir/new_id", $data); my $fn = "$pcisysfs/devices/$name/driver/unbind"; -- 2.20.1