From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=46525 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Pi4CY-0000kC-TK
	for qemu-devel@nongnu.org; Wed, 26 Jan 2011 07:10:20 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1Pi4CX-0000rK-DF
	for qemu-devel@nongnu.org; Wed, 26 Jan 2011 07:10:18 -0500
Received: from mx1.redhat.com ([209.132.183.28]:27666)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1Pi4CX-0000rA-6S
	for qemu-devel@nongnu.org; Wed, 26 Jan 2011 07:10:17 -0500
Date: Wed, 26 Jan 2011 14:09:59 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20110126120959.GB11913@redhat.com>
References: <426869a882ff2ab059e7c49e87862658cc29d62c.1296035044.git.yamahata@valinux.co.jp>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <426869a882ff2ab059e7c49e87862658cc29d62c.1296035044.git.yamahata@valinux.co.jp>
Subject: [Qemu-devel] Re: [PATCH] pci: w1cmask[PCI_BRIDGE_CONTROL]
	initialized incorrectly
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Isaku Yamahata <yamahata@valinux.co.jp>
Cc: qemu-devel@nongnu.org

On Wed, Jan 26, 2011 at 06:45:27PM +0900, Isaku Yamahata wrote:
> pci_init_wmask_bridge() incorrectly set w1cmask[PCI_BRIDGE_CONTROL].
> This patch removes the line otherwise the assert(!(wmask & w1cmask)) in
> pci_default_write_config() is hit.
> 
> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

Maybe clear in wmask? This bit really should be w1c, should it not?

> ---
>  hw/pci.c |    4 ----
>  1 files changed, 0 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/pci.c b/hw/pci.c
> index b8f5385..79a46e7 100644
> --- a/hw/pci.c
> +++ b/hw/pci.c
> @@ -643,10 +643,6 @@ static void pci_init_wmask_bridge(PCIDevice *d)
>                   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. */
> -    pci_set_word(d->w1cmask + PCI_BRIDGE_CONTROL,
> -                 PCI_BRIDGE_CTL_DISCARD_STATUS);
>  }
>  
>  static int pci_init_multifunction(PCIBus *bus, PCIDevice *dev)
> -- 
> 1.7.1.1