From patchwork Fri Nov 9 14:56:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 198125 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 031B82C030E for ; Sat, 10 Nov 2012 03:26:16 +1100 (EST) Received: from localhost ([::1]:36336 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TWq14-0000uR-ID for incoming@patchwork.ozlabs.org; Fri, 09 Nov 2012 09:57:06 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55911) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TWq04-00075h-Pa for qemu-devel@nongnu.org; Fri, 09 Nov 2012 09:56:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TWpzu-0005Wd-3f for qemu-devel@nongnu.org; Fri, 09 Nov 2012 09:56:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:16361) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TWpzt-0005Vg-QQ for qemu-devel@nongnu.org; Fri, 09 Nov 2012 09:55:54 -0500 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 qA9EthJ7010572 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 9 Nov 2012 09:55:43 -0500 Received: from blackpad.lan.raisama.net (vpn1-4-237.gru2.redhat.com [10.97.4.237]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qA9EtfSw018616; Fri, 9 Nov 2012 09:55:43 -0500 Received: by blackpad.lan.raisama.net (Postfix, from userid 500) id D62AF20342C; Fri, 9 Nov 2012 12:56:56 -0200 (BRST) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 9 Nov 2012 12:56:51 -0200 Message-Id: <1352473012-20500-24-git-send-email-ehabkost@redhat.com> In-Reply-To: <1352473012-20500-1-git-send-email-ehabkost@redhat.com> References: <1352473012-20500-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, riku.voipio@iki.fi, blauwirbel@gmail.com, Anthony Liguori , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH 23/24] include qdev code into *-user, too X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The code depends on some functions from qemu-option.o, so add qemu-option.o to universal-obj-y to make sure it's included. Signed-off-by: Eduardo Habkost --- Changes v1 -> v2: - Keep files on the hw/ directory (it's simply easier to keep them there, as qdev.o depends on irq.o) - Add a $(hw-core-obj-y) variable to Makefile.objs for the qdev core code - Add irq.o to the list of core qdev files (as now the gpio code is being kept inside qdev.c) --- Makefile.objs | 8 ++++++++ hw/Makefile.objs | 8 ++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 593a592..be3c8ef 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -18,6 +18,13 @@ qom-obj-y = qom/ universal-obj-y += $(qom-obj-y) ####################################################################### +# Core hw code (qdev core) +hw-core-obj-y += hw/ +hw-core-obj-y += qemu-option.o + +universal-obj-y += $(hw-core-obj-y) + +####################################################################### # oslib-obj-y is code depending on the OS (win32 vs posix) oslib-obj-y = osdep.o cutils.o qemu-timer-common.o oslib-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o @@ -244,5 +251,6 @@ nested-vars += \ block-obj-y \ user-obj-y \ common-obj-y \ + hw-core-obj-y \ extra-obj-y dummy := $(call unnest-vars) diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 4833b90..2c931e9 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -1,3 +1,8 @@ +# core qdev-related obj files, also used by *-user: +hw-core-obj-y += qdev.o qdev-properties.o +# irq.o needed for qdev GPIO handling: +hw-core-obj-y += irq.o + common-obj-y = usb/ ide/ common-obj-y += loader.o common-obj-$(CONFIG_VIRTIO) += virtio-console.o @@ -155,7 +160,6 @@ common-obj-$(CONFIG_SOUND) += $(sound-obj-y) common-obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/ common-obj-y += usb/ -common-obj-y += irq.o common-obj-$(CONFIG_PTIMER) += ptimer.o common-obj-$(CONFIG_MAX7310) += max7310.o common-obj-$(CONFIG_WM8750) += wm8750.o @@ -181,7 +185,7 @@ common-obj-$(CONFIG_SD) += sd.o common-obj-y += bt.o bt-l2cap.o bt-sdp.o bt-hci.o bt-hid.o common-obj-y += bt-hci-csr.o common-obj-y += msmouse.o ps2.o -common-obj-y += qdev.o qdev-properties.o qdev-monitor.o +common-obj-y += qdev-monitor.o common-obj-y += qdev-properties-system.o common-obj-$(CONFIG_BRLAPI) += baum.o