From patchwork Thu Jul 5 13:35:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 1160751 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id A8344DFB7C for ; Thu, 5 Jul 2012 13:34:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933016Ab2GENej (ORCPT ); Thu, 5 Jul 2012 09:34:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18074 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754552Ab2GENei (ORCPT ); Thu, 5 Jul 2012 09:34:38 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q65DYcLv005621 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 5 Jul 2012 09:34:38 -0400 Received: from shalem.localdomain.com (vpn1-4-86.ams2.redhat.com [10.36.4.86]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q65DYbIZ015343; Thu, 5 Jul 2012 09:34:37 -0400 From: Hans de Goede To: kvm@vger.kernel.org Cc: Hans de Goede Subject: [PATCH] buildsys: Move msi[x] and virtio-pci from Makefile.objs to Makefile.target Date: Thu, 5 Jul 2012 15:35:12 +0200 Message-Id: <1341495312-1263-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Building non-kvm versions of qemu from qemu-kvm.git results in a linker error with undefined references to kvm_kernel_irqchip, expanded from the kvm_irqchip_in_kernel macro in kvm.h: This patch fixes this. Note maybe a better fix would be to drop the test for !defined NEED_CPU_H in the above macro ? Signed-off-by: Hans de Goede --- Makefile.objs | 2 -- Makefile.target | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 264f1fe..8d49738 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -211,10 +211,8 @@ hw-obj-y = hw-obj-y += vl.o loader.o hw-obj-$(CONFIG_VIRTIO) += virtio-console.o hw-obj-y += usb/libhw.o -hw-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o hw-obj-y += fw_cfg.o hw-obj-$(CONFIG_PCI) += pci_bridge.o pci_bridge_dev.o -hw-obj-$(CONFIG_PCI) += msix.o msi.o hw-obj-$(CONFIG_PCI) += shpc.o hw-obj-$(CONFIG_PCI) += slotid_cap.o hw-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o diff --git a/Makefile.target b/Makefile.target index eda8637..ede8ed3 100644 --- a/Makefile.target +++ b/Makefile.target @@ -183,9 +183,10 @@ obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o ioport.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_PCI) += pci.o msi.o msix.o obj-$(CONFIG_VIRTIO) += virtio.o virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o obj-$(CONFIG_VIRTIO) += virtio-scsi.o +obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o obj-y += vhost_net.o obj-$(CONFIG_VHOST_NET) += vhost.o obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p-device.o