]> git.proxmox.com Git - qemu.git/commitdiff
pci: bridge control fixup
authorMichael S. Tsirkin <mst@redhat.com>
Wed, 26 Jan 2011 13:55:07 +0000 (15:55 +0200)
committerMichael S. Tsirkin <mst@redhat.com>
Thu, 27 Jan 2011 04:54:45 +0000 (06:54 +0200)
PCI_BRIDGE_CTL_DISCARD_STATUS (bit 10 in bridge control register)
is W1C so we should not make it writeable, otherwise the assert(!(wmask
& w1cmask)) in pci_default_write_config() is hit

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reported-by: Isaku Yamahata <yamahata@valinux.co.jp>
Tested-by: Isaku Yamahata <yamahata@valinux.co.jp>
hw/pci.c

index 044c4bde45b776f12bc7298e404e4c1d88f02146..712280aeb948b20f68e30cb44d807a697562dd1d 100644 (file)
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -641,7 +641,6 @@ static void pci_init_wmask_bridge(PCIDevice *d)
                  PCI_BRIDGE_CTL_FAST_BACK |
                  PCI_BRIDGE_CTL_DISCARD |
                  PCI_BRIDGE_CTL_SEC_DISCARD |
-                 PCI_BRIDGE_CTL_DISCARD_STATUS |
                  PCI_BRIDGE_CTL_DISCARD_SERR);
     /* Below does not do anything as we never set this bit, put here for
      * completeness. */