diff options
| author | Akihiko Odaki <akihiko.odaki@daynix.com> | 2024-02-28 20:33:16 +0900 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2024-03-12 17:56:55 -0400 |
| commit | 1a909e3dd85d5c57a0e6a7e3285a29e57574f80d (patch) | |
| tree | 157b921ccef09d5a4966052dab063b81a41eef32 | |
| parent | 63eb76dda237843582f3616f4403ae795e471e17 (diff) | |
| download | focaccia-qemu-1a909e3dd85d5c57a0e6a7e3285a29e57574f80d.tar.gz focaccia-qemu-1a909e3dd85d5c57a0e6a7e3285a29e57574f80d.zip | |
hw/pci: Always call pcie_sriov_pf_reset()
Call pcie_sriov_pf_reset() from pci_do_device_reset() just as we do for msi_reset() and msix_reset() to prevent duplicating code for each SR-IOV PF. Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> Message-Id: <20240228-reuse-v8-5-282660281e60@daynix.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Sriram Yagnaraman <sriram.yagnaraman@ericsson.com>
| -rw-r--r-- | hw/net/igb.c | 2 | ||||
| -rw-r--r-- | hw/nvme/ctrl.c | 4 | ||||
| -rw-r--r-- | hw/pci/pci.c | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/hw/net/igb.c b/hw/net/igb.c index 9345506f81..9b37523d6d 100644 --- a/hw/net/igb.c +++ b/hw/net/igb.c @@ -488,12 +488,10 @@ static void igb_pci_uninit(PCIDevice *pci_dev) static void igb_qdev_reset_hold(Object *obj) { - PCIDevice *d = PCI_DEVICE(obj); IGBState *s = IGB(obj); trace_e1000e_cb_qdev_reset_hold(); - pcie_sriov_pf_reset(d); igb_core_reset(&s->core); } diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index 447c4de6fd..40159f39b8 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -7114,10 +7114,6 @@ static void nvme_ctrl_reset(NvmeCtrl *n, NvmeResetType rst) sctrl = &n->sec_ctrl_list.sec[i]; nvme_virt_set_state(n, le16_to_cpu(sctrl->scid), false); } - - if (rst != NVME_RESET_CONTROLLER) { - pcie_sriov_pf_reset(pci_dev); - } } if (rst != NVME_RESET_CONTROLLER) { diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 6496d027ca..e7a39cb203 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -409,6 +409,7 @@ static void pci_do_device_reset(PCIDevice *dev) msi_reset(dev); msix_reset(dev); + pcie_sriov_pf_reset(dev); } /* |