From patchwork Wed Mar 23 17:38:11 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Alex Williamson <alex.williamson@redhat.com>
X-Patchwork-Id: 656501
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2NHdWYs017077
	for <patchwork-kvm@patchwork.kernel.org>;
	Wed, 23 Mar 2011 17:39:51 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755174Ab1CWRi1 (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Wed, 23 Mar 2011 13:38:27 -0400
Received: from mx1.redhat.com ([209.132.183.28]:17381 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755045Ab1CWRi0 (ORCPT <rfc822;kvm@vger.kernel.org>);
	Wed, 23 Mar 2011 13:38:26 -0400
Received: from int-mx02.intmail.prod.int.phx2.redhat.com
	(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p2NHcCnf023047
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Wed, 23 Mar 2011 13:38:12 -0400
Received: from s20.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1])
	by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id p2NHcBpq001731; Wed, 23 Mar 2011 13:38:12 -0400
From: Alex Williamson <alex.williamson@redhat.com>
Subject: [stable,
	master] [PATCH] qemu-kvm: Don't break device assignment INTx
To: kvm@vger.kernel.org
Cc: alex.williamson@redhat.com, jan.kiszka@siemens.com,
	franxisco1988@gmail.com, extmaillist@linuxbox.cz, yongjie.ren@intel.com
Date: Wed, 23 Mar 2011 11:38:11 -0600
Message-ID: <20110323173440.19806.63813.stgit@s20.home>
User-Agent: StGIT/0.14.3
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Wed, 23 Mar 2011 17:40:02 +0000 (UTC)


diff --git a/Makefile.objs b/Makefile.objs
index d1a2264..6080db0 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -172,7 +172,7 @@ hw-obj-y =
 hw-obj-y += loader.o
 hw-obj-$(CONFIG_VIRTIO) += virtio.o virtio-console.o
 hw-obj-y += fw_cfg.o
-hw-obj-$(CONFIG_PCI) += pci.o pci_bridge.o
+hw-obj-$(CONFIG_PCI) += pci_bridge.o
 hw-obj-$(CONFIG_PCI) += msix.o msi.o
 hw-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o
 hw-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o
diff --git a/Makefile.target b/Makefile.target
index fdbdc6c..95597e7 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -199,6 +199,7 @@ obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o vl.o balloon.o
 # virtio has to be here due to weird dependency between PCI and virtio-net.
 # need to fix this properly
 obj-$(CONFIG_NO_PCI) += pci-stub.o
+obj-$(CONFIG_PCI) += pci.o
 obj-$(CONFIG_VIRTIO) += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o
 obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
 obj-y += vhost_net.o
diff --git a/hw/pci.c b/hw/pci.c
index 730df5f..51bf98d 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -29,8 +29,8 @@
 #include "net.h"
 #include "sysemu.h"
 #include "loader.h"
+#include "qemu-kvm.h"
 #include "hw/pc.h"
-#include "kvm.h"
 #include "device-assignment.h"
 #include "qemu-objects.h"
 #include "range.h"