motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-21 09:02:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

pci: skip reset during cpr

Browse source 
Do not reset a vfio-pci device during CPR.

Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Link: https://lore.kernel.org/qemu-devel/1749576403-25355-1-git-send-email-steven.sistare@oracle.com
Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
Steve Sistare 2025-06-10 10:26:43 -07:00 • committed by Cédric Le Goater
parent 8df3fa3d67
commit 24c156dcd9
3 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hw/pci/pci.c
View file

@ -32,6 +32,7 @@
#include "hw/pci/pci_host.h" #include "hw/pci/pci_host.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "hw/qdev-properties-system.h" #include "hw/qdev-properties-system.h"
#include "migration/cpr.h"
#include "migration/qemu-file-types.h" #include "migration/qemu-file-types.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "net/net.h" #include "net/net.h"
@ -537,6 +538,10 @@ static void pci_reset_regions(PCIDevice *dev)
static void pci_do_device_reset(PCIDevice *dev) static void pci_do_device_reset(PCIDevice *dev)
{ {
if ((dev->cap_present & QEMU_PCI_SKIP_RESET_ON_CPR) && cpr_is_incoming()) {
return;
}
pci_device_deassert_intx(dev); pci_device_deassert_intx(dev);
assert(dev->irq_state == 0); assert(dev->irq_state == 0);

7
hw/vfio/pci.c
View file

@ -3411,6 +3411,13 @@ static void vfio_instance_init(Object *obj)
/* QEMU_PCI_CAP_EXPRESS initialization does not depend on QEMU command /* QEMU_PCI_CAP_EXPRESS initialization does not depend on QEMU command
* line, therefore, no need to wait to realize like other devices */ * line, therefore, no need to wait to realize like other devices */
pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS; pci_dev->cap_present |= QEMU_PCI_CAP_EXPRESS;
/*
* A device that is resuming for cpr is already configured, so do not
* reset it during qemu_system_reset prior to cpr load, else interrupts
* may be lost.
*/
pci_dev->cap_present |= QEMU_PCI_SKIP_RESET_ON_CPR;
} }
static void vfio_pci_base_dev_class_init(ObjectClass *klass, const void *data) static void vfio_pci_base_dev_class_init(ObjectClass *klass, const void *data)

2
include/hw/pci/pci.h
View file

@ -222,6 +222,8 @@ enum {
QEMU_PCIE_EXT_TAG = (1 << QEMU_PCIE_EXT_TAG_BITNR), QEMU_PCIE_EXT_TAG = (1 << QEMU_PCIE_EXT_TAG_BITNR),
#define QEMU_PCI_CAP_PM_BITNR 14 #define QEMU_PCI_CAP_PM_BITNR 14
QEMU_PCI_CAP_PM = (1 << QEMU_PCI_CAP_PM_BITNR), QEMU_PCI_CAP_PM = (1 << QEMU_PCI_CAP_PM_BITNR),
#define QEMU_PCI_SKIP_RESET_ON_CPR_BITNR 15
QEMU_PCI_SKIP_RESET_ON_CPR = (1 << QEMU_PCI_SKIP_RESET_ON_CPR_BITNR),
}; };
typedef struct PCIINTxRoute { typedef struct PCIINTxRoute {