diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2010-10-19 18:06:30 +0900 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2010-10-19 13:57:33 +0200 |
| commit | 99443c21b06aa433d74880f9d2a0e4320631b906 (patch) | |
| tree | a15b183fe6020027123a978021d56871cfabfddf /hw/pci.c | |
| parent | a5d1fd20ccfd1fbe840729378e4adbc3eb0f8306 (diff) | |
| download | focaccia-qemu-99443c21b06aa433d74880f9d2a0e4320631b906.tar.gz focaccia-qemu-99443c21b06aa433d74880f9d2a0e4320631b906.zip | |
pci: use pci_word_test_and_clear_mask() in pci_device_reset()
use pci_clear_bit_word() in pci_device_reset() where appropriate. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/pci.c')
| -rw-r--r-- | hw/pci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/pci.c b/hw/pci.c index 300079f4af..409e2c079b 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -139,9 +139,8 @@ static void pci_device_reset(PCIDevice *dev) dev->irq_state = 0; pci_update_irq_status(dev); /* Clear all writeable bits */ - pci_set_word(dev->config + PCI_COMMAND, - pci_get_word(dev->config + PCI_COMMAND) & - ~pci_get_word(dev->wmask + PCI_COMMAND)); + pci_word_test_and_clear_mask(dev->config + PCI_COMMAND, + pci_get_word(dev->wmask + PCI_COMMAND)); dev->config[PCI_CACHE_LINE_SIZE] = 0x0; dev->config[PCI_INTERRUPT_LINE] = 0x0; for (r = 0; r < PCI_NUM_REGIONS; ++r) { |