From patchwork Mon May 9 16:43:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 9048151 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4AFDCBF29F for ; Mon, 9 May 2016 16:58:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7B58E2012D for ; Mon, 9 May 2016 16:58:45 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 855C1200DC for ; Mon, 9 May 2016 16:58:44 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1azoUH-0005vI-B4; Mon, 09 May 2016 16:56:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1azoUF-0005ux-MH for xen-devel@lists.xenproject.org; Mon, 09 May 2016 16:56:51 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 4B/F3-03512-351C0375; Mon, 09 May 2016 16:56:51 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrKLMWRWlGSWpSXmKPExsXitHRDpG7QQYN wg8UbFCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozuX9MZCxo5KuY8fcvYwPiJrYuRk0NCwF/i xKRXzCA2m4COxNSnl1i7GDk4RARUJG7vNQAJMwsUS/z93w1WIizgILFy1292kBIWoJLj661AT F4BN4kdh/ggBspJnD/+E6xaCKhi/dRZYIt4BQQlTs58wgIxUULi4IsXzCCtEgLcEn+77Scw8s xCUjULSdUCRqZVjBrFqUVlqUW6hgZ6SUWZ6RkluYmZObqGhiZ6uanFxYnpqTmJScV6yfm5mxi BwcEABDsYzy1zPsQoycGkJMrryqgXLsSXlJ9SmZFYnBFfVJqTWnyIUYaDQ0mCt/uAQbiQYFFq empFWmYOMExh0hIcPEoivFNB0rzFBYm5xZnpEKlTjIpS4rxRIAkBkERGaR5cGyw2LjHKSgnzM gIdIsRTkFqUm1mCKv+KUZyDUUmYVxZkCk9mXgnc9FdAi5mAFsux6YMsLklESEk1MFaYx8WdYJ su5zL1vaky44IJsyaEM+2ODzD68tZtpYboowVlfz1W11n8cOoVs0gpOpZxJUvL4ADD+RvK4un Wev0Ffds2Lrtfo/kgStlyD9t1H8G8rp4Vp6fOzd44r8n+4HsFq6rC4oWq005VG938ydpbXdoc s+iCZgPbI5W9v72VL60Xq9yeqMRSnJFoqMVcVJwIAPoVqKGIAgAA X-Env-Sender: prvs=930fe50b8=Paul.Durrant@citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1462813009!40121752!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24863 invoked from network); 9 May 2016 16:56:50 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-3.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 9 May 2016 16:56:50 -0000 X-IronPort-AV: E=Sophos;i="5.24,601,1454976000"; d="scan'208";a="352541121" From: Paul Durrant To: Date: Mon, 9 May 2016 17:43:14 +0100 Message-ID: <1462812194-8369-1-git-send-email-paul.durrant@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-DLP: MIA1 Cc: Wei Liu , Paul Durrant , Ian Jackson Subject: [Xen-devel] [PATCH] tools: configure correct trace backend for QEMU X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Newer versions of the QEMU source have replaced the 'stderr' trace backend with 'log'. This patch adjusts the tools Makefile to test for the 'log' backend and specify it if it is available. Signed-off-by: Paul Durrant Acked-by: Wei Liu --- Cc: Ian Jackson Cc: Wei Liu --- tools/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/Makefile b/tools/Makefile index 3f45fb9..6440dec 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -240,7 +240,9 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find source=.; \ fi; \ cd qemu-xen-dir; \ - if $$source/scripts/tracetool.py --check-backend --backend stderr ; then \ + if $$source/scripts/tracetool.py --check-backend --backend log ; then \ + enable_trace_backend='--enable-trace-backend=log'; \ + elif $$source/scripts/tracetool.py --check-backend --backend stderr ; then \ enable_trace_backend='--enable-trace-backend=stderr'; \ else \ enable_trace_backend='' ; \