From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755033AbdCBR4a (ORCPT ); Thu, 2 Mar 2017 12:56:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39890 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752698AbdCBRz1 (ORCPT ); Thu, 2 Mar 2017 12:55:27 -0500 From: Vitaly Kuznetsov To: xen-devel@lists.xenproject.org Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Boris Ostrovsky , Juergen Gross , Andrew Jones Subject: [PATCH v2 20/21] x86/xen: enable PVHVM-only builds Date: Thu, 2 Mar 2017 18:53:56 +0100 Message-Id: <20170302175357.8222-21-vkuznets@redhat.com> In-Reply-To: <20170302175357.8222-1-vkuznets@redhat.com> References: <20170302175357.8222-1-vkuznets@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 02 Mar 2017 17:54:37 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now everything is in place and we can move PV-only code under CONFIG_XEN_PV. CONFIG_XEN_PV_SMP is created to support the change. Signed-off-by: Vitaly Kuznetsov --- arch/x86/xen/Kconfig | 4 ++++ arch/x86/xen/Makefile | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index 04284d9..aa8256b 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -21,6 +21,10 @@ config XEN_PV help Support running as a Xen PV guest. +config XEN_PV_SMP + def_bool y + depends on XEN_PV && SMP + config XEN_DOM0 bool "Xen PV Dom0 support" default y diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index f610651..fffb0a1 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile @@ -12,16 +12,17 @@ CFLAGS_mmu_pv.o := $(nostackp) obj-y := enlighten.o multicalls.o mmu.o irq.o \ time.o xen-asm.o xen-asm_$(BITS).o \ - grant-table.o suspend.o platform-pci-unplug.o \ - p2m.o enlighten_pv.o mmu_pv.o + grant-table.o suspend.o platform-pci-unplug.o obj-$(CONFIG_XEN_PVHVM) += enlighten_hvm.o mmu_hvm.o suspend_hvm.o -obj-$(CONFIG_XEN_PV) += setup.o apic.o pmu.o suspend_pv.o +obj-$(CONFIG_XEN_PV) += setup.o apic.o pmu.o suspend_pv.o \ + p2m.o enlighten_pv.o mmu_pv.o obj-$(CONFIG_XEN_PVH) += enlighten_pvh.o obj-$(CONFIG_EVENT_TRACING) += trace.o -obj-$(CONFIG_SMP) += smp.o smp_pv.o +obj-$(CONFIG_SMP) += smp.o +obj-$(CONFIG_XEN_PV_SMP) += smp_pv.o obj-$(CONFIG_XEN_PVHVM_SMP) += smp_hvm.o obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o obj-$(CONFIG_XEN_DEBUG_FS) += debugfs.o -- 2.9.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vitaly Kuznetsov Subject: [PATCH v2 20/21] x86/xen: enable PVHVM-only builds Date: Thu, 2 Mar 2017 18:53:56 +0100 Message-ID: <20170302175357.8222-21-vkuznets@redhat.com> References: <20170302175357.8222-1-vkuznets@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjUw2-0003wZ-Ot for xen-devel@lists.xenproject.org; Thu, 02 Mar 2017 17:54:38 +0000 In-Reply-To: <20170302175357.8222-1-vkuznets@redhat.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Boris Ostrovsky , x86@kernel.org, Andrew Jones , linux-kernel@vger.kernel.org List-Id: xen-devel@lists.xenproject.org Tm93IGV2ZXJ5dGhpbmcgaXMgaW4gcGxhY2UgYW5kIHdlIGNhbiBtb3ZlIFBWLW9ubHkgY29kZSB1 bmRlcgpDT05GSUdfWEVOX1BWLiBDT05GSUdfWEVOX1BWX1NNUCBpcyBjcmVhdGVkIHRvIHN1cHBv cnQgdGhlIGNoYW5nZS4KClNpZ25lZC1vZmYtYnk6IFZpdGFseSBLdXpuZXRzb3YgPHZrdXpuZXRz QHJlZGhhdC5jb20+Ci0tLQogYXJjaC94ODYveGVuL0tjb25maWcgIHwgNCArKysrCiBhcmNoL3g4 Ni94ZW4vTWFrZWZpbGUgfCA5ICsrKysrLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCA5IGluc2VydGlv bnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC94ODYveGVuL0tjb25maWcg Yi9hcmNoL3g4Ni94ZW4vS2NvbmZpZwppbmRleCAwNDI4NGQ5Li5hYTgyNTZiIDEwMDY0NAotLS0g YS9hcmNoL3g4Ni94ZW4vS2NvbmZpZworKysgYi9hcmNoL3g4Ni94ZW4vS2NvbmZpZwpAQCAtMjEs NiArMjEsMTAgQEAgY29uZmlnIFhFTl9QVgogCWhlbHAKIAkgIFN1cHBvcnQgcnVubmluZyBhcyBh IFhlbiBQViBndWVzdC4KIAorY29uZmlnIFhFTl9QVl9TTVAKKwlkZWZfYm9vbCB5CisJZGVwZW5k cyBvbiBYRU5fUFYgJiYgU01QCisKIGNvbmZpZyBYRU5fRE9NMAogCWJvb2wgIlhlbiBQViBEb20w IHN1cHBvcnQiCiAJZGVmYXVsdCB5CmRpZmYgLS1naXQgYS9hcmNoL3g4Ni94ZW4vTWFrZWZpbGUg Yi9hcmNoL3g4Ni94ZW4vTWFrZWZpbGUKaW5kZXggZjYxMDY1MS4uZmZmYjBhMSAxMDA2NDQKLS0t IGEvYXJjaC94ODYveGVuL01ha2VmaWxlCisrKyBiL2FyY2gveDg2L3hlbi9NYWtlZmlsZQpAQCAt MTIsMTYgKzEyLDE3IEBAIENGTEFHU19tbXVfcHYubwkJOj0gJChub3N0YWNrcCkKIAogb2JqLXkJ CTo9IGVubGlnaHRlbi5vIG11bHRpY2FsbHMubyBtbXUubyBpcnEubyBcCiAJCQl0aW1lLm8geGVu LWFzbS5vIHhlbi1hc21fJChCSVRTKS5vIFwKLQkJCWdyYW50LXRhYmxlLm8gc3VzcGVuZC5vIHBs YXRmb3JtLXBjaS11bnBsdWcubyBcCi0JCQlwMm0ubyBlbmxpZ2h0ZW5fcHYubyBtbXVfcHYubwor CQkJZ3JhbnQtdGFibGUubyBzdXNwZW5kLm8gcGxhdGZvcm0tcGNpLXVucGx1Zy5vCiAKIG9iai0k KENPTkZJR19YRU5fUFZIVk0pCQkrPSBlbmxpZ2h0ZW5faHZtLm8gbW11X2h2bS5vIHN1c3BlbmRf aHZtLm8KLW9iai0kKENPTkZJR19YRU5fUFYpCQkJKz0gc2V0dXAubyBhcGljLm8gcG11Lm8gc3Vz cGVuZF9wdi5vCitvYmotJChDT05GSUdfWEVOX1BWKQkJCSs9IHNldHVwLm8gYXBpYy5vIHBtdS5v IHN1c3BlbmRfcHYubyBcCisJCQkJCQlwMm0ubyBlbmxpZ2h0ZW5fcHYubyBtbXVfcHYubwogb2Jq LSQoQ09ORklHX1hFTl9QVkgpCQkJKz0gZW5saWdodGVuX3B2aC5vCiAKIG9iai0kKENPTkZJR19F VkVOVF9UUkFDSU5HKSArPSB0cmFjZS5vCiAKLW9iai0kKENPTkZJR19TTVApCQkrPSBzbXAubyBz bXBfcHYubworb2JqLSQoQ09ORklHX1NNUCkJCSs9IHNtcC5vCitvYmotJChDT05GSUdfWEVOX1BW X1NNUCkgIAkrPSBzbXBfcHYubwogb2JqLSQoQ09ORklHX1hFTl9QVkhWTV9TTVApICAJKz0gc21w X2h2bS5vCiBvYmotJChDT05GSUdfUEFSQVZJUlRfU1BJTkxPQ0tTKSs9IHNwaW5sb2NrLm8KIG9i ai0kKENPTkZJR19YRU5fREVCVUdfRlMpCSs9IGRlYnVnZnMubwotLSAKMi45LjMKCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGlu ZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4t ZGV2ZWwK