From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mark McLoughlin <markmc@redhat.com>
Subject: Re: [PATCH] KVM : Qemu: update call pci_nic_init
Date: Thu, 15 Jan 2009 08:31:20 +0000
Message-ID: <1232008280.5205.11.camel@localhost.localdomain>
References: <10C63FAD690C13458F0B32BCED571F1403D74F21@pdsmsx502.ccr.corp.intel.com>
Reply-To: Mark McLoughlin <markmc@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Cc: "kvm-ia64@vger.kernel.org" <kvm-ia64@vger.kernel.org>,
	"kvm@vger.kernel.org" <kvm@vger.kernel.org>,
	Avi Kivity <avi@redhat.com>,
	"Zhang, Xiantao" <xiantao.zhang@intel.com>
To: "Zhang, Yang" <yang.zhang@intel.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx2.redhat.com ([66.187.237.31]:34544 "EHLO mx2.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754646AbZAOIbZ (ORCPT <rfc822;kvm@vger.kernel.org>);
	Thu, 15 Jan 2009 03:31:25 -0500
In-Reply-To: <10C63FAD690C13458F0B32BCED571F1403D74F21@pdsmsx502.ccr.corp.intel.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

Hi,

On Thu, 2009-01-15 at 15:36 +0800, Zhang, Yang wrote:
> Hi
> As the definition pci_nic_init has modified, this patch update the
> corresponding calling in ipf_init1().

Yep, qemu/hw/ipf.c isn't upstream so it didn't get updated when the
function was changed.

Is there a plan to merge ia64 stuff into upstream QEMU?

> >From 53a66f524a6c2215d61da797cca4b7b1acbb1266 Mon Sep 17 00:00:00 2001
> From: Yang <yang.zhang@intel.com>
> Date: Thu, 15 Jan 2009 13:09:43 +0800
> Subject: [PATCH] KVM : Qemu: update call pci_nic_init
> 
> update call pci_nic_init in ipf_init1
> 
> Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
> Signed-off-by: Yang Zhang <yang.zhang@intel.com>

Acked-by: Mark McLoughlin <markmc@redhat.com>

Cheers,
Mark.