[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/12] virtio-pci: don't touch pci on virtio reset
From: |
Michael S. Tsirkin |
Subject: |
[PULL 12/12] virtio-pci: don't touch pci on virtio reset |
Date: |
Wed, 17 Aug 2022 16:06:30 -0400 |
virtio level reset should not affect pci express
registers such as PM, error or link.
Fixes: 27ce0f3afc ("hw/virtio: fix Power Management Control Register for PCI
Express virtio devices")
Fixes: d584f1b9ca ("hw/virtio: fix Link Control Register for PCI Express virtio
devices")
Fixes: c2cabb3422 ("hw/virtio: fix error enabling flags in Device Control
register")
Cc: "Marcel Apfelbaum" <marcel@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/virtio/virtio-pci.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 5ce61f9b45..a50c5a57d7 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1947,7 +1947,6 @@ static void virtio_pci_reset(DeviceState *qdev)
{
VirtIOPCIProxy *proxy = VIRTIO_PCI(qdev);
VirtioBusState *bus = VIRTIO_BUS(&proxy->bus);
- PCIDevice *dev = PCI_DEVICE(qdev);
int i;
virtio_bus_reset(bus);
@@ -1960,6 +1959,13 @@ static void virtio_pci_reset(DeviceState *qdev)
proxy->vqs[i].avail[0] = proxy->vqs[i].avail[1] = 0;
proxy->vqs[i].used[0] = proxy->vqs[i].used[1] = 0;
}
+}
+
+static void virtio_pci_bus_reset(DeviceState *qdev)
+{
+ PCIDevice *dev = PCI_DEVICE(qdev);
+
+ virtio_pci_reset(qdev);
if (pci_is_express(dev)) {
pcie_cap_deverr_reset(dev);
@@ -2027,7 +2033,7 @@ static void virtio_pci_class_init(ObjectClass *klass,
void *data)
k->class_id = PCI_CLASS_OTHERS;
device_class_set_parent_realize(dc, virtio_pci_dc_realize,
&vpciklass->parent_dc_realize);
- dc->reset = virtio_pci_reset;
+ dc->reset = virtio_pci_bus_reset;
}
static const TypeInfo virtio_pci_info = {
--
MST
- [PULL 01/12] virtio-scsi: fix race in virtio_scsi_dataplane_start(), (continued)
- [PULL 01/12] virtio-scsi: fix race in virtio_scsi_dataplane_start(), Michael S. Tsirkin, 2022/08/17
- [PULL 02/12] hw/virtio: gracefully handle unset vhost_dev vdev, Michael S. Tsirkin, 2022/08/17
- [PULL 03/12] hw/virtio: handle un-configured shutdown in virtio-pci, Michael S. Tsirkin, 2022/08/17
- [PULL 04/12] hw/virtio: fix vhost_user_read tracepoint, Michael S. Tsirkin, 2022/08/17
- [PULL 05/12] x86: disable rng seeding via setup_data, Michael S. Tsirkin, 2022/08/17
- [PULL 06/12] hw/cxl: Fix memory leak in error paths, Michael S. Tsirkin, 2022/08/17
- [PULL 08/12] hw/cxl: Add stub write function for RO MemoryRegionOps entries., Michael S. Tsirkin, 2022/08/17
- [PULL 09/12] hw/cxl: Fix Get LSA input payload size which should be 8 bytes., Michael S. Tsirkin, 2022/08/17
- [PULL 10/12] hw/cxl: Correctly handle variable sized mailbox input payloads., Michael S. Tsirkin, 2022/08/17
- [PULL 11/12] tests: acpi: silence applesmc warning about invalid key, Michael S. Tsirkin, 2022/08/17
- [PULL 12/12] virtio-pci: don't touch pci on virtio reset,
Michael S. Tsirkin <=
- [PULL 07/12] hw/cxl: Fix wrong query of target ports, Michael S. Tsirkin, 2022/08/17
- Re: [PULL 00/12] pc,virtio: fixes, Richard Henderson, 2022/08/18