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

pcie, virtio: Remove redundant pm_cap

Browse source 
The pm_cap on the PCIExpressDevice object can be distilled down
to the new instance on the PCIDevice object.

Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Link: https://lore.kernel.org/qemu-devel/20250225215237.3314011-5-alex.williamson@redhat.com
Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
Alex Williamson 2025-02-25 14:52:28 -07:00 • committed by Cédric Le Goater
parent 05c6a8eff6
commit 8b8d08cf29
3 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
hw/pci-bridge/pcie_pci_bridge.c
View file

@ -56,7 +56,6 @@ static void pcie_pci_bridge_realize(PCIDevice *d, Error **errp)
if (pos < 0) { if (pos < 0) {
goto pm_error; goto pm_error;
} }
d->exp.pm_cap = pos;
pci_set_word(d->config + pos + PCI_PM_PMC, 0x3); pci_set_word(d->config + pos + PCI_PM_PMC, 0x3);
pcie_cap_arifwd_init(d); pcie_cap_arifwd_init(d);

8
hw/virtio/virtio-pci.c
View file

@ -2209,8 +2209,6 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)
return; return;
} }
pci_dev->exp.pm_cap = pos;
/* /*
* Indicates that this function complies with revision 1.2 of the * Indicates that this function complies with revision 1.2 of the
* PCI Power Management Interface Specification. * PCI Power Management Interface Specification.
@ -2309,11 +2307,11 @@ static bool virtio_pci_no_soft_reset(PCIDevice *dev)
{ {
uint16_t pmcsr; uint16_t pmcsr;
if (!pci_is_express(dev) || !dev->exp.pm_cap) { if (!pci_is_express(dev) || !(dev->cap_present & QEMU_PCI_CAP_PM)) {
return false; return false;
} }
pmcsr = pci_get_word(dev->config + dev->exp.pm_cap + PCI_PM_CTRL); pmcsr = pci_get_word(dev->config + dev->pm_cap + PCI_PM_CTRL);
/* /*
* When No_Soft_Reset bit is set and the device * When No_Soft_Reset bit is set and the device
@ -2342,7 +2340,7 @@ static void virtio_pci_bus_reset_hold(Object *obj, ResetType type)
if (proxy->flags & VIRTIO_PCI_FLAG_INIT_PM) { if (proxy->flags & VIRTIO_PCI_FLAG_INIT_PM) {
pci_word_test_and_clear_mask( pci_word_test_and_clear_mask(
dev->config + dev->exp.pm_cap + PCI_PM_CTRL, dev->config + dev->pm_cap + PCI_PM_CTRL,
PCI_PM_CTRL_STATE_MASK); PCI_PM_CTRL_STATE_MASK);
} }
} }

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

@ -58,8 +58,6 @@ typedef enum {
struct PCIExpressDevice { struct PCIExpressDevice {
/* Offset of express capability in config space */ /* Offset of express capability in config space */
uint8_t exp_cap; uint8_t exp_cap;
/* Offset of Power Management capability in config space */
uint8_t pm_cap;
/* SLOT */ /* SLOT */
bool hpev_notified; /* Logical AND of conditions for hot plug event. bool hpev_notified; /* Logical AND of conditions for hot plug event.