From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=52914 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OOSGH-0007iK-KH
	for qemu-devel@nongnu.org; Tue, 15 Jun 2010 05:16:50 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <mst@redhat.com>) id 1OOSGB-0002wy-MZ
	for qemu-devel@nongnu.org; Tue, 15 Jun 2010 05:16:49 -0400
Received: from mx1.redhat.com ([209.132.183.28]:63910)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <mst@redhat.com>) id 1OOSGB-0002wl-FE
	for qemu-devel@nongnu.org; Tue, 15 Jun 2010 05:16:43 -0400
Date: Tue, 15 Jun 2010 12:12:07 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20100615091207.GA1365@redhat.com>
References: <cover.1276573899.git.yamahata@valinux.co.jp>
	<ca619226f7c9d07f434d59df49b0a708d94e2071.1276573899.git.yamahata@valinux.co.jp>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ca619226f7c9d07f434d59df49b0a708d94e2071.1276573899.git.yamahata@valinux.co.jp>
Subject: [Qemu-devel] Re: [PATCH 2/2] pci: don't overwrite pci header type.
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: blauwirbel@gmail.com, qemu-devel@nongnu.org

On Tue, Jun 15, 2010 at 02:06:46PM +0900, Isaku Yamahata wrote:
> Don't overwrite pci header type.
> Otherwise, multi function bit which pci_init_header_type() sets
> appropriately is lost.
> Anyway PCI_HEADER_TYPE_NORMAL is zero, so it is unnecessary to zero
> which is already zero cleared.
> 
> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

...

> diff --git a/hw/apb_pci.c b/hw/apb_pci.c
> index 31c8d70..cdf3bc2 100644
> --- a/hw/apb_pci.c
> +++ b/hw/apb_pci.c
> @@ -428,7 +428,8 @@ static int pbm_pci_host_init(PCIDevice *d)
>                   PCI_STATUS_DEVSEL_MEDIUM);
>      pci_config_set_class(d->config, PCI_CLASS_BRIDGE_HOST);
>      pci_set_byte(d->config + PCI_HEADER_TYPE,
> -                 PCI_HEADER_TYPE_NORMAL);
> +                 (pci_get_byte(d->config + PCI_HEADER_TYPE) &
> +                  PCI_HEADER_TYPE_MULTI_FUNCTION) | PCI_HEADER_TYPE_NORMAL);

what is this doing?

-- 
MST