OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

pci: use range helper functions.

Browse Source 
clean up pci_default_write_config() by the range helper functions.

Suggested by Michael S. Tsirkin <mst@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Isaku Yamahata 2009-10-30 21:21:20 +09:00 committed by Anthony Liguori
parent f49db805a9
commit 260c0cd3d9
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/pci.c
View File

@ -699,19 +699,15 @@ uint32_t pci_default_read_config(PCIDevice *d,
void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l) void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l)
{ {
uint8_t orig[PCI_CONFIG_SPACE_SIZE];
int i; int i;
uint32_t config_size = pci_config_size(d); uint32_t config_size = pci_config_size(d);
/* not efficient, but simple */
memcpy(orig, d->config, PCI_CONFIG_SPACE_SIZE);
for(i = 0; i < l && addr < config_size; val >>= 8, ++i, ++addr) { for(i = 0; i < l && addr < config_size; val >>= 8, ++i, ++addr) {
uint8_t wmask = d->wmask[addr]; uint8_t wmask = d->wmask[addr];
d->config[addr] = (d->config[addr] & ~wmask) | (val & wmask); d->config[addr] = (d->config[addr] & ~wmask) | (val & wmask);
} }
if (memcmp(orig + PCI_BASE_ADDRESS_0, d->config + PCI_BASE_ADDRESS_0, 24) if (ranges_overlap(addr, l, PCI_BASE_ADDRESS_0, 24) ||
|| ((orig[PCI_COMMAND] ^ d->config[PCI_COMMAND]) range_covers_byte(addr, l, PCI_COMMAND))
& (PCI_COMMAND_MEMORY | PCI_COMMAND_IO)))
pci_update_mappings(d); pci_update_mappings(d);
} }