From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mark McLoughlin <markmc@redhat.com>
Subject: Re: [PATCH 5/6] device assignment: support for assigning PCI
	devices to guests
Date: Wed, 29 Oct 2008 12:27:19 +0000
Message-ID: <1225283239.7615.7.camel@blaa>
References: <1225282801-3648-1-git-send-email-muli@il.ibm.com>
	 <1225282801-3648-2-git-send-email-muli@il.ibm.com>
	 <1225282801-3648-3-git-send-email-muli@il.ibm.com>
	 <1225282801-3648-4-git-send-email-muli@il.ibm.com>
	 <1225282801-3648-5-git-send-email-muli@il.ibm.com>
	 <1225282801-3648-6-git-send-email-muli@il.ibm.com>
Reply-To: Mark McLoughlin <markmc@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Cc: avi@redhat.com, kvm@vger.kernel.org, anthony@codemonkey.ws,
	weidong.han@intel.com, benami@il.ibm.com, amit.shah@redhat.com,
	allen.m.kay@intel.com
To: muli@il.ibm.com
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx2.redhat.com ([66.187.237.31]:60016 "EHLO mx2.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752928AbYJ2Mas (ORCPT <rfc822;kvm@vger.kernel.org>);
	Wed, 29 Oct 2008 08:30:48 -0400
In-Reply-To: <1225282801-3648-6-git-send-email-muli@il.ibm.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

On Wed, 2008-10-29 at 14:20 +0200, muli@il.ibm.com wrote:
> diff --git a/qemu/hw/piix_pci.c b/qemu/hw/piix_pci.c
> index b9067b8..27d5f02 100644
> --- a/qemu/hw/piix_pci.c
> +++ b/qemu/hw/piix_pci.c
> @@ -246,9 +246,9 @@ static void piix3_set_irq(qemu_irq *pic, int
> irq_num, int level)
>  int piix_get_irq(int pin)
>  {
>      if (piix3_dev)
> -        return piix3_dev->config[PIIX_CONFIG_IRQ_ROUTE + pin];
> +        return piix3_dev->config[0x60+pin];
>      if (piix4_dev)
> -        return piix4_dev->config[PIIX_CONFIG_IRQ_ROUTE + pin];
> +        return piix4_dev->config[0x60+pin];
>  
>      return 0;
>  }

Another rebase mixup?

Cheers,
Mark.