From patchwork Mon Feb 8 16:04:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 8251641 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A4BF09F319 for ; Mon, 8 Feb 2016 16:07:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B2E672024D for ; Mon, 8 Feb 2016 16:07:38 +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 39F89203C3 for ; Mon, 8 Feb 2016 16:07:37 +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 1aSoJK-0000WS-Lt; Mon, 08 Feb 2016 16:05:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aSoJJ-0000WA-G4 for xen-devel@lists.xen.org; Mon, 08 Feb 2016 16:05:09 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 74/D9-02499-4BCB8B65; Mon, 08 Feb 2016 16:05:08 +0000 X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1454947507!20983558!1 X-Originating-IP: [209.85.161.193] 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 17003 invoked from network); 8 Feb 2016 16:05:08 -0000 Received: from mail-yw0-f193.google.com (HELO mail-yw0-f193.google.com) (209.85.161.193) by server-12.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 8 Feb 2016 16:05:08 -0000 Received: by mail-yw0-f193.google.com with SMTP id b6so4266424ywd.3 for ; Mon, 08 Feb 2016 08:05:08 -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=M9I/KNCLDt6VCrj90rhff+LcUqvzIl+Qvsgd7FiNR9s=; b=gK5h3NHkMhCuZSaF7MzXZdHKIp2uePByVpQeXuns0gZGbMMKfR63fL3rSFwk9jiUpT Fj5/Aa3vaE3TMWpWpQLJLl0+2xFIOuIvSFySKKMBoGRGWw1Ok9wEHT3lb6jGQmavgD+w QUk9qup8sL5xSexv/gURudGI14kEaawGr7DKA= 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=M9I/KNCLDt6VCrj90rhff+LcUqvzIl+Qvsgd7FiNR9s=; b=dpRoTsyxQvHxw23EnGYiIwy1tRGvCvtmlHii4BhLf/YdkrjuCAAkqU0lCMh3n6Hmad Ir3RuLJ164rvAIshkJzhmFCGv1E2dSh52a9Cy+41uePQn3A3cDu8RusTjzIwNfMq2dua zGS2f5B9GDD4S/uqA1+mjlpinPsOPqltp2cIVXBL/nQQJGpwnbxRSlNUkG4gHl7Mez0W yL7yuQJlOrN7snt1kzsvfs1b3itKYO3mX7OKR2PnBNxivbWJLgbrs7vq3ZCZPysriBD/ gUL41/dBpZyKI4blyXdSM+he1Au2ZVxNi2XzxSTeib0TZbTi+o+jHcMlyx0Fr/cQyrMT 0L5Q== X-Gm-Message-State: AG10YOTU2A/okoHnmmGa1zYnC/9x+K9DDSeGCHnzyJe4ukeJH+4YOHulbTyPmwWO7Tfgzw== X-Received: by 10.13.218.198 with SMTP id c189mr16341087ywe.165.1454947506974; Mon, 08 Feb 2016 08:05:06 -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 q141sm21260201ywg.2.2016.02.08.08.05.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Feb 2016 08:05:05 -0800 (PST) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Mon, 8 Feb 2016 10:04:47 -0600 Message-Id: <1454947487-8588-2-git-send-email-cardoe@cardoe.com> X-Mailer: git-send-email 2.4.10 In-Reply-To: <1454947487-8588-1-git-send-email-cardoe@cardoe.com> References: <1454947487-8588-1-git-send-email-cardoe@cardoe.com> Cc: Keir Fraser , Doug Goldstein , Jan Beulich , Andrew Cooper Subject: [Xen-devel] [PATCH 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 Signed-off-by: Doug Goldstein --- 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..fbb64a7 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 "Xenoprof support" + default y + depends on X86 + ---help--- + 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)