From: Michael S. Tsirkin <mst@redhat.com>
Date: Sun, 12 Feb 2012 19:02:01 +0000 (+0200)
Subject: pci_bridge: fix status: do not override cap bit
X-Git-Tag: v1.1-rc0~124^2~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95be1196030c003a65052fc7b8a3394fdac690a8;p=thirdparty%2Fqemu.git

pci_bridge: fix status: do not override cap bit
---

diff --git a/hw/pci_bridge.c b/hw/pci_bridge.c
index 1ed43394de2..fea3873943d 100644
--- a/hw/pci_bridge.c
+++ b/hw/pci_bridge.c
@@ -305,8 +305,8 @@ int pci_bridge_initfn(PCIDevice *dev)
     PCIBridge *br = DO_UPCAST(PCIBridge, dev, dev);
     PCIBus *sec_bus = &br->sec_bus;
 
-    pci_set_word(dev->config + PCI_STATUS,
-                 PCI_STATUS_66MHZ | PCI_STATUS_FAST_BACK);
+    pci_word_test_and_set_mask(dev->config + PCI_STATUS,
+                               PCI_STATUS_66MHZ | PCI_STATUS_FAST_BACK);
     pci_config_set_class(dev->config, PCI_CLASS_BRIDGE_PCI);
     dev->config[PCI_HEADER_TYPE] =
         (dev->config[PCI_HEADER_TYPE] & PCI_HEADER_TYPE_MULTI_FUNCTION) |