From patchwork Thu Mar 24 22:04:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 660601 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 p2OM58YD026547 for ; Thu, 24 Mar 2011 22:05:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757286Ab1CXWFC (ORCPT ); Thu, 24 Mar 2011 18:05:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40045 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757014Ab1CXWFB (ORCPT ); Thu, 24 Mar 2011 18:05:01 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p2OM4eVI014777 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 24 Mar 2011 18:04:40 -0400 Received: from s20.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p2OM4c2I000624; Thu, 24 Mar 2011 18:04:39 -0400 From: Alex Williamson Subject: [stable, master][PATCH v2] 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: Thu, 24 Mar 2011 16:04:38 -0600 Message-ID: <20110324220339.3147.86039.stgit@s20.home> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: 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]); Thu, 24 Mar 2011 22:05:08 +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