From patchwork Tue May 24 13:56:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 9133733 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 875FE6075E for ; Tue, 24 May 2016 14:00:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A06728233 for ; Tue, 24 May 2016 14:00:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6EAD028258; Tue, 24 May 2016 14:00:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id D3D502829A for ; Tue, 24 May 2016 14:00:15 +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 1b5CpQ-00065y-La; Tue, 24 May 2016 13:57:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b5CpP-00065B-Lq for xen-devel@lists.xen.org; Tue, 24 May 2016 13:56:59 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id CF/37-26543-AAD54475; Tue, 24 May 2016 13:56:58 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNIsWRWlGSWpSXmKPExsVyMXThEd1VsS7 hBvNvilgs+biYxYHR4+ju30wBjFGsmXlJ+RUJrBlnt79iLziiUHHv6EfWBsYO6S5GLg4hgYmM Em8OT2YEcVgE5jFL7Np6khnEkRDoZ5WYsv8ZUIYTyImRaG9/wgphl0vcPNYMFhcSUJD4PeEQE 8SoKUwSu04/ZAFJsAloSDz5NYMNxBYRkJa49vky2ApmgU+MEs03XjGBJIQFLCVetW8Fs1kEVC UW3z4HZvMKOEqceDAZyOYA2iYnseC9D4jJKeAkse2bPMReR4nH848wT2AUWMDIsIpRvTi1qCy 1SNdCL6koMz2jJDcxM0fX0NBELze1uDgxPTUnMalYLzk/dxMjMLAYgGAH48ZJzocYJTmYlER5 DbRcwoX4kvJTKjMSizPii0pzUosPMcpwcChJ8BbEAOUEi1LTUyvSMnOAIQ6TluDgURLhnQ6S5 i0uSMwtzkyHSJ1itOTY8vvaWiaOTxvvAMltU++tZRJiycvPS5USh5gnANKQUZoHNw4Wh5cYZa WEeRmBDhTiKUgtys0sQZV/xSjOwagkzLscZApPZl4J3NZXQAcxAR3k/8UZ5KCSRISUVANj+Na bG3kZ5L14M3KV7vGutGTverreaZnL6f08Qmpqrx7LckaFXlFlLeQ6ZyI29X34TuvvSlcCZyvv n2f7+enfbo2bN++YRXawcHiuUz49Q2Ljn1bDbRlmewXqbEv04vwFJa119/hVv2f9e+xz1u/JE VY5WmkmyzQ4YtUvSnbcsrNeP+ff5+VKLMUZiYZazEXFiQD2iVKRvgIAAA== X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1464098217!43248071!1 X-Originating-IP: [209.85.161.196] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 47003 invoked from network); 24 May 2016 13:56:58 -0000 Received: from mail-yw0-f196.google.com (HELO mail-yw0-f196.google.com) (209.85.161.196) by server-3.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 24 May 2016 13:56:58 -0000 Received: by mail-yw0-f196.google.com with SMTP id j74so2334430ywg.1 for ; Tue, 24 May 2016 06:56:58 -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=wn0R999cHKo9I4x6YBmPCWXqYqMnu4XekwHRl6uKvtM=; b=BMGXZlIcpirFEWBYd0vfm6q8feiVy6A3Tc4xD28AVricJMSAri7jTuCgVb3FJaPhd5 xDDdRKPDX6Cp08QmEZb38ScuUfhX5LpADgpNJ7+qqQyCMPuxK+Sf0dvmxzflWyBUOCJ2 DWvxzWNs/QvUf8wiFvN/Oa0caL5xWcC5VdpTI= 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=wn0R999cHKo9I4x6YBmPCWXqYqMnu4XekwHRl6uKvtM=; b=PCdwA7RVDN4yjosd1pu1sqGCNYQnu96tnErn8SHppy5i4NIYDCehh7b53UwV64bqrC 9MpBUsKsZxHQ2fl8kiRHfrbQhJncm5JZtFRKyX4eF9LUXBaimMrVnVDiDH6h9gUmOMzR ekfCVp44Pjti9fbpK7gqTsFer0lc0e3GaV9fq2NCqmT66Rsp4wnGQ5J9Qpno1cBN3Lqt 89M4G+8EiVmyHqGR2z4ge3RVGeWY+DYcJc5kkoDJPc+r/qZlM47jcD9HXmD0J+LNl13j +WJyMO+oe24GtY8Hq0ahghuV1C6lEsTVVg8st6c6DKT15Xwwx673XPKsmXAXEz3+U141 Eeeg== X-Gm-Message-State: ALyK8tLQROkaRab/rMaIDoiN64W/4RVF7sbhfViBEqbb37BquurgGZvG8inanEetNAaDkQ== X-Received: by 10.129.0.84 with SMTP id 81mr2866863ywa.184.1464098216956; Tue, 24 May 2016 06:56:56 -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 i67sm22199641ywf.34.2016.05.24.06.56.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 May 2016 06:56:56 -0700 (PDT) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Tue, 24 May 2016 08:56:36 -0500 Message-Id: <1464098199-19851-4-git-send-email-cardoe@cardoe.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1464098199-19851-1-git-send-email-cardoe@cardoe.com> References: <1464098199-19851-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 v5 3/6] 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-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: Andrew Cooper Reviewed-by: Konrad Rzeszutek Wilk Reviewed-by: Jan Beulich Acked-by: Julien Grall Acked-by: Daniel De Graaf --- 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 | 6 +++--- xen/arch/arm/kernel.c | 2 +- xen/arch/x86/domain_build.c | 2 +- xen/include/xsm/dummy.h | 2 +- 6 files changed, 13 insertions(+), 7 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 8eeb13f..fb11c56 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -20,6 +20,13 @@ config CRASH_DEBUG If you want to attach gdb to Xen to debug Xen if it crashes then say Y. +config VERBOSE_DEBUG + bool "Verbose debug messages" + default DEBUG + ---help--- + Guest output from HYPERVISOR_console_io and hypervisor parsing + ELF images (dom0) will be logged in the Xen ring buffer. + endif # DEBUG || EXPERT endmenu diff --git a/xen/Rules.mk b/xen/Rules.mk index b077e25..2a93ef7 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,7 +16,6 @@ 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 endif ifeq ($(perfc_arrays),y) @@ -33,6 +31,9 @@ endif ifneq ($(origin kexec),undefined) $(error "You must use 'make menuconfig' to enable/disable kexec now.") endif +ifneq ($(origin verbose),undefined) +$(error "You must use 'make menuconfig' to enable/disable verbose now.") +endif # Set ARCH/SUBARCH appropriately. override TARGET_SUBARCH := $(XEN_TARGET_ARCH) @@ -60,7 +61,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