ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "hw/pci: Rename has_power to enabled" 

This reverts commit 6a31b219a5.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Michael S. Tsirkin 2024-08-01 03:44:50 -04:00
parent f1feffc4ef
commit 93829009a6
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/pci/pci.c
View File

@ -1525,7 +1525,7 @@ static void pci_update_mappings(PCIDevice *d)
continue; continue;
new_addr = pci_bar_address(d, i, r->type, r->size); new_addr = pci_bar_address(d, i, r->type, r->size);
if (!d->enabled) { if (!d->has_power) {
new_addr = PCI_BAR_UNMAPPED; new_addr = PCI_BAR_UNMAPPED;
} }
@ -1613,7 +1613,7 @@ void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val_in, int
pci_update_irq_disabled(d, was_irq_disabled); pci_update_irq_disabled(d, was_irq_disabled);
memory_region_set_enabled(&d->bus_master_enable_region, memory_region_set_enabled(&d->bus_master_enable_region,
(pci_get_word(d->config + PCI_COMMAND) (pci_get_word(d->config + PCI_COMMAND)
& PCI_COMMAND_MASTER) && d->enabled); & PCI_COMMAND_MASTER) && d->has_power);
} }
msi_write_config(d, addr, val_in, l); msi_write_config(d, addr, val_in, l);
@ -2884,18 +2884,18 @@ MSIMessage pci_get_msi_message(PCIDevice *dev, int vector)
return msg; return msg;
} }
void pci_set_enabled(PCIDevice *d, bool state) void pci_set_power(PCIDevice *d, bool state)
{ {
if (d->enabled == state) { if (d->has_power == state) {
return; return;
} }
d->enabled = state; d->has_power = state;
pci_update_mappings(d); pci_update_mappings(d);
memory_region_set_enabled(&d->bus_master_enable_region, memory_region_set_enabled(&d->bus_master_enable_region,
(pci_get_word(d->config + PCI_COMMAND) (pci_get_word(d->config + PCI_COMMAND)
& PCI_COMMAND_MASTER) && d->enabled); & PCI_COMMAND_MASTER) && d->has_power);
if (!d->enabled) { if (!d->has_power) {
pci_device_reset(d); pci_device_reset(d);
} }
} }

4
hw/pci/pci_host.c
View File

@ -86,7 +86,7 @@ void pci_host_config_write_common(PCIDevice *pci_dev, uint32_t addr,
* allowing direct removal of unexposed functions. * allowing direct removal of unexposed functions.
*/ */
if ((pci_dev->qdev.hotplugged && !pci_get_function_0(pci_dev)) || if ((pci_dev->qdev.hotplugged && !pci_get_function_0(pci_dev)) ||
!pci_dev->enabled || is_pci_dev_ejected(pci_dev)) { !pci_dev->has_power || is_pci_dev_ejected(pci_dev)) {
return; return;
} }
@ -111,7 +111,7 @@ uint32_t pci_host_config_read_common(PCIDevice *pci_dev, uint32_t addr,
* allowing direct removal of unexposed functions. * allowing direct removal of unexposed functions.
*/ */
if ((pci_dev->qdev.hotplugged && !pci_get_function_0(pci_dev)) || if ((pci_dev->qdev.hotplugged && !pci_get_function_0(pci_dev)) ||
!pci_dev->enabled || is_pci_dev_ejected(pci_dev)) { !pci_dev->has_power || is_pci_dev_ejected(pci_dev)) {
return ~0x0; return ~0x0;
} }

7
include/hw/pci/pci.h
View File

@ -678,11 +678,6 @@ static inline void pci_irq_pulse(PCIDevice *pci_dev)
} }
MSIMessage pci_get_msi_message(PCIDevice *dev, int vector); MSIMessage pci_get_msi_message(PCIDevice *dev, int vector);
void pci_set_enabled(PCIDevice *pci_dev, bool state); void pci_set_power(PCIDevice *pci_dev, bool state);
static inline void pci_set_power(PCIDevice *pci_dev, bool state)
{
pci_set_enabled(pci_dev, state);
}
#endif #endif

2
include/hw/pci/pci_device.h
View File

@ -57,7 +57,7 @@ typedef struct PCIReqIDCache PCIReqIDCache;
struct PCIDevice { struct PCIDevice {
DeviceState qdev; DeviceState qdev;
bool partially_hotplugged; bool partially_hotplugged;
bool enabled; bool has_power;
/* PCI config space */ /* PCI config space */
uint8_t *config; uint8_t *config;