From patchwork Sun May 22 05:01:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 9130713 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 C4F4860761 for ; Sun, 22 May 2016 05:04:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 66C9328191 for ; Sun, 22 May 2016 05:04:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5BBB528195; Sun, 22 May 2016 05:04:23 +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 9D1DC2819C for ; Sun, 22 May 2016 05:04:19 +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 1b4LWW-0005cJ-TS; Sun, 22 May 2016 05:01:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b4LWV-0005bv-FR for xen-devel@lists.xen.org; Sun, 22 May 2016 05:01:55 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 12/C3-02973-24D31475; Sun, 22 May 2016 05:01:54 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNIsWRWlGSWpSXmKPExsVyMXThIV0nW8d wg7n9nBZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8b5CcsZC7bKV6w62MnewNgo1cXIxSEkMIlR 4uD368wgDovAPGaJb2uPsIM4EgL9rBLP/j8AynACOTESvy/NYYSwyyW+zboIZgsJKEj8nnCIC WLUPCaJlWvvs4Mk2AQ0JJ78msEGYosISEtc+3yZEaSIWeATo0TzjVdMIAlhAUuJD3vWgzWwCK hKnO9YBNbAK+AgMbN3A9BmDqBtchIL3vuAmJwCjhIXvmtD7HWQaFi3kGUCo8ACRoZVjOrFqUV lqUW6JnpJRZnpGSW5iZk5uoYGpnq5qcXFiempOYlJxXrJ+bmbGIGBxQAEOxhv9TkfYpTkYFIS 5U3ttg8X4kvKT6nMSCzOiC8qzUktPsQow8GhJMG719oxXEiwKDU9tSItMwcY4jBpCQ4eJRFee RugNG9xQWJucWY6ROoUoyXHlt/X1jJxfNp4B0hum3pvLZMQS15+XqqUOO88kHkCIA0ZpXlw42 BxeIlRVkqYlxHoQCGegtSi3MwSVPlXjOIcjErCvFIga3ky80rgtr4COogJ6KCH0g4gB5UkIqS kGhiVqydNCt8b1anZvGNNzY54/c47F3L1v8Q8e3E6e2n3m6DCoI2L5ZiYeC3dPFSvL30VqmAe bfjxyZ06Lr/a9L+FWx+FT1gwy2lp9dbz2VP4pSvfCZ6/cnaWV1nyC82IO/0aDrM/3/dbcfTRG u+esi8fFV8uWhnn0Hfg6LLJp16d17Nk5lF3f1qjxFKckWioxVxUnAgA+rnKcL4CAAA= X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1463893313!36989255!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 10549 invoked from network); 22 May 2016 05:01:54 -0000 Received: from mail-yw0-f194.google.com (HELO mail-yw0-f194.google.com) (209.85.161.194) by server-13.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 22 May 2016 05:01:54 -0000 Received: by mail-yw0-f194.google.com with SMTP id u62so19621255ywe.3 for ; Sat, 21 May 2016 22:01:53 -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=XM461xW8IPmDWljKyTd651E/OqxGXL/U+zDmrrLrNA0=; b=RCJEMr6z7BSRGLXRq87R+BmbxBhlu3U5sMgY4YTzlgVU0OTzeViIvTPH5aJRahGpy1 poBlaqzrq4zSnzgbIBN1wnnR4apCl4pn8yGhvce2SyAsy7Dl7fkOTFaHsG8/ke2hqSjl Yb+5bcZCNu69//rv1Bin9zB/YPzh9ThPaUvaE= 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=XM461xW8IPmDWljKyTd651E/OqxGXL/U+zDmrrLrNA0=; b=GIN5tzHZI9uMWNYf24f1Mp9e9gE+AqxP4WAKjusvkt06XaHG3+iFhz5Qt9r28Zo6L0 nxq2N1vcsCHqTQcvG6/U7oR/538vg6esfaC/hUvBE2OX0MfDzgg5yPonJAd1Dpo7c83w p/U0ETRzSpKs5OXMWqLKpKYkcQPHGFCzS1N1UOmD1aZQReXIBs3t+fVo12gKHqfwP4rw MMkGM4EZbKpAzNL5ib0VK9i0lwCHN+xFVJu5RlJaBt/0VmIKulI4rICuGvnI+Xs55PPH JhG+0u9ponJlrrb7Sk0zjEfoGMTstZczGS0JZY/pNDsWL+zajRhwUOXKVN4Ou+l8yMyh tAZg== X-Gm-Message-State: AOPr4FVTJZzMZmAhPvPc/LmWGzQNKPeAl36zlTj1Np9LmBA1dh14pVCMPkOmvt9FJoUjyw== X-Received: by 10.13.200.1 with SMTP id k1mr6653409ywd.141.1463893312955; Sat, 21 May 2016 22:01:52 -0700 (PDT) Received: from localhost.localdomain (c-68-46-196-185.hsd1.al.comcast.net. [68.46.196.185]) by smtp.gmail.com with ESMTPSA id z20sm15961686ywd.44.2016.05.21.22.01.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 21 May 2016 22:01:52 -0700 (PDT) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Sun, 22 May 2016 00:01:32 -0500 Message-Id: <1463893295-2610-4-git-send-email-cardoe@cardoe.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1463893295-2610-1-git-send-email-cardoe@cardoe.com> References: <1463893295-2610-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 v4 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 --- 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 308911a..7c115b0 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -19,6 +19,13 @@ 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 DEBUG + ---help--- + Guest output from HYPERVISOR_console_io and hypervisor parsing + ELF images (dom0) is logged in the Xen ring buffer. + endif # DEBUG || EXPERT endmenu diff --git a/xen/Rules.mk b/xen/Rules.mk index 45aad61..55096d3 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