From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Subject: [PULL 08/19] Revert "hw/pci: Fix SR-IOV VF number calculation"
Date: Thu, 1 Aug 2024 06:36:15 -0400 [thread overview]
Message-ID: <558452512f068bfb3584a5a8b15530b0c53074c7.1722508478.git.mst@redhat.com> (raw)
In-Reply-To: <cover.1722508478.git.mst@redhat.com>
This reverts commit ca6dd3aef8a103138c99788bcba8195d4905ddc5.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/pci/pci.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index cf2794879d..4c7be52951 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -1437,11 +1437,7 @@ static pcibus_t pci_config_get_bar_addr(PCIDevice *d, int reg,
pci_get_word(pf->config + sriov_cap + PCI_SRIOV_VF_OFFSET);
uint16_t vf_stride =
pci_get_word(pf->config + sriov_cap + PCI_SRIOV_VF_STRIDE);
- uint32_t vf_num = d->devfn - (pf->devfn + vf_offset);
-
- if (vf_num) {
- vf_num /= vf_stride;
- }
+ uint32_t vf_num = (d->devfn - (pf->devfn + vf_offset)) / vf_stride;
if (type & PCI_BASE_ADDRESS_MEM_TYPE_64) {
new_addr = pci_get_quad(pf->config + bar);
--
MST
next prev parent reply other threads:[~2024-08-01 10:37 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-01 10:35 [PULL 00/19] virtio,pci,pc: fixes Michael S. Tsirkin
2024-08-01 10:35 ` [PULL 01/19] virtio-rng: block max-bytes=0 Michael S. Tsirkin
2024-08-01 10:35 ` [PULL 02/19] Revert "docs: Document composable SR-IOV device" Michael S. Tsirkin
2024-08-01 10:35 ` [PULL 03/19] Revert "virtio-net: Implement SR-IOV VF" Michael S. Tsirkin
2024-08-01 10:35 ` [PULL 04/19] Revert "virtio-pci: Implement SR-IOV PF" Michael S. Tsirkin
2024-08-01 10:35 ` [PULL 05/19] Revert "pcie_sriov: Allow user to create SR-IOV device" Michael S. Tsirkin
2024-08-01 10:36 ` [PULL 06/19] Revert "pcie_sriov: Check PCI Express for SR-IOV PF" Michael S. Tsirkin
2024-08-01 10:36 ` [PULL 07/19] Revert "pcie_sriov: Ensure PF and VF are mutually exclusive" Michael S. Tsirkin
2024-08-01 10:36 ` Michael S. Tsirkin [this message]
2024-08-01 10:36 ` [PULL 09/19] Revert "pcie_sriov: Register VFs after migration" Michael S. Tsirkin
2024-08-01 10:36 ` [PULL 10/19] Revert "pcie_sriov: Remove num_vfs from PCIESriovPF" Michael S. Tsirkin
2024-08-01 10:36 ` [PULL 11/19] Revert "pcie_sriov: Release VFs failed to realize" Michael S. Tsirkin
2024-08-01 10:36 ` [PULL 12/19] Revert "pcie_sriov: Reuse SR-IOV VF device instances" Michael S. Tsirkin
2024-08-01 10:36 ` [PULL 13/19] Revert "pcie_sriov: Ensure VF function number does not overflow" Michael S. Tsirkin
2024-08-01 10:36 ` [PULL 14/19] Revert "pcie_sriov: Do not manually unrealize" Michael S. Tsirkin
2024-08-01 10:36 ` [PULL 15/19] Revert "hw/ppc/spapr_pci: Do not reject VFs created after a PF" Michael S. Tsirkin
2024-08-01 10:36 ` [PULL 16/19] Revert "hw/ppc/spapr_pci: Do not create DT for disabled PCI device" Michael S. Tsirkin
2024-08-01 10:37 ` [PULL 17/19] Revert "hw/pci: Rename has_power to enabled" Michael S. Tsirkin
2024-08-01 10:37 ` [PULL 18/19] hw/i386/amd_iommu: Don't leak memory in amdvi_update_iotlb() Michael S. Tsirkin
2024-08-01 10:37 ` [PULL 19/19] intel_iommu: Fix for IQA reg read dropped DW field Michael S. Tsirkin
2024-08-01 22:18 ` [PULL 00/19] virtio,pci,pc: fixes Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=558452512f068bfb3584a5a8b15530b0c53074c7.1722508478.git.mst@redhat.com \
--to=mst@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).