From patchwork Mon Mar 25 21:14:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 2333611 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 05631DF24C for ; Mon, 25 Mar 2013 21:14:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932278Ab3CYVOZ (ORCPT ); Mon, 25 Mar 2013 17:14:25 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:63930 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758603Ab3CYVOY (ORCPT ); Mon, 25 Mar 2013 17:14:24 -0400 Received: by mail-pd0-f179.google.com with SMTP id x10so2694775pdj.38 for ; Mon, 25 Mar 2013 14:14:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-type:x-gm-message-state; bh=iRXl/mBxpbhqjc0B3w69GtRme/EqXAIenyc+8diGWVU=; b=cKXQdU1kSRrHxhVswV13kBfxk0FK5cJfj3tU1uAz7vNGvoLX26RY0xVNG36638SvVJ 5/iQ/Am3WrMYbIX0ukUBKoY9S1p9TkY+sOZudSs++DZwqZRGBlf5t126q9May7qe1U13 SSIoKGD6Y3sQIuYW4lYBTYh0cjQWw7pzveIrkWZxQSFPUwHpBqfkjURjIUE+zQR31g4x C+aS0BQjZV0lfyJDj8CdhzRYiYk/ZRDy8cTrVpS/zdJDUxpDFgVEVI0za7atePiM/eU2 z07kmriXSMrVJOikVzpOBJNkbWzalBrayuzJRJ97hvebgVgs6v0/7cj5xvKkmjiN1VvF iXzA== X-Received: by 10.68.40.165 with SMTP id y5mr19687991pbk.218.1364246063540; Mon, 25 Mar 2013 14:14:23 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPS id vd4sm14661363pbc.35.2013.03.25.14.14.21 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 25 Mar 2013 14:14:22 -0700 (PDT) From: Kevin Hilman To: Gleb Natapov Cc: Frederic Weisbecker , Scott Wood , linaro-kernel@lists.linaro.org, Marcelo Tosatti , "open list\:KERNEL VIRTUAL MA..." , open list Subject: Re: [PATCH] KVM: allow host header to be included even for !CONFIG_KVM References: <1363306426-27209-1-git-send-email-khilman@linaro.org> <1363823921.25034.35@snotra> <20130321072955.GO3889@redhat.com> <87ppyshlq5.fsf@linaro.org> <1363891354.31522.17@snotra> <20130321191600.GG9382@redhat.com> <1363894393.31522.20@snotra> <20130321211736.GI9382@redhat.com> <20130324140114.GV3889@redhat.com> Date: Mon, 25 Mar 2013 14:14:20 -0700 In-Reply-To: <20130324140114.GV3889@redhat.com> (Gleb Natapov's message of "Sun, 24 Mar 2013 16:01:14 +0200") Message-ID: <87txnz9o7n.fsf@linaro.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQleqAGUc2XJo2OnEPZravr5goh/DGNu8txSDFLa4suMV5U9zFX1aD9jmTUYElCml8KDOh1P Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Gleb Natapov writes: > On Sun, Mar 24, 2013 at 02:44:26PM +0100, Frederic Weisbecker wrote: >> 2013/3/21 Gleb Natapov : >> > Isn't is simpler for kernel/context_tracking.c to define empty >> > __guest_enter()/__guest_exit() if !CONFIG_KVM. >> >> That doesn't look right. Off-cases are usually handled from the >> headers, right? So that we avoid iffdeffery ugliness in core code. > Lets put it in linux/context_tracking.h header then. Here's a version to do that. Kevin From d9d909394479dd7ff90b7bddb95a564945406719 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Mon, 25 Mar 2013 14:12:41 -0700 Subject: [PATCH v2] ontext_tracking: fix !CONFIG_KVM compile: add stub guest enter/exit When KVM is not enabled, or not available on a platform, the KVM headers should not be included. Instead, just define stub __guest_[enter|exit] functions. Cc: Frederic Weisbecker Signed-off-by: Kevin Hilman --- include/linux/context_tracking.h | 7 +++++++ kernel/context_tracking.c | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/linux/context_tracking.h b/include/linux/context_tracking.h index 365f4a6..9d0f242 100644 --- a/include/linux/context_tracking.h +++ b/include/linux/context_tracking.h @@ -3,6 +3,13 @@ #include #include +#if IS_ENABLED(CONFIG_KVM) +#include +#else +#define __guest_enter() +#define __guest_exit() +#endif + #include struct context_tracking { diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c index 65349f0..85bdde1 100644 --- a/kernel/context_tracking.c +++ b/kernel/context_tracking.c @@ -15,7 +15,6 @@ */ #include -#include #include #include #include