From patchwork Mon Aug 29 17:46:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 112120 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3FE8AB6F8A for ; Tue, 30 Aug 2011 03:47:00 +1000 (EST) Received: from localhost ([::1]:47237 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qy5vF-0008Oq-1w for incoming@patchwork.ozlabs.org; Mon, 29 Aug 2011 13:46:57 -0400 Received: from eggs.gnu.org ([140.186.70.92]:34547) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qy5v8-0008Ol-PT for qemu-devel@nongnu.org; Mon, 29 Aug 2011 13:46:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qy5v7-0003gD-HP for qemu-devel@nongnu.org; Mon, 29 Aug 2011 13:46:50 -0400 Received: from v220110690675601.yourvserver.net ([78.47.199.172]:60849) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qy5v7-0003bd-CN for qemu-devel@nongnu.org; Mon, 29 Aug 2011 13:46:49 -0400 Received: from localhost (v220110690675601.yourvserver.net.local [127.0.0.1]) by v220110690675601.yourvserver.net (Postfix) with ESMTP id 124207283050; Mon, 29 Aug 2011 19:46:47 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at weilnetz.de Received: from v220110690675601.yourvserver.net ([127.0.0.1]) by localhost (v220110690675601.yourvserver.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z2oWeA-u6dWB; Mon, 29 Aug 2011 19:46:46 +0200 (CEST) Received: by v220110690675601.yourvserver.net (Postfix, from userid 1000) id 6DF637283051; Mon, 29 Aug 2011 19:46:46 +0200 (CEST) From: Stefan Weil To: qemu-devel@nongnu.org Date: Mon, 29 Aug 2011 19:46:45 +0200 Message-Id: <1314640005-4278-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 78.47.199.172 Cc: Anthony Liguori , Michael Roth Subject: [Qemu-devel] [PATCH] qemu-ga: Fix linux build with trace backend 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 Builds with configure --enable-trace-backend=simple failed on linux because qemu-ga then uses simpletrace.c which needs get_clock which needs use_rt_clock which was unresolved. Adding qemu-timer-common.o fixes this. It adds a little overhead (about 150 byte). Cc: Michael Roth Cc: Anthony Liguori Signed-off-by: Stefan Weil --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 8606849..63cc07f 100644 --- a/Makefile +++ b/Makefile @@ -197,7 +197,7 @@ QGALIB_GEN=$(addprefix $(qapi-dir)/, qga-qapi-types.c qga-qapi-types.h qga-qapi- $(QGALIB_GEN): $(GENERATED_HEADERS) $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) -qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(qapi-obj-y) $(trace-obj-y) $(qobject-obj-y) $(version-obj-y) $(addprefix $(qapi-dir)/, qga-qapi-visit.o qga-qapi-types.o qga-qmp-marshal.o) +qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(qapi-obj-y) $(trace-obj-y) qemu-timer-common.o $(qobject-obj-y) $(version-obj-y) $(addprefix $(qapi-dir)/, qga-qapi-visit.o qga-qapi-types.o qga-qmp-marshal.o) QEMULIBS=libhw32 libhw64 libuser libdis libdis-user