From patchwork Fri Dec 18 20:06:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Douglas Goldstein X-Patchwork-Id: 7887681 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 AD7B1BEEE5 for ; Fri, 18 Dec 2015 20:10:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D176920395 for ; Fri, 18 Dec 2015 20:10:00 +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 BBCB62026F for ; Fri, 18 Dec 2015 20:09:59 +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 1aA1J6-0007yD-5S; Fri, 18 Dec 2015 20:07:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aA1J3-0007y8-OQ for xen-devel@lists.xen.org; Fri, 18 Dec 2015 20:07:13 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 44/F4-12889-17764765; Fri, 18 Dec 2015 20:07:13 +0000 X-Env-Sender: cardoe@cardoe.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1450469231!11994132!1 X-Originating-IP: [209.85.160.173] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 65226 invoked from network); 18 Dec 2015 20:07:12 -0000 Received: from mail-yk0-f173.google.com (HELO mail-yk0-f173.google.com) (209.85.160.173) by server-11.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 18 Dec 2015 20:07:12 -0000 Received: by mail-yk0-f173.google.com with SMTP id p130so70706307yka.1 for ; Fri, 18 Dec 2015 12:07:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cardoe-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=Mq8eyUmOj2Nw8Q7K70KqSB4sVNrRh+JqovTrgJinuuM=; b=DQhguO+Xlb7GqS0yJ2EACzgh6e9FzKBEAIchWsF8j/AmSG1/CRz+2yzxckpTAbPQuT yoehorCl6JQ+FUiTZtq21jHxGu0MdaIeELK+G6OoUH2s1HEDLh+OGQ37f7pkIPFArtNt 6+MHmvCZZcXLD3hkQPvHCGQCl4hYDANmbRXJqZueO5iX43/0DGm+U2GaxtHQ/rV1Bf8f jzEyAxrwDT2m4QgQGdttiDBIhoXbAoXXb9HLNG9Fio099lr3bZ89FXsR1kLlQz+S3QA7 Hwowxpkedd+ajQEoFf2v6ZI9xZ/UGC/iigUEjYt1lCo2zuel7e2lxt/AQsH0Qg4PWtMX vM4Q== 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; bh=Mq8eyUmOj2Nw8Q7K70KqSB4sVNrRh+JqovTrgJinuuM=; b=Y8KBfsV5y11N9WZ1pMERgt/FGxnmytd9deOgZ3igeIqIiwqSW/k1RA+kuWrtMvyoib MQgg4LkqpIrkYusXS1XdsFqGaXYTxxRCmgcbYTHy/zaOGB8rey3fnTE317mmKs3OVnK1 /ZFBE67CLo86Xax7DZM7AHZe0HiMjipdzYTEja2fBfuHMzYxPylxLSzV4bEqoqOjLEB1 MxKXTkYr9nhQSUu/E8sp1JLBA532R2rYs64N0Putn+Wk7XUxY2jjclv+x3ruPKn06EAT t5EOTNdY9iS9FbkM2NlxDr3/6cqnET8j33W5EZb0/yeKsd4yRKNCGHmeWXTdW2O+Pcz1 8INw== X-Gm-Message-State: ALoCoQnQsP8haMeB2Ry6zPKaiDsI7gnrv/lPXeJMopUBss015Fh0JSx+uMqe7zzwa+gK+nqv62P+ZAPpp7lEy44qQhvyuZqttQ== X-Received: by 10.129.56.132 with SMTP id f126mr4573093ywa.220.1450469231036; Fri, 18 Dec 2015 12:07:11 -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 u190sm17396600ywd.17.2015.12.18.12.07.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Dec 2015 12:07:10 -0800 (PST) From: Doug Goldstein To: xen-devel@lists.xen.org Date: Fri, 18 Dec 2015 14:06:58 -0600 Message-Id: <1450469218-24860-1-git-send-email-cardoe@cardoe.com> X-Mailer: git-send-email 2.4.10 Cc: Keir Fraser , Doug Goldstein , Jan Beulich , Andrew Cooper Subject: [Xen-devel] [PATCH] build: convert CONFIG_COMPAT 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=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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 Use the Kconfig generated CONFIG_COMPAT defines in the code base. CC: Keir Fraser CC: Jan Beulich CC: Andrew Cooper Signed-off-by: Doug Goldstein Reviewed-by: Andrew Cooper , although I have --- This was previously Acked-by: Jan Beulich but then there was a request to change it to xen/common/Kconfig from xen/arch/x86/Kconfig. Unfortunately a small typo ('def_bool y' instead of 'bool') caused it to break on ARM. This resolves the issue and should be ready to merge. --- config/x86_64.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/common/Kconfig | 7 +++++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/config/x86_64.mk b/config/x86_64.mk index f12d549..85fa27c 100644 --- a/config/x86_64.mk +++ b/config/x86_64.mk @@ -2,7 +2,6 @@ CONFIG_X86 := y CONFIG_X86_64 := y CONFIG_X86_$(XEN_OS) := y -CONFIG_COMPAT := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 07e366d..7d2ed96 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -3,6 +3,7 @@ config X86_64 config X86 def_bool y + select COMPAT select HAS_ACPI select HAS_CPUFREQ select HAS_EHCI diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 7d0e9a9..046e257 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -1,6 +1,13 @@ menu "Common Features" +config COMPAT + bool + help + 32-bit interface support on 64-bit Xen which is used for both + HVM and PV guests. HVMLoader makes 32-bit hypercalls irrespective + of the destination runmode of the guest. + # Select HAS_DEVICE_TREE if device tree is supported config HAS_DEVICE_TREE bool