From patchwork Mon May 2 04:10:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 8989751 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 86D54BF440 for ; Mon, 2 May 2016 04:13:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4C006201F2 for ; Mon, 2 May 2016 04:13:34 +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 2D4E220173 for ; Mon, 2 May 2016 04:13:33 +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 1ax5CN-0002Ef-Q3; Mon, 02 May 2016 04:11:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ax5CM-0002Dm-7X for xen-devel@lists.xen.org; Mon, 02 May 2016 04:11:06 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id B0/C1-14148-953D6275; Mon, 02 May 2016 04:11:05 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrLIsWRWlGSWpSXmKPExsVyMXThQd2Iy2r hBhf26Vss+biYxYHR4+ju30wBjFGsmXlJ+RUJrBkH5vxlLlgmU3H2YTdbA+Na8S5GLg4hgYmM Evv372IBcVgE5jFLrL4xlRXEkRDoZ5XYff8QexcjJ5ATI3HmzU9GCLtG4mH7JBYQW0hAQeL3h ENMEKMmM0m8m3KVCSTBJqAh8eTXDDYQW0RAWuLa58uMIEXMAp8YJZpvvAIrEhawkljQtwVsA4 uAqsTnxhOsIDavgKPEmn/bgZo5gLbJSSx47wMS5hRwkuj7uokZYrGjxNMP9xknMAosYGRYxah RnFpUllqka2iql1SUmZ5RkpuYmaNraGCql5taXJyYnpqTmFSsl5yfu4kRGFwMQLCDsWG75yFG SQ4mJVHeycfUwoX4kvJTKjMSizPii0pzUosPMcpwcChJ8N64CJQTLEpNT61Iy8wBhjlMWoKDR 0mE1/YcUJq3uCAxtzgzHSJ1itGSY8vva2uZOD5tvAMkt029t5ZJiCUvPy9VSpx3G8g8AZCGjN I8uHGwWLzEKCslzMsIdKAQT0FqUW5mCar8K0ZxDkYlYd7zIFN4MvNK4La+AjqICeig7PWqIAe VJCKkpBoYJ0k9E9l5RP3ozq2amcnZPiuctWfKPFlvf37LY/m//ELvXrGEh9hskUu/cev6ikX/ 2t/FM1ntPcD7I/Z4UeXzQh8PQ5bn7zz5uLce8FFeZ3HibUl/1BHl7JU1xofYk4L1TH97xE2Za POxqvDSzou5lzPy5n6rKRXgTu8S/P77W+C6k4vru9PDlFiKMxINtZiLihMBnF2swcACAAA= X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1462162263!37391586!1 X-Originating-IP: [209.85.161.193] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 41019 invoked from network); 2 May 2016 04:11:04 -0000 Received: from mail-yw0-f193.google.com (HELO mail-yw0-f193.google.com) (209.85.161.193) by server-5.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 2 May 2016 04:11:04 -0000 Received: by mail-yw0-f193.google.com with SMTP id y6so17641597ywe.0 for ; Sun, 01 May 2016 21:11:04 -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=u81X1Mhvyqp0JgZgPkdEqnkHe5/TL45YjBD63F4c/2M=; b=aVxB94JaaYcW9h2vX+eq+nhlWsi3VrLWuoyAjxh8hNiOu4E1YWeqSB0U+QpgiYXdYM /vK93eb+Wlmzvjt90NWl3h0s/RcbkvRnUp8LebOujSc02slsCJn5xuiB/QgXLerObmd2 7i4zTg8fzGMvMZhDncPaeJb4bPzk1CZf1zVh4= 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=u81X1Mhvyqp0JgZgPkdEqnkHe5/TL45YjBD63F4c/2M=; b=LCtFHbd8fN4zIfQpTTxCreYucEWxJBlFtss6slKf8ifhzoy46ujEcVlwTgu01mDzeS lIQWsG9LmiFDgOb2oi4PJQfVzg6x0HdubeHm8ZuTsOXr+CfrsSS6OtJBZC35SD2ZOFCq dE9tWXsIVvHNXqOjYLkBlTlMrWvimZMceEpftLwpI9dsydZ9i6/1tgmj6LU15O0aiyVt z2kbEXaC4kqkM4QdYR5pmeQ8XWLm8Ye5YQ/DFTjra2Kk/TcUjQz4/3qxlSPXIC41Ok1G prNOXlABAafXBTBxd5LxDudU4yH7qw+4B2FDJEsKc7KVxBx8WClClDtmx4keB0W0Gh1q fGgg== X-Gm-Message-State: AOPr4FVDfcFn6+pf00poGIgomYZ2x1Fb2X6mLkR+2ZMn9sbNMAuCfrma0HksllTuX2/Gnw== X-Received: by 10.129.98.134 with SMTP id w128mr20366900ywb.198.1462162263616; Sun, 01 May 2016 21:11:03 -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 j3sm14334897ywj.32.2016.05.01.21.11.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 01 May 2016 21:11:02 -0700 (PDT) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Sun, 1 May 2016 23:10:42 -0500 Message-Id: <1462162246-32413-4-git-send-email-cardoe@cardoe.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1462162246-32413-1-git-send-email-cardoe@cardoe.com> References: <1462162246-32413-1-git-send-email-cardoe@cardoe.com> Cc: Stefano Stabellini , Andrew Cooper , Doug Goldstein , Julien Grall , Jan Beulich , Daniel De Graaf Subject: [Xen-devel] [RFC PATCH 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=-2.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID,UNPARSEABLE_RELAY,URIBL_BLACK 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 --- CC: Stefano Stabellini CC: Julien Grall CC: Jan Beulich CC: Andrew Cooper CC: Daniel De Graaf --- INSTALL | 1 - xen/Kconfig.debug | 6 ++++++ 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, 9 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 ee68f0d..94a6381 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -15,4 +15,10 @@ 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--- + Enables the verbose flag when loading ELF images. + 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