From: Michael Roth <mdroth@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: blauwirbel@gmail.com, stefanha@gmail.com, xscript@gmx.net
Subject: [Qemu-devel] [PATCH] Add CONFIG_QEMU_TIMER to handle qemu-timer-common.o dep
Date: Mon, 29 Aug 2011 14:27:48 -0500 [thread overview]
Message-ID: <1314646068-31438-1-git-send-email-mdroth@linux.vnet.ibm.com> (raw)
In-Reply-To: <4E5BE7AF.5020906@linux.vnet.ibm.com>
This conditionally sets CONFIG_QEMU_TIMER in configure when something
like --enable-trace-backend=simple is set which requires
qemu-timer-common.o. Object groups dependent on such code can then
simply do:
x-obj-$(CONFIG_QEMU_TIMER) += qemu-timer-common.o
This also fixes build issue with qemu-ga due due not linking in
qemu-timer-common.o when using --enable-trace-backend=simple
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
Makefile.objs | 3 ++-
configure | 5 +++++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs
index d1f3e5d..0048650 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -177,6 +177,7 @@ user-obj-y =
user-obj-y += envlist.o path.o
user-obj-y += tcg-runtime.o host-utils.o
user-obj-y += cutils.o cache-utils.o
+user-obj-$(CONFIG_QEMU_TIMER) += qemu-timer-common.o
######################################################################
# libhw
@@ -380,7 +381,6 @@ else
trace-obj-y = trace.o
ifeq ($(TRACE_BACKEND),simple)
trace-obj-y += simpletrace.o
-user-obj-y += qemu-timer-common.o
endif
endif
@@ -404,6 +404,7 @@ qga-obj-y = $(addprefix qga/, $(qga-nested-y))
qga-obj-y += qemu-ga.o qemu-tool.o qemu-error.o qemu-sockets.o module.o qemu-option.o cutils.o osdep.o
qga-obj-$(CONFIG_WIN32) += oslib-win32.o
qga-obj-$(CONFIG_POSIX) += oslib-posix.o
+qga-obj-$(CONFIG_QEMU_TIMER) += qemu-timer-common.o
vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
diff --git a/configure b/configure
index 1340c33..64da275 100755
--- a/configure
+++ b/configure
@@ -183,6 +183,7 @@ usb_redir=""
opengl=""
zlib="yes"
guest_agent="yes"
+qemu_timer="no"
# parse CC options first
for opt do
@@ -3071,6 +3072,7 @@ fi
# Set the appropriate trace file.
if test "$trace_backend" = "simple"; then
trace_file="\"$trace_file-\" FMT_pid"
+ qemu_timer="yes"
fi
if test "$trace_backend" = "dtrace" -a "$trace_backend_stap" = "yes" ; then
echo "CONFIG_SYSTEMTAP_TRACE=y" >> $config_host_mak
@@ -3109,6 +3111,9 @@ echo "LIBS+=$LIBS" >> $config_host_mak
echo "LIBS_TOOLS+=$libs_tools" >> $config_host_mak
echo "EXESUF=$EXESUF" >> $config_host_mak
echo "LIBS_QGA+=$libs_qga" >> $config_host_mak
+if test "$qemu_timer" = "yes" ; then
+ echo "CONFIG_QEMU_TIMER=y" >>$config_host_mak
+fi
# generate list of library paths for linker script
--
1.7.0.4
next prev parent reply other threads:[~2011-08-29 19:28 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-26 18:45 [Qemu-devel] [PATCH 1/2] Fix guest agent build with simpletrace Blue Swirl
2011-08-26 19:12 ` Lluís
2011-08-27 16:46 ` Blue Swirl
2011-08-27 17:56 ` Lluís
2011-08-28 7:24 ` Blue Swirl
2011-08-28 18:13 ` Lluís
2011-08-28 21:08 ` Blue Swirl
2011-08-29 12:28 ` Stefan Hajnoczi
2011-08-29 19:25 ` Michael Roth
2011-08-29 19:27 ` Michael Roth [this message]
2011-08-30 9:22 ` [Qemu-devel] [PATCH] Add CONFIG_QEMU_TIMER to handle qemu-timer-common.o dep Stefan Hajnoczi
2011-08-30 12:02 ` Lluís
2011-08-30 15:20 ` Michael Roth
2011-08-30 18:32 ` Lluís
2011-08-30 19:40 ` Lluís
2011-08-30 14:17 ` Anthony Liguori
2011-08-30 19:37 ` Blue Swirl
2011-08-29 12:47 ` [Qemu-devel] [PATCH 1/2] Fix guest agent build with simpletrace Lluís
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1314646068-31438-1-git-send-email-mdroth@linux.vnet.ibm.com \
--to=mdroth@linux.vnet.ibm.com \
--cc=blauwirbel@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@gmail.com \
--cc=xscript@gmx.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).