From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47100) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQrDu-0003a6-Bg for qemu-devel@nongnu.org; Tue, 23 Oct 2012 23:01:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TQrDq-0006IV-BZ for qemu-devel@nongnu.org; Tue, 23 Oct 2012 23:01:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14828) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQrDq-0006HE-1w for qemu-devel@nongnu.org; Tue, 23 Oct 2012 23:01:34 -0400 From: Eduardo Habkost Date: Wed, 24 Oct 2012 01:02:07 -0200 Message-Id: <1351047728-20360-24-git-send-email-ehabkost@redhat.com> In-Reply-To: <1351047728-20360-1-git-send-email-ehabkost@redhat.com> References: <1351047728-20360-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 23/24] include qdev code into *-user, too List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, riku.voipio@iki.fi, blauwirbel@gmail.com, Anthony Liguori , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= 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 74b3542..22dcd94 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 oslib-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o @@ -244,5 +251,6 @@ nested-vars += \ qapi-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 -- 1.7.11.7