From patchwork Tue May 3 14:29:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 9004361 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 29D3FBF29F for ; Tue, 3 May 2016 14:31:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CDBC0202D1 for ; Tue, 3 May 2016 14:31:50 +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 AA2092026F for ; Tue, 3 May 2016 14:31:47 +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 1axbKP-0004EO-Fy; Tue, 03 May 2016 14:29:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1axbKO-0004DJ-1v for xen-devel@lists.xen.org; Tue, 03 May 2016 14:29:32 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 7D/3F-30743-BC5B8275; Tue, 03 May 2016 14:29:31 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNIsWRWlGSWpSXmKPExsVyMXThId1TWzX CDbZ9VLdY8nExiwOjx9Hdv5kCGKNYM/OS8isSWDOe9T1lL3grU/FlWmYD4wvxLkYuDiGBiYwS M2/8YAVxWATmMUvcnjKJDcSREOhnlZh39R9jFyMnkBMjMWnbPCYIu1zi6qEHLCC2kICCxO8Jh 5ggRk1hkjh/8yErSIJNQEPiya8ZbCC2iIC0xLXPlxlBipgFPjFKNN94BTZJWMBSYuGSo2ANLA KqEo9aTzCD2LwCDhJXtjYDNXAAbZOTWPDeB8TkFHCUeL0jHWKvg8T9pvtMExgFFjAyrGLUKE4 tKkst0jU00UsqykzPKMlNzMzRNTQw1ctNLS5OTE/NSUwq1kvOz93ECAwsBiDYwXj2tOchRkkO JiVR3h9LNMKF+JLyUyozEosz4otKc1KLDzHKcHAoSfDmbAHKCRalpqdWpGXmAEMcJi3BwaMkw rt5E1Cat7ggMbc4Mx0idYrRkmPL72trmTg+bbwDJLdNvbeWSYglLz8vVUqcNwJkngBIQ0ZpHt w4WBxeYpSVEuZlBDpQiKcgtSg3swRV/hWjOAejkjCvNcgUnsy8Eritr4AOYgI6KHu9KshBJYk IKakGxvnvn2w1iU9/37ZBYO02qZy15z/+Ozfbc3/l9I8q7ycazGWXX//WyNejwGVX2BKmr73b K8VmbZdtMWb/+mHvzBn/rpk+bLoY9jU2/GHUZYfouSeF/Fdnq5m0/HvWmbqrxH2KmXvp2z8CM UpeXuofttRP3Tx9QZX7fz3riNtmfyWbDOJZVi+ePFmJpTgj0VCLuag4EQDMggQpvgIAAA== X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1462285769!20491803!1 X-Originating-IP: [209.85.161.194] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12434 invoked from network); 3 May 2016 14:29:30 -0000 Received: from mail-yw0-f194.google.com (HELO mail-yw0-f194.google.com) (209.85.161.194) by server-10.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 3 May 2016 14:29:30 -0000 Received: by mail-yw0-f194.google.com with SMTP id v81so1774637ywa.2 for ; Tue, 03 May 2016 07:29:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cardoe.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nm3AAR7a7oqqHt66D2Brq0VBpl57s0sLTu9VqMcLE+M=; b=aqWCF2mlS8S8/vN+g/wg8+wJ6UUK1+HIRwmaJOt8CsOgdWOsNU6UT0tbzay3o+jd2h Ub5efVZbGIykrNZFxy4cSEFH9ezO1/ffbGgPksRcjUv0MFJoAdJXTw3HHAptWg1w1XsD uKDHZr+Jyh6GjbhIKLq3HIYA8mYlk2OchYm+E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nm3AAR7a7oqqHt66D2Brq0VBpl57s0sLTu9VqMcLE+M=; b=ZbjQjcrPzRLDREoPjVPsgVAOrqIvocr0ItRfHpU6O+tbSQH02TPCHDixMbewRPB80I eQX4FU3huzvBdw7ze846QvClJCT2hBYqLuPfIdK9h2uMNCFoQtClwJDL/uPUEgYuugJw NSScL3Q59JydMdqXMWjE4KcYFW2bgfGnEHy1FLMX1vp+ETqdzlxbIZ8QNXrEhf4z3gae B2s6zXT5GRtTaGaWFu37Kr1OOADoglBeBP20+b78cJ83Qp+48s+WZGgNpGFjFAuufIjf FDwoiMPbY9eb4cv1JvqnErWvT9Ces+cBm3jUh4l7a9lDNy/+GK3DKZB0YPZNeCDmND64 YJeg== X-Gm-Message-State: AOPr4FUJi11G8zQ2L44+WEVeB2Wtww4X4UGT0Aoxn7HikyM/7AEayRFIBV+nal5ZS2l15w== X-Received: by 10.129.52.9 with SMTP id b9mr1236928ywa.320.1462285769316; Tue, 03 May 2016 07:29:29 -0700 (PDT) Received: from swanson.lan (c-68-46-196-185.hsd1.al.comcast.net. [68.46.196.185]) by smtp.gmail.com with ESMTPSA id l132sm1879409ywb.26.2016.05.03.07.29.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 May 2016 07:29:28 -0700 (PDT) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Tue, 3 May 2016 09:29:09 -0500 Message-Id: <1462285753-5588-4-git-send-email-cardoe@cardoe.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1462285753-5588-1-git-send-email-cardoe@cardoe.com> References: <1462285753-5588-1-git-send-email-cardoe@cardoe.com> Cc: Stefano Stabellini , Andrew Cooper , Doug Goldstein , Julien Grall , Jan Beulich , Daniel De Graaf Subject: [Xen-devel] [PATCH v2 3/7] build: convert verbose to Kconfig 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, 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 Convert 'verbose', which was enabled by 'debug=y' to Kconfig as CONFIG_VERBOSE_DEBUG which is enabled by default when CONFIG_DEBUG is enabled. Signed-off-by: Doug Goldstein Reviewed-by: Jan Beulich --- CC: Stefano Stabellini CC: Julien Grall CC: Jan Beulich CC: Andrew Cooper CC: Daniel De Graaf --- INSTALL | 1 - xen/Kconfig.debug | 7 +++++++ xen/Rules.mk | 5 ----- xen/arch/arm/kernel.c | 2 +- xen/arch/x86/domain_build.c | 2 +- xen/include/xsm/dummy.h | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/INSTALL b/INSTALL index 2974b9b..35668bd 100644 --- a/INSTALL +++ b/INSTALL @@ -227,7 +227,6 @@ VGABIOS_REL_DATE="dd Mon yyyy" The following variables can be used to tweak some aspects of the hypervisor build. -verbose=y perfc=y perfc_arrays=y lock_profile=y diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug index 04f672f..89e26fe 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -15,4 +15,11 @@ config CRASH_DEBUG If you want to be able to attach gdb to Xen to be able to debug Xen if it crashes then say Y. +config VERBOSE_DEBUG + bool "Verbose debug messages" + default y + ---help--- + Guest output from HYPERVISOR_console_io and hypervisor parsing + ELF images (dom0) is logged in the Xen ring buffer. + endif # DEBUG diff --git a/xen/Rules.mk b/xen/Rules.mk index c044fd1..b159451 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -3,7 +3,6 @@ # If you change any of these configuration options then you must # 'make clean' before rebuilding. # -verbose ?= n perfc ?= n perfc_arrays ?= n lock_profile ?= n @@ -17,10 +16,7 @@ include $(XEN_ROOT)/Config.mk # Hardcoded configuration implications and dependencies. # Do this is a neater way if it becomes unwieldy. ifeq ($(debug),y) -verbose := y frame_pointer := y -else -CFLAGS += -DNDEBUG endif ifeq ($(perfc_arrays),y) perfc := y @@ -59,7 +55,6 @@ ifneq ($(clang),y) CFLAGS += -Wa,--strip-local-absolute endif -CFLAGS-$(verbose) += -DVERBOSE CFLAGS-$(perfc) += -DPERF_COUNTERS CFLAGS-$(perfc_arrays) += -DPERF_ARRAYS CFLAGS-$(lock_profile) += -DLOCK_PROFILE diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 9871bd9..3f6cce3 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -472,7 +472,7 @@ static int kernel_elf_probe(struct kernel_info *info, if ( (rc = elf_init(&info->elf.elf, info->elf.kernel_img, size )) != 0 ) goto err; -#ifdef VERBOSE +#ifdef CONFIG_VERBOSE_DEBUG elf_set_verbose(&info->elf.elf); #endif elf_parse_binary(&info->elf.elf); diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index f9a3eca..b29c377 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -942,7 +942,7 @@ int __init construct_dom0( if ( (rc = elf_init(&elf, image_start, image_len)) != 0 ) return rc; -#ifdef VERBOSE +#ifdef CONFIG_VERBOSE_DEBUG elf_set_verbose(&elf); #endif elf_parse_binary(&elf); diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index abbe282..406cd18 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -215,7 +215,7 @@ static XSM_INLINE int xsm_memory_stat_reservation(XSM_DEFAULT_ARG struct domain static XSM_INLINE int xsm_console_io(XSM_DEFAULT_ARG struct domain *d, int cmd) { XSM_ASSERT_ACTION(XSM_OTHER); -#ifdef VERBOSE +#ifdef CONFIG_VERBOSE_DEBUG if ( cmd == CONSOLEIO_write ) return xsm_default_action(XSM_HOOK, d, NULL); #endif