From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=35770 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1P7iy1-0002zW-J7
	for qemu-devel@nongnu.org; Mon, 18 Oct 2010 02:13:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1P7iy0-0004AN-FN
	for qemu-devel@nongnu.org; Mon, 18 Oct 2010 02:13:05 -0400
Received: from mx1.redhat.com ([209.132.183.28]:9658)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1P7iy0-0004AI-94
	for qemu-devel@nongnu.org; Mon, 18 Oct 2010 02:13:04 -0400
Date: Mon, 18 Oct 2010 08:06:19 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20101018060619.GF18366@redhat.com>
References: <cover.1287371107.git.yamahata@valinux.co.jp>
	<6f03a6a490832315541f4d60e7408e3a9b344290.1287371107.git.yamahata@valinux.co.jp>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <6f03a6a490832315541f4d60e7408e3a9b344290.1287371107.git.yamahata@valinux.co.jp>
Subject: [Qemu-devel] Re: [PATCH v4 01/15] pci: make pci_del_capability()
 update for w1cmask
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: skandasa@cisco.com, adnan@khaleel.us, etmartin@cisco.com, qemu-devel@nongnu.org, wexu2@cisco.com

On Mon, Oct 18, 2010 at 12:17:42PM +0900, Isaku Yamahata wrote:
> When deleting pci capability, w1cmask should be 0
> to make those registers writablein addition to wmask.
> 
> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

Applied (typo in commit message fixed).

> ---
>  hw/pci.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/hw/pci.c b/hw/pci.c
> index abddc6d..e3462a9 100644
> --- a/hw/pci.c
> +++ b/hw/pci.c
> @@ -1745,6 +1745,7 @@ void pci_del_capability(PCIDevice *pdev, uint8_t cap_id, uint8_t size)
>      pdev->config[prev] = pdev->config[offset + PCI_CAP_LIST_NEXT];
>      /* Make capability writeable again */
>      memset(pdev->wmask + offset, 0xff, size);
> +    memset(pdev->w1cmask + offset, 0, size);
>      /* Clear cmask as device-specific registers can't be checked */
>      memset(pdev->cmask + offset, 0, size);
>      memset(pdev->used + offset, 0, size);
> -- 
> 1.7.1.1