From patchwork Tue Feb 9 04:15:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 8258221 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 C6D26BEEE5 for ; Tue, 9 Feb 2016 04:18:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DE2A52026C for ; Tue, 9 Feb 2016 04:18:36 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F053220155 for ; Tue, 9 Feb 2016 04:18:35 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aSziW-0002QQ-DM; Tue, 09 Feb 2016 04:15:56 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aSziV-0002Q0-1p for xen-devel@lists.xen.org; Tue, 09 Feb 2016 04:15:55 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 65/8C-23366-AF769B65; Tue, 09 Feb 2016 04:15:54 +0000 X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1454991352!22348723!1 X-Originating-IP: [209.85.161.196] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25372 invoked from network); 9 Feb 2016 04:15:53 -0000 Received: from mail-yw0-f196.google.com (HELO mail-yw0-f196.google.com) (209.85.161.196) by server-9.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 9 Feb 2016 04:15:53 -0000 Received: by mail-yw0-f196.google.com with SMTP id q190so4787873ywd.2 for ; Mon, 08 Feb 2016 20:15:53 -0800 (PST) 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=egT4VtLndNo202QUGs/Fi7JWG1UiJ4KV1Uo3KXp17Q0=; b=DywKUrnNyDCSfhPy0/tazRDsN7nj9rQ0/N0Jr/KGxLUWyM36oGvTJ/19z5TdAuXSXn 39SsdVPM61tC2izcGZr6MOmhOwjmoALIuApYZWtUKvotM5qfGNddJmTsUDTWWktSiX/O t5bECoRfHHjs+ghd7OeQmzLjyOuVYnWQnt/ZE= 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=egT4VtLndNo202QUGs/Fi7JWG1UiJ4KV1Uo3KXp17Q0=; b=cs9XbYRSd4aFEAh4VKtKDqwXtWSM5c2gt3OuQaonngrf2ARhztpB1+RdKSb+0ARjhp sz934xzbkMB5TY4ERnoAd1XRAZTaV4Fo+KOZxw0dwag805BcHjNSFbUux8D0jcgRjV56 ReiyTA2e1wysbJdeo3vfU5QDa+gfD0XukVyvV+l0sc6wJ25nHGct5cNZWJ31Fu4XpvYo r6GKbOI3qn+FzVT0pIx+MZhHwNse1TKjkgu9yeZguLukzmm+QALqIVXm6WRjqCECm+3k bf9kB5KLeg2Yvyd48KdJAXZ3+eF2cZ72PkCysIaxICmQR0psbmRz2WwRNbhe1VahLts8 yYrA== X-Gm-Message-State: AG10YOTCyuTR+xl9/LZ7D61TatkiHs+BjHpjupoCTzraZ/w0vFIhbnQmF+Gj1FMJmo4r8A== X-Received: by 10.129.4.132 with SMTP id 126mr17510008ywe.184.1454991352020; Mon, 08 Feb 2016 20:15:52 -0800 (PST) Received: from swanson.lan (c-68-46-196-185.hsd1.al.comcast.net. [68.46.196.185]) by smtp.gmail.com with ESMTPSA id e4sm23437825ywb.0.2016.02.08.20.15.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Feb 2016 20:15:51 -0800 (PST) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Mon, 8 Feb 2016 22:15:21 -0600 Message-Id: <1454991321-399-2-git-send-email-cardoe@cardoe.com> X-Mailer: git-send-email 2.4.10 In-Reply-To: <1454991321-399-1-git-send-email-cardoe@cardoe.com> References: <1454991321-399-1-git-send-email-cardoe@cardoe.com> Cc: Keir Fraser , Doug Goldstein , Jan Beulich , Andrew Cooper Subject: [Xen-devel] [PATCH v2 2/2] build: convert xenoprof to Kconfig X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org 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 the xenoprof x86 build time option to Kconfig. CC: Keir Fraser CC: Jan Beulich CC: Andrew Cooper Reviewed-by: Andrew Cooper Signed-off-by: Doug Goldstein --- change since v1: - fix name of Kconfig entry as suggested by Andrew Cooper --- xen/arch/x86/Makefile | 2 +- xen/arch/x86/Rules.mk | 3 --- xen/common/Kconfig | 13 +++++++++++++ xen/common/Makefile | 2 +- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 434d985..1bcb08b 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -3,7 +3,7 @@ subdir-y += cpu subdir-y += genapic subdir-y += hvm subdir-y += mm -subdir-$(xenoprof) += oprofile +subdir-$(CONFIG_XENOPROF) += oprofile subdir-y += x86_64 obj-bin-y += alternative.init.o diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 94e4efd..14519e3 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -3,15 +3,12 @@ HAS_NUMA := y HAS_CORE_PARKING := y -xenoprof := y CFLAGS += -I$(BASEDIR)/include CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default CFLAGS += '-D__OBJECT_LABEL__=$(subst /,$$,$(subst -,_,$(subst $(BASEDIR)/,,$(CURDIR))/$@))' -CFLAGS-$(xenoprof) += -DCONFIG_XENOPROF - # Prevent floating-point variables from creeping into Xen. CFLAGS += -msoft-float diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 6f404b4..8b06dfb 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -84,6 +84,19 @@ config LATE_HWDOM If unsure, say N. +# Adds support for Xenoprof +config XENOPROF + bool "Xen Oprofile Support" + default y + depends on X86 + ---help--- + Xen OProfile (Xenoprof) is a system-wide profiler for Xen virtual + machine environments, capable of profiling the Xen virtual machine + monitor, multiple Linux guest operating systems, and applications + running on them. + + If unsure, say Y. + # Enable/Disable XSM support config XSM bool "Xen Security Modules support" diff --git a/xen/common/Makefile b/xen/common/Makefile index 6e82b33..126d373 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -62,7 +62,7 @@ obj-bin-$(CONFIG_X86) += $(foreach n,decompress bunzip2 unxz unlzma unlzo unlz4 obj-$(perfc) += perfc.o obj-$(crash_debug) += gdbstub.o -obj-$(xenoprof) += xenoprof.o +obj-$(CONFIG_XENOPROF) += xenoprof.o obj-$(CONFIG_COMPAT) += $(addprefix compat/,domain.o kernel.o memory.o multicall.o tmem_xen.o xlat.o)