From: Michael S. Tsirkin Date: Wed, 26 Jan 2011 13:55:07 +0000 (+0200) Subject: pci: bridge control fixup X-Git-Tag: v0.14.0-rc0~22^2~1 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=bb34007e86aa2a7902ee60e0f6fa2f0e4cccbffe;p=thirdparty%2Fqemu.git pci: bridge control fixup 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 Reported-by: Isaku Yamahata Tested-by: Isaku Yamahata --- diff --git a/hw/pci.c b/hw/pci.c index 044c4bde45b..712280aeb94 100644 --- 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. */