From patchwork Tue May 10 21:05:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 9063361 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 36996BF29F for ; Tue, 10 May 2016 21:08:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 66C6B201C7 for ; Tue, 10 May 2016 21:08:17 +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 689742012B for ; Tue, 10 May 2016 21:08:16 +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 1b0Eqh-0006lu-QH; Tue, 10 May 2016 21:05:47 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b0Eqg-0006lR-PO for xen-devel@lists.xen.org; Tue, 10 May 2016 21:05:46 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id D7/E3-03281-A2D42375; Tue, 10 May 2016 21:05:46 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNIsWRWlGSWpSXmKPExsVyMXThIV1NX6N wg6mtAhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8bDKwsYC9bIVOzbHdXAuEe8i5GTQ0hgAqPE udvWXYxcHCwC85gl/l5fxwriSAj0s0r0nnrIDFIlIRAj8bllITuEXSPR272DFaJbQeL3hENMI A1CApOYJH41HGYESbAJaEg8+TWDDcQWEZCWuPb5MiNIEbPAJ0aJ5huvmEASwgKWEv+m7wCzWQ RUJe7PWQI2lVfAQaL9fR9QMwfQNjmJBe99QMKcAo4Si6esYoFY7CBx/vMFxgmMAgsYGVYxahS nFpWlFukaGuklFWWmZ5TkJmbm6BoamujlphYXJ6an5iQmFesl5+duYgQGFgMQ7GA8O835EKMk B5OSKG+Pm1G4EF9SfkplRmJxRnxRaU5q8SFGGQ4OJQneIB+gnGBRanpqRVpmDjDEYdISHDxKI rwCIGne4oLE3OLMdIjUKUZLji2/r61l4vi08Q6Q3Db13lomIZa8/LxUKXFeTpAGAZCGjNI8uH GwOLzEKCslzMsIdKAQT0FqUW5mCar8K0ZxDkYlYV5XkCk8mXklcFtfAR3EBHSQHJs+yEEliQg pqQbGPma7RbnmjI43alp3m3yKEW02sz359F7e37qHfVfFeP9npCdN9Z+k+lD4+S69VebMkwvW yD36Xh2+IHHmw9Xf5vaYq25NkBJddFblwr5vsi9frdgTMLVU2VZLTXlSn9KEz6qmEqqNnwqN3 KUXsnXN8DU5Ifb48dmjWi+FK1QdPp6u0RI/F1eoxFKckWioxVxUnAgAiM0z474CAAA= X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1462914344!40727744!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 34101 invoked from network); 10 May 2016 21:05:45 -0000 Received: from mail-yw0-f194.google.com (HELO mail-yw0-f194.google.com) (209.85.161.194) by server-13.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 10 May 2016 21:05:45 -0000 Received: by mail-yw0-f194.google.com with SMTP id y6so2214431ywe.0 for ; Tue, 10 May 2016 14:05:44 -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=JGIItva5404jJwtyV5yFg5ojQoSgIgfhE1n4GZOUeds=; b=ecHYUIfRA/1IqaeZUluNtcpSi9Jk8o/qqp6fjwQGK0i/VtgHynCLwaQlW1fw5u73He xKQidTXnaihQkpnh5SQHdAY7eO1fLG/sOvGpQyolvnVx2jGQ++6E7/T7HISGmU0JIh0t 0C6lmoqExVsUtHNNUOK9zjTdegPCLJVyGpmpk= 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=JGIItva5404jJwtyV5yFg5ojQoSgIgfhE1n4GZOUeds=; b=FL5R2cSM4EImT6NEvZ2n6zx/vA43eNOkQgz/hMqF9ZAtredv0wYlii3Gmx4Sfqgp6m UF4TteIS7ZDZcMvSvCwqCg9mQNnnGRrg9FLXOvhHn7HdC+SyKP0cpnyCO8poTzHkzuoo R2Fa3fjw0DmyZSH3G5JNbOBu1je9ixvLgxtWJVbB9zfmsp76WOchldfPkwRIv2XAxPpL rkbegQYnRSnY+7YCyIlha1TIidK6AiCE5RNeucN0nWbL8NqIEKuPBmsUfXrYD9lTQudu n+YPMSIAPRgtDcI2WdjQdyqJGMPVO/IeeMMs0/fLXDs1JImeOBlPozb19HZE7aPBWl2t KDNQ== X-Gm-Message-State: AOPr4FWmfudOBQSkdzAn676munwfyIh/qDe4M+MYRZTj3fD0PMeAt8LOvTHojqpnIinmtQ== X-Received: by 10.129.166.201 with SMTP id d192mr26126575ywh.49.1462914343774; Tue, 10 May 2016 14:05:43 -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 e6sm2198740ywd.23.2016.05.10.14.05.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 May 2016 14:05:42 -0700 (PDT) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Tue, 10 May 2016 16:05:26 -0500 Message-Id: <1462914329-8797-4-git-send-email-cardoe@cardoe.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1462914329-8797-1-git-send-email-cardoe@cardoe.com> References: <1462914329-8797-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 v3 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-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_BL_SPAMCOP_NET, 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 --- 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 | 3 --- xen/arch/arm/kernel.c | 2 +- xen/arch/x86/domain_build.c | 2 +- xen/include/xsm/dummy.h | 2 +- 6 files changed, 10 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 8abfbaa..734e78d 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -15,4 +15,11 @@ config DEBUG option is intended for development purposes only, and not for production use. +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. + endmenu diff --git a/xen/Rules.mk b/xen/Rules.mk index 1a220bd..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,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) @@ -57,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