From patchwork Wed Feb 23 08:28:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 583691 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 p1N8TKe9028363 for ; Wed, 23 Feb 2011 08:29:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754956Ab1BWI3R (ORCPT ); Wed, 23 Feb 2011 03:29:17 -0500 Received: from goliath.siemens.de ([192.35.17.28]:25931 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754783Ab1BWI3R (ORCPT ); Wed, 23 Feb 2011 03:29:17 -0500 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id p1N8SrAK006949; Wed, 23 Feb 2011 09:28:54 +0100 Received: from mchn199C.mchp.siemens.de ([146.254.217.103]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p1N8SrKR005063; Wed, 23 Feb 2011 09:28:53 +0100 Message-ID: <4D64C545.3020205@siemens.com> Date: Wed, 23 Feb 2011 09:28:53 +0100 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: klondike CC: Nikola Ciprich , kvm@vger.kernel.org, Avi Kivity , Marcelo Tosatti Subject: [PATCH] qemu-kvm: Fix non-PCI target build References: <4D63EF01.5040203@redhat.com> <20110223074948.GA7608@pcnci.linuxbox.cz> <4D64BFD1.2020602@gmail.com> In-Reply-To: <4D64BFD1.2020602@gmail.com> 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]); Wed, 23 Feb 2011 08:29:20 +0000 (UTC) diff --git a/Makefile.objs b/Makefile.objs index f5702eb..3ec7121 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -170,7 +170,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_bridge.o +hw-obj-$(CONFIG_PCI) += pci.o 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 6e9a024..23367eb 100644 --- a/Makefile.target +++ b/Makefile.target @@ -195,7 +195,7 @@ endif #CONFIG_BSD_USER # System emulator target ifdef CONFIG_SOFTMMU -obj-y = arch_init.o cpus.o monitor.o pci.o machine.o gdbstub.o vl.o balloon.o +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 diff --git a/hw/pci.c b/hw/pci.c index 0c44939..1f6cebe 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"