mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-15 15:32:51 +00:00
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>
This commit is contained in:
parent
63eb76dda2
commit
1a909e3dd8
|
@ -488,12 +488,10 @@ static void igb_pci_uninit(PCIDevice *pci_dev)
|
||||||
|
|
||||||
static void igb_qdev_reset_hold(Object *obj)
|
static void igb_qdev_reset_hold(Object *obj)
|
||||||
{
|
{
|
||||||
PCIDevice *d = PCI_DEVICE(obj);
|
|
||||||
IGBState *s = IGB(obj);
|
IGBState *s = IGB(obj);
|
||||||
|
|
||||||
trace_e1000e_cb_qdev_reset_hold();
|
trace_e1000e_cb_qdev_reset_hold();
|
||||||
|
|
||||||
pcie_sriov_pf_reset(d);
|
|
||||||
igb_core_reset(&s->core);
|
igb_core_reset(&s->core);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7114,10 +7114,6 @@ static void nvme_ctrl_reset(NvmeCtrl *n, NvmeResetType rst)
|
||||||
sctrl = &n->sec_ctrl_list.sec[i];
|
sctrl = &n->sec_ctrl_list.sec[i];
|
||||||
nvme_virt_set_state(n, le16_to_cpu(sctrl->scid), false);
|
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) {
|
if (rst != NVME_RESET_CONTROLLER) {
|
||||||
|
|
|
@ -409,6 +409,7 @@ static void pci_do_device_reset(PCIDevice *dev)
|
||||||
|
|
||||||
msi_reset(dev);
|
msi_reset(dev);
|
||||||
msix_reset(dev);
|
msix_reset(dev);
|
||||||
|
pcie_sriov_pf_reset(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue